| Squashed commit of the following: commit 34d07be5a51517f1eab1cd325c6a76a8c3ca9972 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Sep 6 15:17:50 2023 +0800 codecheck commit 16604815479f2b7da537edbe2007a7ed92c04b0f Merge: 25dfcad0 0c6157cf Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Sep 6 14:35:32 2023 +0800 Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench commit 0c6157cfe57bd9bcc408f01944b4c1ddfbd527ca Merge: 998f8359 17772738 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Wed Sep 6 14:33:16 2023 +0800 merge release-zwr into release merge "release-zwr" into "release" codecheck修改 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7241726 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" codecheck修改 See merge request: openGaussythcs00001/openGauss-workbench!669 commit 17772738235f47466d718ecdb978e1fb0270f02e Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Wed Sep 6 14:32:25 2023 +0800 codecheck修改 commit 25dfcad02f7405d9b77c790c01789eb3fe7b7848 Merge: 82f664d0 998f8359 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Sep 6 12:37:11 2023 +0800 Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench # Conflicts: # plugins/alert-monitor/src/main/java/com/nctigba/alert/monitor/config/AlertScheduleRunner.java # plugins/alert-monitor/src/main/java/com/nctigba/alert/monitor/config/ElasticsearchProvider.java # plugins/alert-monitor/src/main/java/com/nctigba/alert/monitor/config/validator/EnumIntegerValidator.java # plugins/alert-monitor/src/main/java/com/nctigba/alert/monitor/constant/CommonConstants.java # plugins/alert-monitor/src/main/java/com/nctigba/alert/monitor/controller/AlertRuleController.java # plugins/alert-monitor/src/main/java/com/nctigba/alert/monitor/controller/AlertTemplateController.java # plugins/alert-monitor/src/main/java/com/nctigba/alert/monitor/controller/NotifyWayController.java # plugins/alert-monitor/src/main/java/com/nctigba/alert/monitor/dto/LogDetailInfoDTO.java # plugins/alert-monitor/src/main/java/com/nctigba/alert/monitor/entity/NotifyWay.java # plugins/alert-monitor/src/main/java/com/nctigba/alert/monitor/schedule/AlertNotifySchedule.java # plugins/alert-monitor/src/main/java/com/nctigba/alert/monitor/service/AlertApiService.java # plugins/alert-monitor/src/main/java/com/nctigba/alert/monitor/service/DingTalkService.java # plugins/alert-monitor/src/main/java/com/nctigba/alert/monitor/service/NotifyWayService.java # plugins/alert-monitor/src/main/java/com/nctigba/alert/monitor/service/PrometheusService.java # plugins/alert-monitor/src/main/java/com/nctigba/alert/monitor/service/ThirdPartyService.java # plugins/alert-monitor/src/main/java/com/nctigba/alert/monitor/service/WeComService.java # plugins/alert-monitor/src/main/java/com/nctigba/alert/monitor/service/impl/AlertRecordServiceImpl.java # plugins/alert-monitor/src/main/java/com/nctigba/alert/monitor/service/impl/AlertScheduleServiceImpl.java # plugins/alert-monitor/src/main/java/com/nctigba/alert/monitor/service/impl/NotifyConfigServiceImpl.java # plugins/alert-monitor/src/main/java/com/nctigba/alert/monitor/service/impl/NotifyWayServiceImpl.java # plugins/alert-monitor/src/test/java/com/nctigba/alert/monitor/controller/AlertRuleControllerTest.java # plugins/alert-monitor/src/test/java/com/nctigba/alert/monitor/controller/AlertTemplateControllerTest.java # plugins/alert-monitor/src/test/java/com/nctigba/alert/monitor/controller/NotifyWayControllerTest.java # plugins/alert-monitor/src/test/java/com/nctigba/alert/monitor/service/DingTalkServiceTest.java # plugins/alert-monitor/src/test/java/com/nctigba/alert/monitor/service/ThirdPartyServiceTest.java # plugins/alert-monitor/src/test/java/com/nctigba/alert/monitor/service/WeComServiceTest.java # plugins/alert-monitor/src/test/java/com/nctigba/alert/monitor/service/impl/AlertRecordServiceImplTest.java # plugins/alert-monitor/src/test/java/com/nctigba/alert/monitor/service/impl/NotifyConfigServiceImplTest.java # plugins/alert-monitor/src/test/java/com/nctigba/alert/monitor/service/impl/NotifyWayServiceImplTest.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/compatible/opengauss/FunctionSPObjectSQLServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/compatible/opengauss/GainObjectSQLServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/compatible/opengauss/SchemaObjectSQLServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/compatible/opengauss/SequenceObjectSQLServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/compatible/opengauss/SynonymObjectSQLServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/compatible/opengauss/TableColumnSQLServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/compatible/opengauss/TableObjectSQLServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/compatible/opengauss/ViewObjectSQLServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/constants/SqlConstants.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/model/PublicParamReq.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/DataListByJdbcServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/DbConnectionServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/ExportServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/util/DebugUtils.java # plugins/data-studio/src/test/java/com/nctigba/datastudio/base/WebsocketServerTest.java # plugins/data-studio/src/test/java/com/nctigba/datastudio/compatible/opengauss/FunctionSPObjectSQLServiceTest.java # plugins/data-studio/src/test/java/com/nctigba/datastudio/compatible/opengauss/GainObjectSQLServiceTest.java # plugins/data-studio/src/test/java/com/nctigba/datastudio/compatible/opengauss/SchemaObjectSQLServiceTest.java # plugins/data-studio/src/test/java/com/nctigba/datastudio/compatible/opengauss/SequenceObjectSQLServiceTest.java # plugins/data-studio/src/test/java/com/nctigba/datastudio/compatible/opengauss/SynonymObjectSQLServiceTest.java # plugins/data-studio/src/test/java/com/nctigba/datastudio/compatible/opengauss/TableColumnConstraintTest.java # plugins/data-studio/src/test/java/com/nctigba/datastudio/compatible/opengauss/TableColumnCreateTest.java # plugins/data-studio/src/test/java/com/nctigba/datastudio/compatible/opengauss/TableColumnSQLServiceTest.java # plugins/data-studio/src/test/java/com/nctigba/datastudio/compatible/opengauss/TableObjectSQLServiceTest.java # plugins/data-studio/src/test/java/com/nctigba/datastudio/compatible/opengauss/ViewObjectSQLServiceTest.java # plugins/data-studio/src/test/java/com/nctigba/datastudio/dao/ResultSetMapDAOTest.java # plugins/data-studio/src/test/java/com/nctigba/datastudio/listener/ListenerTest.java # plugins/data-studio/src/test/java/com/nctigba/datastudio/result/WebDsResultTest.java # plugins/data-studio/src/test/java/com/nctigba/datastudio/service/impl/debug/AnonymousStartDebugTest.java # plugins/data-studio/src/test/java/com/nctigba/datastudio/service/impl/debug/ExecuteTest.java # plugins/data-studio/src/test/java/com/nctigba/datastudio/service/impl/debug/StartDebugTest.java # plugins/data-studio/src/test/java/com/nctigba/datastudio/service/impl/sql/CloseSqlTest.java # plugins/data-studio/src/test/java/com/nctigba/datastudio/service/impl/sql/CreateDatabaseServiceTest.java # plugins/data-studio/src/test/java/com/nctigba/datastudio/service/impl/sql/DataListByJdbcServiceTest.java # plugins/data-studio/src/test/java/com/nctigba/datastudio/service/impl/sql/DatabaseFunctionSPServiceTest.java # plugins/data-studio/src/test/java/com/nctigba/datastudio/service/impl/sql/DatabaseSequenceServiceTest.java # plugins/data-studio/src/test/java/com/nctigba/datastudio/service/impl/sql/DatabaseSynonymServiceTest.java # plugins/data-studio/src/test/java/com/nctigba/datastudio/service/impl/sql/DatabaseViewServiceTest.java # plugins/data-studio/src/test/java/com/nctigba/datastudio/service/impl/sql/DbConnectionServiceTest.java # plugins/data-studio/src/test/java/com/nctigba/datastudio/service/impl/sql/MetaDataByJdbcServiceTest.java # plugins/data-studio/src/test/java/com/nctigba/datastudio/service/impl/sql/QueryMetaArrayServiceTest.java # plugins/data-studio/src/test/java/com/nctigba/datastudio/service/impl/sql/StartSqlTest.java # plugins/data-studio/src/test/java/com/nctigba/datastudio/service/impl/sql/StopSqlTest.java # plugins/data-studio/src/test/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceTest.java # plugins/data-studio/web-ui/src/components/terminal-editor/index.vue # plugins/data-studio/web-ui/src/layout/Sidebar/getSideData.ts # plugins/data-studio/web-ui/src/layout/Sidebar/index.vue # plugins/data-studio/web-ui/src/views/table/components/ImportTableDataDialog.vue # plugins/data-studio/web-ui/src/views/userRole/components/GeneralTab.vue # plugins/data-studio/web-ui/src/views/userRole/components/MemberTab.vue # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/controller/Config.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/util/CmdUtil.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/controller/ControllerConfig.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/controller/WdrController.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/dto/asp/AnalysisDto.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/dto/asp/AspCountReq.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/mapper/AspMapper.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/ClusterManager.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/OpsWdrService.java # plugins/observability-instance/src/test/java/com/nctigba/observability/instance/service/ParamInfoServiceTest.java # plugins/observability-instance/web-ui/src/api/asp.ts # plugins/observability-instance/web-ui/src/pages/dashboardV2/wdr/buildWdr.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/wdr/snapshotManage.vue # plugins/observability-log-search/src/main/java/com/nctigba/observability/log/service/ElasticsearchService.java commit 998f83598525b2d1fb50a000fc82fb11bf6262f0 Merge: 114ddbdf 1ba905e0 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Wed Sep 6 11:47:34 2023 +0800 merge develop-wyb-930 into release merge "develop-wyb-930" into "release" 代码整改 Created-by: wuyuebin Author-id: 7158405 MR-id: 7241671 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "release" 代码整改 See merge request: openGaussythcs00001/openGauss-workbench!668 commit 1ba905e0a3c305b7c516f6be3b12a9aa8da68827 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Sep 6 11:43:29 2023 +0800 代码整改 commit 01c2e4ee7c12e68eb0b70da90895cd5f84f64f58 Merge: bdbb45fc 114ddbdf Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Sep 6 11:42:57 2023 +0800 Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930 commit bdbb45fc8e8d83baa78bbe6535abf3c5ba33b2af Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Sep 6 11:20:38 2023 +0800 代码整改 commit 114ddbdffc1e919834391c3894bc069d07b4dc65 Merge: 5d3cc09b 9810d30d Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Wed Sep 6 11:02:50 2023 +0800 merge release-zwr into release merge "release-zwr" into "release" 修复bug Created-by: zhouwenruo Author-id: 7119763 MR-id: 7241623 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 修复bug See merge request: openGaussythcs00001/openGauss-workbench!667 commit 9810d30db70b0c7f9193de894663c13a777d89d9 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Wed Sep 6 11:01:43 2023 +0800 修复bug commit e45b4226731ccd16cf137f558c6db9b2d7b4699e Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Wed Sep 6 10:32:29 2023 +0800 修复bug commit 5d3cc09b74a6b8ee8a9912a8d6fac27a9560f6f9 Merge: aee8c822 315ddc1d Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Wed Sep 6 10:10:55 2023 +0800 merge develop-wyb-930 into release merge "develop-wyb-930" into "release" 代码整改 Created-by: wuyuebin Author-id: 7158405 MR-id: 7241600 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "develop-wyb-930" into "release" 代码整改 See merge request: openGaussythcs00001/openGauss-workbench!666 commit 315ddc1daca8efe9c2d263789599bc3136c9a12e Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Sep 6 10:03:38 2023 +0800 代码整改 commit aee8c8228e1c4b5ac487ab9cf446e00e1261b5d9 Merge: 27ede868 719ed455 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Tue Sep 5 17:32:56 2023 +0800 merge release-zwr into release merge "release-zwr" into "release" Merge remote-tracking branch 'origin/release' into release-zwr, Merge remote-tracking branch 'origin/release' into release-zwr, 修复bug, 修复导入Excel的bug Created-by: zhouwenruo Author-id: 7119763 MR-id: 7241435 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" Merge remote-tracking branch 'origin/release' into release-zwr, Merge remote-tracking branch 'origin/release' into release-zwr, 修复bug, 修复导入Excel的bug See merge request: openGaussythcs00001/openGauss-workbench!665 commit 719ed455e48b5844708de154a90d71d19285f6d4 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Tue Sep 5 16:15:51 2023 +0800 修复导入Excel的bug commit ef7e2027d769802494395e7545bd2be238aeedca Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Tue Sep 5 15:17:14 2023 +0800 修复bug commit 67937b1009a8b58dd00887a215029e37f4e13bc9 Merge: eaf6480c 27ede868 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Tue Sep 5 14:49:35 2023 +0800 Merge remote-tracking branch 'origin/release' into release-zwr commit 27ede868670964cd66a5253dc9f2df1ca43a60f8 Merge: 4be3a37e 34bafe11 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Tue Sep 5 14:45:28 2023 +0800 merge release-zhangcheng-2309 into release merge "release-zhangcheng-2309" into "release" 导入表数据formdata参数空的bug Created-by: zhangcheng Author-id: 7119759 MR-id: 7241259 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "release-zhangcheng-2309" into "release" 导入表数据formdata参数空的bug See merge request: openGaussythcs00001/openGauss-workbench!664 commit 34bafe116648a5beec58855f31b6c46a09325e1b Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Tue Sep 5 14:44:36 2023 +0800 导入表数据formdata参数空的bug commit 4be3a37eb4170c717fba1f56460853c9ea014c75 Merge: 47ffc78e 89e5db69 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Tue Sep 5 10:28:31 2023 +0800 merge release-zhangcheng-2309 into release merge "release-zhangcheng-2309" into "release" 创建表的分区表不能勾选oids Created-by: zhangcheng Author-id: 7119759 MR-id: 7241145 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "release-zhangcheng-2309" into "release" 创建表的分区表不能勾选oids See merge request: openGaussythcs00001/openGauss-workbench!663 commit 89e5db6933c0328726146cd057d1233194a302d8 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Tue Sep 5 10:25:27 2023 +0800 创建表的分区表不能勾选oids commit eaf6480c08a3c898610a917cd8ec9cf83630088e Merge: 76d3ebcc eb1798ae Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Mon Sep 4 16:42:56 2023 +0800 Merge remote-tracking branch 'origin/release' into release-zwr commit 47ffc78ee9ec8fe4d68eadc2e9b3788bc54fee33 Merge: eb1798ae 76d3ebcc Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Mon Sep 4 16:42:29 2023 +0800 merge release-zwr into release merge "release-zwr" into "release" 社区问题修改 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7240953 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 社区问题修改 See merge request: openGaussythcs00001/openGauss-workbench!660 commit 76d3ebcc3f15f5a1043f1663fa9466c5b78e7f4b Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Mon Sep 4 16:41:37 2023 +0800 社区问题修改 commit eb1798ae67e03d3e473d0bbddf9b2602c5d1af36 Merge: 9a40aa73 edbc04d7 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Mon Sep 4 14:48:36 2023 +0800 merge Branch_release into release merge "Branch_release" into "release" 修改类型 Created-by: zhanghaoyu Author-id: 7119760 MR-id: 7240875 Commit-by: 张昊宇 Merged-by: wuyuebin Description: merge "Branch_release" into "release" 修改类型 See merge request: openGaussythcs00001/openGauss-workbench!659 commit edbc04d74271ff8a5fd1f4e09ab96ddf54136fe9 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon Sep 4 14:47:34 2023 +0800 修改类型 commit 9a40aa73167a614ae65b7a12456065e613a66a8d Merge: c67f9432 933daddf Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Mon Sep 4 14:17:17 2023 +0800 merge release-wyl into release merge "release-wyl" into "release" 删除用户问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7240853 Commit-by: wuyulin Merged-by: zhouwenruo Description: merge "release-wyl" into "release" 删除用户问题修改 See merge request: openGaussythcs00001/openGauss-workbench!658 commit 933daddf4b2fa4427eaa4b63c1964cac06c1efbb Author: wuyulin <wuyulin@ncti-gba.cn> Date: Mon Sep 4 14:15:26 2023 +0800 删除用户问题修改 commit c67f943259ae717952619bebd5e4e2a0fcc80834 Merge: 7b2bfffc 241d47c0 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Mon Sep 4 11:36:17 2023 +0800 merge Branch_release into release merge "Branch_release" into "release" asp修复 Created-by: zhanghaoyu Author-id: 7119760 MR-id: 7240787 Commit-by: 张昊宇 Merged-by: wuyuebin Description: merge "Branch_release" into "release" asp修复 See merge request: openGaussythcs00001/openGauss-workbench!657 commit 241d47c014a54a843bc20fec9c21c78e67f0d243 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon Sep 4 11:08:05 2023 +0800 asp修复 commit 7b2bfffc22a6af67cf72aae3d7f222f5ab8a6594 Merge: 1f36007c a05b2da0 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Mon Sep 4 10:42:09 2023 +0800 merge freature-release-930-asp into release merge "freature-release-930-asp" into "release" 杨子浩 930 ASP bug Created-by: yangzihao Author-id: 7119754 MR-id: 7240764 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "freature-release-930-asp" into "release" 杨子浩 930 ASP bug See merge request: openGaussythcs00001/openGauss-workbench!656 commit a05b2da0a415b2e0f55643fb622b09748d5e99cd Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Mon Sep 4 10:38:01 2023 +0800 杨子浩 930 ASP bug commit 1f36007cdb211064026078d3b9fbec8dd85fee82 Merge: ca84f593 209e7510 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Mon Sep 4 10:27:08 2023 +0800 merge freature-release-930-asp into release merge "freature-release-930-asp" into "release" 杨子浩 930 ASP bug Created-by: yangzihao Author-id: 7119754 MR-id: 7240756 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "freature-release-930-asp" into "release" 杨子浩 930 ASP bug See merge request: openGaussythcs00001/openGauss-workbench!655 commit 209e75100bcef62f0e8d031c11d35780f444607e Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Mon Sep 4 10:25:43 2023 +0800 杨子浩 930 ASP bug commit ca84f59368a549088830a7abde32983ce3687e1c Merge: 5203dc3a ac2a90af Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Mon Sep 4 10:06:55 2023 +0800 merge release-zhangcheng-2309 into release merge "release-zhangcheng-2309" into "release" 修bug Created-by: zhangcheng Author-id: 7119759 MR-id: 7240738 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "release-zhangcheng-2309" into "release" 修bug See merge request: openGaussythcs00001/openGauss-workbench!654 commit ac2a90afa6bbc71c3c264b84b231c9978545fdd2 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Mon Sep 4 10:03:50 2023 +0800 修bug commit 5203dc3a953aa32e55c09b42e81d6b784d93f0ea Merge: e1a149e8 05706979 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Mon Sep 4 09:55:57 2023 +0800 merge release-snapshot into release merge "release-snapshot" into "release" fix snapshot, asp修改 Created-by: zhanghaoyu Author-id: 7119760 MR-id: 7240731 Commit-by: 张昊宇 Merged-by: wuyuebin Description: merge "release-snapshot" into "release" fix snapshot, asp修改 See merge request: openGaussythcs00001/openGauss-workbench!652 commit 05706979791915b85d2735c1e0b19fc32fda7e57 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon Sep 4 09:23:18 2023 +0800 asp修改 commit 82f664d0beaddc1096ce5e458f2df8990005301e Merge: 653c8472 e3c68242 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Sep 1 15:01:49 2023 +0800 Merge remote-tracking branch 'remotes/public/master' # Conflicts: # plugins/data-studio/web-ui/package-lock.json # plugins/data-studio/web-ui/yarn.lock commit eb1f008c32fc46244dcd9f1cdf62ff4e39587b44 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Sep 1 14:57:17 2023 +0800 fix snapshot commit e1a149e87254e8abccc0165adab15c60743ab1d7 Merge: a95d7a4b d653b5cc Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Fri Sep 1 14:22:09 2023 +0800 merge develop-wyb-930 into release merge "develop-wyb-930" into "release" wdr前端优化:时间格式化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7240483 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "release" wdr前端优化:时间格式化 See merge request: openGaussythcs00001/openGauss-workbench!650 commit d653b5cc9bec50f54537f637437b81c06fd53c6f Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Fri Sep 1 14:17:03 2023 +0800 wdr前端优化:时间格式化 commit a95d7a4bd0dac0d8f5ffd0b5dc5455e611f81d7b Merge: c9e62d48 f0b914d6 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Fri Sep 1 10:44:13 2023 +0800 merge release-zhangcheng-2309 into release merge "release-zhangcheng-2309" into "release" package改名字，函数过程编辑器只读的bug Created-by: zhangcheng Author-id: 7119759 MR-id: 7240411 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "release-zhangcheng-2309" into "release" package改名字，函数过程编辑器只读的bug See merge request: openGaussythcs00001/openGauss-workbench!649 commit f0b914d677d79498b09006b0ca581f67115e2607 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Fri Sep 1 10:43:21 2023 +0800 package改名字，函数过程编辑器只读的bug commit c9e62d4831e6bbce2ef8de2652fe691be09f7186 Merge: 6cdcf374 7be8b516 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Thu Aug 31 16:57:45 2023 +0800 merge release-zhangcheng-2309 into release merge "release-zhangcheng-2309" into "release" 修复修改package造成的bug Created-by: zhangcheng Author-id: 7119759 MR-id: 7240241 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "release-zhangcheng-2309" into "release" 修复修改package造成的bug See merge request: openGaussythcs00001/openGauss-workbench!648 commit 6cdcf374d143a8fb2a9cb01969930eaa49524835 Merge: 900c79bc 5734f98b Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Thu Aug 31 16:12:20 2023 +0800 merge release-zwr into release merge "release-zwr" into "release" 新增查看package功能接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7240208 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 新增查看package功能接口 See merge request: openGaussythcs00001/openGauss-workbench!647 commit 5734f98b7d5a9e966330e19572f52982768a4f16 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu Aug 31 16:11:30 2023 +0800 新增查看package功能接口 commit 7be8b5163cf27a6a321ee1c53b92019d4c8694fc Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Thu Aug 31 16:01:22 2023 +0800 修复修改package造成的bug commit 900c79bc2b8b102021b18f42f9a4978282b80c38 Merge: c2340b1e c949ae11 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Thu Aug 31 15:41:33 2023 +0800 merge release-zhangcheng-2309 into release merge "release-zhangcheng-2309" into "release" 更新创建角色，调试package Created-by: zhangcheng Author-id: 7119759 MR-id: 7240183 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "release-zhangcheng-2309" into "release" 更新创建角色，调试package See merge request: openGaussythcs00001/openGauss-workbench!645 commit c949ae11e38ba730ffb8792ac148246564324749 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Thu Aug 31 15:38:25 2023 +0800 更新创建角色，调试package commit c2340b1ed23a2381d66d3a3b1e193cdc30191e11 Merge: bf5a471b 36b3f402 Author: zhanghaoyu <e9a6a9f516404feeabca273d60808c07@example.com> Date: Thu Aug 31 10:28:03 2023 +0800 merge release-master into release merge "release-master" into "release" 对数据迁移安装机器密码进行加密, !381 对数据迁移安装机器密码进行加密 Merge pull request !381 from 王亚龙/master, 解决Datakit工具部署后，安装监控插件工具失败的问题, !389 DataKit 工具部署后，安装监控插件工具失败 Merge pull request !389 from 刘军鹏/master, put all plugin in one path, !391 [feature] 规划datakit统一的目录结构和编译脚本 Merge pull request !391 from 周斌/plugins1, Merge remote-tracking branch 'remotes/origin/master' into release # Conflicts: # plugins/data-studio/web-ui/package-lock.json # plugins/data-studio/web-ui/yarn.lock Created-by: zhanghaoyu Author-id: 7119760 MR-id: 7239931 Commit-by: 张昊宇;opengauss_bot;justbk;root;wangyl Merged-by: zhanghaoyu Description: merge "release-master" into "release" 对数据迁移安装机器密码进行加密, !381 对数据迁移安装机器密码进行加密 Merge pull request !381 from 王亚龙/master, 解决Datakit工具部署后，安装监控插件工具失败的问题, !389 DataKit 工具部署后，安装监控插件工具失败 Merge pull request !389 from 刘军鹏/master, put all plugin in one path, !391 [feature] 规划datakit统一的目录结构和编译脚本 Merge pull request !391 from 周斌/plugins1, Merge remote-tracking branch 'remotes/origin/master' into release # Conflicts: # plugins/data-studio/web-ui/package-lock.json # plugins/data-studio/web-ui/yarn.lock See merge request: openGaussythcs00001/openGauss-workbench!643 commit 36b3f4029f8b04087fe8110a65b004b13a31b64b Merge: bf5a471b e3c68242 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Thu Aug 31 09:16:07 2023 +0800 Merge remote-tracking branch 'remotes/origin/master' into release # Conflicts: # plugins/data-studio/web-ui/package-lock.json # plugins/data-studio/web-ui/yarn.lock commit bf5a471b88afa4375d7cbb1c7615330788008184 Merge: 8d7cfb3a 7e4f8abf Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Wed Aug 30 15:08:51 2023 +0800 merge release-zwr into release merge "release-zwr" into "release" codecheck Created-by: zhouwenruo Author-id: 7119763 MR-id: 7239748 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!637 commit 7e4f8abf57451681a811c94f7a4dbf008d816756 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Wed Aug 30 15:08:04 2023 +0800 codecheck commit 8d7cfb3ad8c1a9ca521d686ba3a1ab6ccb895bcb Merge: 87302a34 8467d787 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Wed Aug 30 11:36:05 2023 +0800 merge release-zwr into release merge "release-zwr" into "release" codecheck Created-by: zhouwenruo Author-id: 7119763 MR-id: 7239688 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!635 commit 8467d787784a6e6c91b4c0dddabeb1e2e68b26c4 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Wed Aug 30 11:35:05 2023 +0800 codecheck commit 653c8472f15ed4e5050e53db402f6658b765fb4f Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Aug 30 10:59:17 2023 +0800 Squashed commit of the following: commit 87302a3471e2a3d8116e73bbdddba184685e8944 Merge: 4503b184 57a3d8d4 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Wed Aug 30 10:51:27 2023 +0800 merge release-zhangcheng-2309 into release merge "release-zhangcheng-2309" into "release" codecheck，资源池接口 Created-by: zhangcheng Author-id: 7119759 MR-id: 7239660 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "release-zhangcheng-2309" into "release" codecheck，资源池接口 See merge request: openGaussythcs00001/openGauss-workbench!634 commit 87302a3471e2a3d8116e73bbdddba184685e8944 Merge: 4503b184 57a3d8d4 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Wed Aug 30 10:51:27 2023 +0800 merge release-zhangcheng-2309 into release merge "release-zhangcheng-2309" into "release" codecheck，资源池接口 Created-by: zhangcheng Author-id: 7119759 MR-id: 7239660 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "release-zhangcheng-2309" into "release" codecheck，资源池接口 See merge request: openGaussythcs00001/openGauss-workbench!634 commit 4503b184793f9d710394eeb9f45eaa8ada0f7249 Merge: ef59be2c 9ce6aa36 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Wed Aug 30 10:51:12 2023 +0800 merge release-zwr into release merge "release-zwr" into "release" codecheck Created-by: zhouwenruo Author-id: 7119763 MR-id: 7239656 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!633 commit 57a3d8d4b1745fd130715fa8c4c43a6f9ecc6a68 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Wed Aug 30 10:48:39 2023 +0800 codecheck，资源池接口 commit 9ce6aa3650a509e26ad298c38f5611c919ac65c6 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Wed Aug 30 10:44:47 2023 +0800 codecheck commit ef59be2c697ad13ca8dbab341379ff2fb284e3f1 Merge: 03cceb2d 60add2da Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Wed Aug 30 10:06:51 2023 +0800 merge release-zwr into release merge "release-zwr" into "release" codecheck Created-by: zhouwenruo Author-id: 7119763 MR-id: 7239633 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!632 commit 60add2dab5a3694e621262dc6705a3f239a108c9 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Wed Aug 30 10:05:51 2023 +0800 codecheck commit 3e2a8dd4c7ace0472c4aab6510cad5124a4249f4 Author: 板栗 <zhanghaoyu@ncti-gba.cn> Date: Wed Aug 30 01:56:02 2023 +0000 修改缩进 Signed-off-by: 板栗 <zhanghaoyu@ncti-gba.cn> commit 03cceb2d09c77dafb141d6472da9391c0dbf6ae0 Merge: d9354cc3 93ab426e Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Tue Aug 29 17:31:27 2023 +0800 merge release-wyl into release merge "release-wyl" into "release" 资源池问题修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7239514 Commit-by: wuyulin Merged-by: zhouwenruo Description: merge "release-wyl" into "release" 资源池问题修复 See merge request: openGaussythcs00001/openGauss-workbench!630 commit 93ab426e5a845502b8c469bcf1711b0aa5bd9d55 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Tue Aug 29 17:27:17 2023 +0800 资源池问题修复 commit d9354cc30c1a343dadc858e801c895080e693473 Merge: e1ce4914 5bdb1dc7 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Tue Aug 29 17:22:09 2023 +0800 merge release-zwr into release merge "release-zwr" into "release" Merge remote-tracking branch 'origin/release' into release-zwr, 单元测试编写 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7239507 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" Merge remote-tracking branch 'origin/release' into release-zwr, 单元测试编写 See merge request: openGaussythcs00001/openGauss-workbench!629 commit 5bdb1dc7c3a79bdfcb94f815a9c07617a6f802e1 Merge: a49a829b e1ce4914 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Tue Aug 29 17:21:27 2023 +0800 Merge remote-tracking branch 'origin/release' into release-zwr commit a49a829bbd476acccf4fe3aae6ccc6b83e4cbf9a Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Tue Aug 29 17:20:56 2023 +0800 单元测试编写 commit e1ce49142c0924f575d18f5971294e1cff5a02fd Merge: ef9a31c1 a51f5a87 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Tue Aug 29 17:10:50 2023 +0800 merge release-wyl into release merge "release-wyl" into "release" 单元测试 Created-by: wuyulin Author-id: 7119753 MR-id: 7239496 Commit-by: wuyulin Merged-by: zhouwenruo Description: merge "release-wyl" into "release" 单元测试 See merge request: openGaussythcs00001/openGauss-workbench!628 commit a51f5a87997333b9827ccd32141888156fb969f4 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Tue Aug 29 17:08:34 2023 +0800 单元测试 commit ef9a31c147238ddef596626e50e921bd30ae511e Merge: 99058811 05943e17 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Tue Aug 29 15:56:37 2023 +0800 merge release-zhangcheng-2309 into release merge "release-zhangcheng-2309" into "release" 改table的selections顺序 Created-by: zhangcheng Author-id: 7119759 MR-id: 7239445 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "release-zhangcheng-2309" into "release" 改table的selections顺序 See merge request: openGaussythcs00001/openGauss-workbench!627 commit 05943e17401ba9900e0dbc56ed6235cf815de8ea Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Tue Aug 29 15:55:03 2023 +0800 改table的selections顺序 commit 3df452ba3a4f1f0e43cbab5f1effa403e8fef937 Merge: c5841ce6 c2462ef4 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Tue Aug 29 14:31:19 2023 +0800 Merge remote-tracking branch 'origin/release' into release-zwr commit 99058811e65c7d7138f8bd78d2546bbabab50d28 Merge: c2462ef4 c5841ce6 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Tue Aug 29 14:30:56 2023 +0800 merge release-zwr into release merge "release-zwr" into "release" 单元测试编写 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7239388 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 单元测试编写 See merge request: openGaussythcs00001/openGauss-workbench!626 commit c5841ce6550928cfabec7a5f057ed4637bda868f Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Tue Aug 29 14:30:05 2023 +0800 单元测试编写 commit c2462ef4fe6e84f291065f532a0a5bd7e129277a Merge: d9c652ef 99d73886 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Tue Aug 29 11:31:11 2023 +0800 merge release-wyl into release merge "release-wyl" into "release" 防注入导致的问题的修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7239319 Commit-by: wuyulin Merged-by: zhouwenruo Description: merge "release-wyl" into "release" 防注入导致的问题的修复 See merge request: openGaussythcs00001/openGauss-workbench!625 commit 99d73886ca16d8c4fb5e6258237c7df6315e0cd5 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Tue Aug 29 11:27:09 2023 +0800 防注入导致的问题的修复 commit 18f57ac02ee47f876a02b1d541f168e2b990ba92 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Tue Aug 29 08:42:18 2023 +0800 codecheck修改删除注释 commit 94144569cddc5b65d5a795deb5f7a7a8879bbf58 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Aug 29 09:41:06 2023 +0800 Squashed commit of the following: commit d9c652efec38fa7bb8124f2e72056af1088d88f6 Merge: d3b0386e 481ad5af Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Tue Aug 29 09:25:56 2023 +0800 commit 564d34671b277dd00897b450b6cdaf4c4aa8bd4d Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Aug 29 09:30:02 2023 +0800 采集器ssh修改 commit d9c652efec38fa7bb8124f2e72056af1088d88f6 Merge: d3b0386e 481ad5af Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Tue Aug 29 09:25:56 2023 +0800 merge develop into release merge "develop" into "release" codecheck修改删除注释, codecheck, merge develop-930-lm into develop merge "develop-930-lm" into "develop" codecheck修改删除注释 Created-by: luomeng Author-id: 7119743 MR-id: 7239210 Commit-by: 罗梦 Merged-by: yangzihao Description: merge "develop-930-lm" into "develop" codecheck修改删除注释 See merge request: openGaussythcs00001/openGauss-workbench!621, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7239212 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "develop-wyb-930" into "develop" codecheck See merge request: openGaussythcs00001/openGauss-workbench!622, codecheck, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7239219 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "develop-wyb-930" into "develop" codecheck See merge request: openGaussythcs00001/openGauss-workbench!623 Created-by: wuyuebin Author-id: 7158405 MR-id: 7239228 Commit-by: wuyuebin;yangzihao;罗梦 Merged-by: wuyuebin Description: merge "develop" into "release" codecheck修改删除注释, codecheck, merge develop-930-lm into develop merge "develop-930-lm" into "develop" codecheck修改删除注释 Created-by: luomeng Author-id: 7119743 MR-id: 7239210 Commit-by: 罗梦 Merged-by: yangzihao Description: merge "develop-930-lm" into "develop" codecheck修改删除注释 See merge request: openGaussythcs00001/openGauss-workbench!621, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7239212 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "develop-wyb-930" into "develop" codecheck See merge request: openGaussythcs00001/openGauss-workbench!622, codecheck, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7239219 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "develop-wyb-930" into "develop" codecheck See merge request: openGaussythcs00001/openGauss-workbench!623 See merge request: openGaussythcs00001/openGauss-workbench!624 commit 481ad5afcc301287700cacc70f593f54679d4b4b Merge: b68957bb 012fed19 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Tue Aug 29 09:21:17 2023 +0800 merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7239219 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "develop-wyb-930" into "develop" codecheck See merge request: openGaussythcs00001/openGauss-workbench!623 commit 012fed19919607059b066c709d7d39002b21e2dd Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Aug 29 09:03:26 2023 +0800 codecheck commit 6d156c1487cf2f47a1b495e47b052f621c2ced7d Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Aug 29 08:53:32 2023 +0800 mvn test修改 commit b68957bb62ee6794cf434f47715d600fb304a960 Merge: bbaa2f9a ac0f1d9a Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Tue Aug 29 08:50:03 2023 +0800 merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7239212 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "develop-wyb-930" into "develop" codecheck See merge request: openGaussythcs00001/openGauss-workbench!622 commit bbaa2f9a064e70025300861dec515630cb06da85 Merge: c3991cee ff839714 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Tue Aug 29 08:46:57 2023 +0800 merge develop-930-lm into develop merge "develop-930-lm" into "develop" codecheck修改删除注释 Created-by: luomeng Author-id: 7119743 MR-id: 7239210 Commit-by: 罗梦 Merged-by: yangzihao Description: merge "develop-930-lm" into "develop" codecheck修改删除注释 See merge request: openGaussythcs00001/openGauss-workbench!621 commit ac0f1d9a62530fa34b64f99e20f9cb824407345b Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Aug 29 08:42:52 2023 +0800 codecheck commit ff83971485bd713082ff72160e0906dbf2435a14 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Tue Aug 29 08:42:18 2023 +0800 codecheck修改删除注释 commit 52a7f1861e1ef49f8204daf1282a6479567ade09 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon Aug 28 18:50:25 2023 +0800 实例监控,sql诊断,告警监控,webds Squashed commit of the following: commit d2f52e7431575e612358da8acf317d397bdf11e7 Merge: 0c5de4d7 d3b0386e Author: zhanghaoyu <e9a6a9f516404feeabca273d60808c07@example.com> Date: Mon Aug 28 18:46:37 2023 +0800 merge release into ncti-master merge "release" into "ncti-master" 测试, merge "feature_wgb_test" into "develop" 测试, 测试, merge "feature_wgb_test" into "develop" 测试, 修改加长连接名称长度限制, merge "develop_wyl" into "develop" 修改加长连接名称长度限制, merge "develop" into "master" 测试, merge "feature_wgb_test" into "develop" 测试, 测试, merge "feature_wgb_test" into "develop" 测试, 修改加长连接名称长度限制, merge "develop_wyl" into "develop" 修改加长连接名称长度限制, 连接信息删除后重置, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, sql诊断_%IOWait高-分布图_数据显示被遮挡, sql诊断_%IOWait高-分布图_数据显示被遮挡, 重新设计AppStore的lastestConnectDatabase, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, 修改文案,添加历史数据源, 添加压缩包, SQL诊断-国际化参数诊断, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, merge "bugfix_lm_20230321" into "develop" 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "feature-wyb" into "develop" 修改文案,添加历史数据源, 添加压缩包, SQL诊断-国际化参数诊断, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "develop" into "master" 连接信息删除后重置, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, sql诊断_%IOWait高-分布图_数据显示被遮挡, sql诊断_%IOWait高-分布图_数据显示被遮挡, 重新设计AppStore的lastestConnectDatabase, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, merge "bugfix_lm_20230321" into "develop" 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "feature-wyb" into "develop" 修改文案,添加历史数据源, 添加压缩包, SQL诊断-国际化参数诊断, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, merge "feature-wyb" into "develop" 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, merge "develop" into "master" 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, merge "feature-wyb" into "develop" 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, 日志检索-修复日志内容解析问题, merge "bugfix_lm_20230321" into "develop" 日志检索-修复日志内容解析问题, 添加unzip安装/校验, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, 添加旧数据处理, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, merge "feature-wyb" into "develop" merge "develop" into "master" 连接信息删除后重置, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, sql诊断_%IOWait高-分布图_数据显示被遮挡, sql诊断_%IOWait高-分布图_数据显示被遮挡, 重新设计AppStore的lastestConnectDatabase, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, merge "bugfix_lm_20230321" into "develop" 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "feature-wyb" into "develop" 修改文案,添加历史数据源, 添加压缩包, SQL诊断-国际化参数诊断, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'd Created-by: zhanghaoyu Author-id: 7119760 MR-id: 7239171 Commit-by: yangzihao;liupengfei;张昊宇;luomeng;罗梦;zhouwenruo;wuyuebin;zhangcheng;wuyulin;zhanghaoyu;Zihao Yang;wuguobiao;hw73730920/wuguobiao;zengseliang;user Merged-by: zhanghaoyu Description: merge "release" into "ncti-master" 测试, merge "feature_wgb_test" into "develop" 测试, 测试, merge "feature_wgb_test" into "develop" 测试, 修改加长连接名称长度限制, merge "develop_wyl" into "develop" 修改加长连接名称长度限制, merge "develop" into "master" 测试, merge "feature_wgb_test" into "develop" 测试, 测试, merge "feature_wgb_test" into "develop" 测试, 修改加长连接名称长度限制, merge "develop_wyl" into "develop" 修改加长连接名称长度限制, 连接信息删除后重置, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, sql诊断_%IOWait高-分布图_数据显示被遮挡, sql诊断_%IOWait高-分布图_数据显示被遮挡, 重新设计AppStore的lastestConnectDatabase, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, 修改文案,添加历史数据源, 添加压缩包, SQL诊断-国际化参数诊断, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, merge "bugfix_lm_20230321" into "develop" 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "feature-wyb" into "develop" 修改文案,添加历史数据源, 添加压缩包, SQL诊断-国际化参数诊断, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "develop" into "master" 连接信息删除后重置, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, sql诊断_%IOWait高-分布图_数据显示被遮挡, sql诊断_%IOWait高-分布图_数据显示被遮挡, 重新设计AppStore的lastestConnectDatabase, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, merge "bugfix_lm_20230321" into "develop" 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "feature-wyb" into "develop" 修改文案,添加历史数据源, 添加压缩包, SQL诊断-国际化参数诊断, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, merge "feature-wyb" into "develop" 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, merge "develop" into "master" 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, merge "feature-wyb" into "develop" 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, 日志检索-修复日志内容解析问题, merge "bugfix_lm_20230321" into "develop" 日志检索-修复日志内容解析问题, 添加unzip安装/校验, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, 添加旧数据处理, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, merge "feature-wyb" into "develop" merge "develop" into "master" 连接信息删除后重置, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, sql诊断_%IOWait高-分布图_数据显示被遮挡, sql诊断_%IOWait高-分布图_数据显示被遮挡, 重新设计AppStore的lastestConnectDatabase, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, merge "bugfix_lm_20230321" into "develop" 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "feature-wyb" into "develop" 修改文案,添加历史数据源, 添加压缩包, SQL诊断-国际化参数诊断, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'd See merge request: openGaussythcs00001/openGauss-workbench!620 commit d3b0386edcd891102947d71021d8c884faa2dcaa Merge: db13da1c c3991cee Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Mon Aug 28 18:45:36 2023 +0800 merge develop into release merge "develop" into "release" 解决yml配置问题, merge brench into develop merge "brench" into "develop" 解决yml配置问题 Created-by: zhanghaoyu Author-id: 7119760 MR-id: 7238461 Commit-by: 张昊宇 Merged-by: zhanghaoyu Description: merge "brench" into "develop" 解决yml配置问题 See merge request: openGaussythcs00001/openGauss-workbench!597, wdr前端优化, codecheck, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" wdr前端优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7238531 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" wdr前端优化 See merge request: openGaussythcs00001/openGauss-workbench!598, elasticsearch安装命令修改, merge Branch_develop into develop merge "Branch_develop" into "develop" codecheck Created-by: zhanghaoyu Author-id: 7119760 MR-id: 7238534 Commit-by: 张昊宇 Merged-by: zhanghaoyu Description: merge "Branch_develop" into "develop" codecheck See merge request: openGaussythcs00001/openGauss-workbench!599, codecheck, codecheck, codecheck, 实例监控bug修复, merge Branch_develop into develop merge "Branch_develop" into "develop" codecheck, 实例监控bug修复 Created-by: zhanghaoyu Author-id: 7119760 MR-id: 7238709 Commit-by: 张昊宇 Merged-by: zhanghaoyu Description: merge "Branch_develop" into "develop" codecheck, 实例监控bug修复 See merge request: openGaussythcs00001/openGauss-workbench!607, es安装修改, merge Branch_develop into develop merge "Branch_develop" into "develop" es安装修改 Created-by: zhanghaoyu Author-id: 7119760 MR-id: 7238728 Commit-by: 张昊宇 Merged-by: wuyuebin Description: merge "Branch_develop" into "develop" es安装修改 See merge request: openGaussythcs00001/openGauss-workbench!608, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, codecheck, codecheck, merge develop into develop-930-lm merge "develop" into "develop-930-lm" 修正sql, 实例详情bug修改, 集群配置测试, Merge branch 'feature-instance-lpf' into feature-instance, topsql排序, 集群监控bug, cpu指标, 查找snapshot, 集群监控添加字段, Merge branch 'feature-instance-lpf' into feature-instance, 分离状态接口, 添加fullcommand,ssh采集本地指标, 首页等待事件, 更新事件类型sql, 内存数据更新, 端口号,线程会话/sqlid, 内存配置更新, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, 修改asp接口, exporter改用ssh连接, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'remotes/origin/feature-yangzihao-develop-930' into feature-instance, 修复exporter重启bug, 指标修改,修改等待事件接口,添加详情-系统资源, CPU部分指标修正,sqlid修改,topsql指标修改, 等待事件修改,top结果修改, 新版集群监控-首页接口, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 修改节点属性, 线程号,系统日志路径, 新版集群监控-集群详情, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, wdr接口, WDR版权, 集群监控, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, test, 集群监控, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 集群监控修改变量类型, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, wdr分析, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, wdr分析 Created-by: wuyuebin Author-id: 7158405 MR-id: 7237993 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, wdr分析 See merge request: openGaussythcs00001/openGauss-workbench!584, 移除旧metric,精简包, 移除无效测试, 提测前修复问题, merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" 提测前修复问题 Created-by: zhangcheng Author-id: 7119759 MR-id: 7238092 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "develop-zhangcheng-0930" into "develop" 提测前修复问题 See merge request: openGaussythcs00001/openGauss-workbench!585, session修改,代码清理, Merge remote-tracking branch 'remotes/origin/develop' into Branch_feature-instance # Conflicts: # plugins/observability-instance/InstanceExporter/src/main/resources/og_exporter.yml, merge Branch_feature-instance into develop merge "Branch_feature-instance" into "develop" 修正sql, 实例详情bug修改, 集群配置测试, Merge branch 'feature-instance-lpf' into feature-instance, topsql排序, 集群监控bug, cpu指标, 查找snapshot, 集群监控添加字段, Merge branch 'feature-instance-lpf' into feature-instance, 分离状态接口, 添加fullcommand,ssh采集本地指标, 首页等待事件, 更新事件类型sql, 内存数据 Created-by: zhanghaoyu Author-id: 7119760 MR-id: 7239169 Commit-by: liupengfei;张昊宇;luomeng;罗梦;yangzihao;wuyuebin;zhanghaoyu Merged-by: yangzihao Description: merge "develop" into "release" 解决yml配置问题, merge brench into develop merge "brench" into "develop" 解决yml配置问题 Created-by: zhanghaoyu Author-id: 7119760 MR-id: 7238461 Commit-by: 张昊宇 Merged-by: zhanghaoyu Description: merge "brench" into "develop" 解决yml配置问题 See merge request: openGaussythcs00001/openGauss-workbench!597, wdr前端优化, codecheck, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" wdr前端优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7238531 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" wdr前端优化 See merge request: openGaussythcs00001/openGauss-workbench!598, elasticsearch安装命令修改, merge Branch_develop into develop merge "Branch_develop" into "develop" codecheck Created-by: zhanghaoyu Author-id: 7119760 MR-id: 7238534 Commit-by: 张昊宇 Merged-by: zhanghaoyu Description: merge "Branch_develop" into "develop" codecheck See merge request: openGaussythcs00001/openGauss-workbench!599, codecheck, codecheck, codecheck, 实例监控bug修复, merge Branch_develop into develop merge "Branch_develop" into "develop" codecheck, 实例监控bug修复 Created-by: zhanghaoyu Author-id: 7119760 MR-id: 7238709 Commit-by: 张昊宇 Merged-by: zhanghaoyu Description: merge "Branch_develop" into "develop" codecheck, 实例监控bug修复 See merge request: openGaussythcs00001/openGauss-workbench!607, es安装修改, merge Branch_develop into develop merge "Branch_develop" into "develop" es安装修改 Created-by: zhanghaoyu Author-id: 7119760 MR-id: 7238728 Commit-by: 张昊宇 Merged-by: wuyuebin Description: merge "Branch_develop" into "develop" es安装修改 See merge request: openGaussythcs00001/openGauss-workbench!608, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, codecheck, codecheck, merge develop into develop-930-lm merge "develop" into "develop-930-lm" 修正sql, 实例详情bug修改, 集群配置测试, Merge branch 'feature-instance-lpf' into feature-instance, topsql排序, 集群监控bug, cpu指标, 查找snapshot, 集群监控添加字段, Merge branch 'feature-instance-lpf' into feature-instance, 分离状态接口, 添加fullcommand,ssh采集本地指标, 首页等待事件, 更新事件类型sql, 内存数据更新, 端口号,线程会话/sqlid, 内存配置更新, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, 修改asp接口, exporter改用ssh连接, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'remotes/origin/feature-yangzihao-develop-930' into feature-instance, 修复exporter重启bug, 指标修改,修改等待事件接口,添加详情-系统资源, CPU部分指标修正,sqlid修改,topsql指标修改, 等待事件修改,top结果修改, 新版集群监控-首页接口, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 修改节点属性, 线程号,系统日志路径, 新版集群监控-集群详情, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, wdr接口, WDR版权, 集群监控, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, test, 集群监控, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 集群监控修改变量类型, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, wdr分析, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, wdr分析 Created-by: wuyuebin Author-id: 7158405 MR-id: 7237993 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, wdr分析 See merge request: openGaussythcs00001/openGauss-workbench!584, 移除旧metric,精简包, 移除无效测试, 提测前修复问题, merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" 提测前修复问题 Created-by: zhangcheng Author-id: 7119759 MR-id: 7238092 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "develop-zhangcheng-0930" into "develop" 提测前修复问题 See merge request: openGaussythcs00001/openGauss-workbench!585, session修改,代码清理, Merge remote-tracking branch 'remotes/origin/develop' into Branch_feature-instance # Conflicts: # plugins/observability-instance/InstanceExporter/src/main/resources/og_exporter.yml, merge Branch_feature-instance into develop merge "Branch_feature-instance" into "develop" 修正sql, 实例详情bug修改, 集群配置测试, Merge branch 'feature-instance-lpf' into feature-instance, topsql排序, 集群监控bug, cpu指标, 查找snapshot, 集群监控添加字段, Merge branch 'feature-instance-lpf' into feature-instance, 分离状态接口, 添加fullcommand,ssh采集本地指标, 首页等待事件, 更新事件类型sql, 内存数据 See merge request: openGaussythcs00001/openGauss-workbench!619 commit c3991cee89a9607fa76a2ab8d57cd0e6c025cfaf Merge: b66bb250 d21e304b Author: liupengfei <433218b6b32a4df9a4af133bc89b98e5@example.com> Date: Mon Aug 28 18:39:27 2023 +0800 merge develop-codecheck into develop merge "develop-codecheck" into "develop" codecheck Created-by: zhanghaoyu Author-id: 7119760 MR-id: 7239163 Commit-by: 张昊宇 Merged-by: liupengfei Description: merge "develop-codecheck" into "develop" codecheck See merge request: openGaussythcs00001/openGauss-workbench!618 commit d21e304b6e592cd5b7de72c9c2fe27815201c2c4 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon Aug 28 18:30:56 2023 +0800 codecheck commit b66bb250689e0115c550df7f830ed096dd1ab3dd Merge: 9cc968cf 085330d3 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Mon Aug 28 17:50:22 2023 +0800 merge develop-930-lm into develop merge "develop-930-lm" into "develop" merge develop into develop-930-lm merge "develop" into "develop-930-lm" 修正sql, 实例详情bug修改, 集群配置测试, Merge branch 'feature-instance-lpf' into feature-instance, topsql排序, 集群监控bug, cpu指标, 查找snapshot, 集群监控添加字段, Merge branch 'feature-instance-lpf' into feature-instance, 分离状态接口, 添加fullcommand,ssh采集本地指标, 首页等待事件, 更新事件类型sql, 内存数据更新, 端口号,线程会话/sqlid, 内存配置更新, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, 修改asp接口, exporter改用ssh连接, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'remotes/origin/feature-yangzihao-develop-930' into feature-instance, 修复exporter重启bug, 指标修改,修改等待事件接口,添加详情-系统资源, CPU部分指标修正,sqlid修改,topsql指标修改, 等待事件修改,top结果修改, 新版集群监控-首页接口, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 修改节点属性, 线程号,系统日志路径, 新版集群监控-集群详情, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, wdr接口, WDR版权, 集群监控, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, test, 集群监控, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 集群监控修改变量类型, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, wdr分析, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, wdr分析 Created-by: wuyuebin Author-id: 7158405 MR-id: 7237993 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, wdr分析 See merge request: openGaussythcs00001/openGauss-workbench!584, 移除旧metric,精简包, 移除无效测试, 提测前修复问题, merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" 提测前修复问题 Created-by: zhangcheng Author-id: 7119759 MR-id: 7238092 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "develop-zhangcheng-0930" into "develop" 提测前修复问题 See merge request: openGaussythcs00001/openGauss-workbench!585, session修改,代码清理, Merge remote-tracking branch 'remotes/origin/develop' into Branch_feature-instance # Conflicts: # plugins/observability-instance/InstanceExporter/src/main/resources/og_exporter.yml, merge Branch_feature-instance into develop merge "Branch_feature-instance" into "develop" 修正sql, 实例详情bug修改, 集群配置测试, Merge branch 'feature-instance-lpf' into feature-instance, topsql排序, 集群监控bug, cpu指标, 查找snapshot, 集群监控添加字段, Merge branch 'feature-instance-lpf' into feature-instance, 分离状态接口, 添加fullcommand,ssh采集本地指标, 首页等待事件, 更新事件类型sql, 内存数据更新, 端口号,线程会话/sqlid, 内存配置更新, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, 修改asp接口, exporter改用ssh连接, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'remotes/origin/feature-yangzihao-develop-930' into feature-instance, 修复exporter重启bug, 指标修改,修改等待事件接口,添加详情-系统资源, CPU部分指标修正,sqlid修改,topsql指标修改, 等待事件修改,top结果修改, 新版集群监控-首页接口, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 修改节点属性, 线程号,系统日志路径, 新版集群监控-集群详情, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, wdr接口, WDR版权, 集群监控, test, 集群监控, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 集群监控修改变量类型, 移除旧metric,精简包, 移除无效测试, session修改,代码清理, Merge remote-tracking branch 'remotes/origin/develop' into Branch_feature-instance # Conflicts: # plugins/observability-instance/InstanceExporter/src/main/resources/og_exporter.yml Created-by: zhanghaoyu Author-id: 7119760 MR-id: 7238124 Commit-by: 张昊宇;liupengfei Merged-by: zhanghaoyu Description: merge "Branch_feature-instance" into "develop" 修正sql, 实例详情bug修改, 集群配置测试, Merge branch 'feature-instance-lpf' into feature-instance, topsql排序, 集群监控bug, cpu指标, 查找snapshot, 集群监控添加字段, Merge branch 'feature-instance-lpf' into feature-instance, 分离状态接口, 添加fullcommand,ssh采集本地指标, 首页等待事件, 更新事件类型sql, 内存数据更新, 端口号,线程会话/sqlid, 内存配置更新, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, 修改asp接口, exporter改用ssh连接, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'remotes/origin/feature-yangzihao-develop-930' into feature-instance, 修复exporter重启bug, 指标修改,修改等待事 Created-by: luomeng Author-id: 7119743 MR-id: 7239076 Commit-by: 罗梦;luomeng Merged-by: luomeng Description: merge "develop-930-lm" into "develop" merge develop into develop-930-lm merge "develop" into "develop-930-lm" 修正sql, 实例详情bug修改, 集群配置测试, Merge branch 'feature-instance-lpf' into feature-instance, topsql排序, 集群监控bug, cpu指标, 查找snapshot, 集群监控添加字段, Merge branch 'feature-instance-lpf' into feature-instance, 分离状态接口, 添加fullcommand,ssh采集本地指标, 首页等待事件, 更新事件类型sql, 内存数据更新, 端口号,线程会话/sqlid, 内存配置更新, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, 修改asp接口, exporter改用ssh连接, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'remotes/origin/feature-yangzihao-develop-930' into feature-instance, 修复exporter重启bug, 指标修改,修改等待事件接口,添加详情-系统资源, CPU部分指标修正,sqlid修改,topsql指标修改, 等待事件修改,top结果修改, 新版集群监控-首页接口, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 修改节点属性, 线程号,系统日志路径, 新版集群监控-集群详情, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, wdr接口, WDR版权, 集群监控, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, test, 集群监控, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 集群监控修改变量类型, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, wdr分析, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, wdr分析 Created-by: wuyuebin Author-id: 7158405 MR-id: 7237993 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, wdr分析 See merge request: openGaussythcs00001/openGauss-workbench!584, 移除旧metric,精简包, 移除无效测试, 提测前修复问题, merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" 提测前修复问题 Created-by: zhangcheng Author-id: 7119759 MR-id: 7238092 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "develop-zhangcheng-0930" into "develop" 提测前修复问题 See merge request: openGaussythcs00001/openGauss-workbench!585, session修改,代码清理, Merge remote-tracking branch 'remotes/origin/develop' into Branch_feature-instance # Conflicts: # plugins/observability-instance/InstanceExporter/src/main/resources/og_exporter.yml, merge Branch_feature-instance into develop merge "Branch_feature-instance" into "develop" 修正sql, 实例详情bug修改, 集群配置测试, Merge branch 'feature-instance-lpf' into feature-instance, topsql排序, 集群监控bug, cpu指标, 查找snapshot, 集群监控添加字段, Merge branch 'feature-instance-lpf' into feature-instance, 分离状态接口, 添加fullcommand,ssh采集本地指标, 首页等待事件, 更新事件类型sql, 内存数据更新, 端口号,线程会话/sqlid, 内存配置更新, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, 修改asp接口, exporter改用ssh连接, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'remotes/origin/feature-yangzihao-develop-930' into feature-instance, 修复exporter重启bug, 指标修改,修改等待事件接口,添加详情-系统资源, CPU部分指标修正,sqlid修改,topsql指标修改, 等待事件修改,top结果修改, 新版集群监控-首页接口, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 修改节点属性, 线程号,系统日志路径, 新版集群监控-集群详情, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, wdr接口, WDR版权, 集群监控, test, 集群监控, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 集群监控修改变量类型, 移除旧metric,精简包, 移除无效测试, session修改,代码清理, Merge remote-tracking branch 'remotes/origin/develop' into Branch_feature-instance # Conflicts: # plugins/observability-instance/InstanceExporter/src/main/resources/og_exporter.yml Created-by: zhanghaoyu Author-id: 7119760 MR-id: 7238124 Commit-by: 张昊宇;liupengfei Merged-by: zhanghaoyu Description: merge "Branch_feature-instance" into "develop" 修正sql, 实例详情bug修改, 集群配置测试, Merge branch 'feature-instance-lpf' into feature-instance, topsql排序, 集群监控bug, cpu指标, 查找snapshot, 集群监控添加字段, Merge branch 'feature-instance-lpf' into feature-instance, 分离状态接口, 添加fullcommand,ssh采集本地指标, 首页等待事件, 更新事件类型sql, 内存数据更新, 端口号,线程会话/sqlid, 内存配置更新, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, 修改asp接口, exporter改用ssh连接, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'remotes/origin/feature-yangzihao-develop-930' into feature-instance, 修复exporter重启bug, 指标修改,修改等待事 See merge request: openGaussythcs00001/openGauss-workbench!617 commit 085330d3c9c69781168b9e29fd8de8ea6d0d3675 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Mon Aug 28 16:58:08 2023 +0800 智能诊断930版本代码 commit f98c726e5991a91fbb165a309398e0d2d7050a5e Author: 罗梦 <luomeng@ncti-gba.cn> Date: Mon Aug 28 16:43:08 2023 +0800 智能诊断930版本代码 commit c803245c809704b5546f44832941171b5cd4e128 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Mon Aug 28 16:36:56 2023 +0800 智能诊断930版本代码 commit 9cc968cfb0cadb8be2c06f5aacd4096da1630376 Merge: dc62a65a 77917560 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Mon Aug 28 15:59:03 2023 +0800 merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" codecheck, codecheck, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, codecheck, codecheck, 单元测试, codecheck, codecheck, codecheck, codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7239034 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" codecheck, codecheck, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, codecheck, codecheck, 单元测试, codecheck, codecheck, codecheck, codecheck See merge request: openGaussythcs00001/openGauss-workbench!614 commit db13da1c8dded77899b5aa3ef39390bf247231f5 Merge: 904a5211 bfda4a64 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Mon Aug 28 15:50:40 2023 +0800 merge release-zwr into release merge "release-zwr" into "release" Merge remote-tracking branch 'origin/release' into release-zwr, Merge remote-tracking branch 'origin/release' into release-zwr, 单元测试编写 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7239040 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" Merge remote-tracking branch 'origin/release' into release-zwr, Merge remote-tracking branch 'origin/release' into release-zwr, 单元测试编写 See merge request: openGaussythcs00001/openGauss-workbench!615 commit bfda4a64f38ce14f5de7443f5e6f0866f64c32d1 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Mon Aug 28 15:49:43 2023 +0800 单元测试编写 commit 779175605bfbbae968b30dc6d7b60847e87ac9a1 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Aug 28 15:25:25 2023 +0800 codecheck commit 90d66a4880b38c169d9e0e7101e497d1900bc9b2 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Aug 28 15:15:15 2023 +0800 codecheck commit 1760072f1e2910d5c3d34f40686896fcf9616157 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Aug 28 14:34:03 2023 +0800 codecheck commit 904a521137afa22bd82f27d9772edfe37f150d10 Merge: 7f503a48 6482ff6a Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Mon Aug 28 14:12:10 2023 +0800 merge release-wyl into release merge "release-wyl" into "release" bug修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7238939 Commit-by: wuyulin Merged-by: zhouwenruo Description: merge "release-wyl" into "release" bug修复 See merge request: openGaussythcs00001/openGauss-workbench!612 commit 7c35e2c27875367ae45e426c2af49e4b8186c807 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Aug 28 11:38:18 2023 +0800 codecheck commit 2038a98c0da4583ad8df753406a10bbe5fc8f79c Merge: cd7f9ab3 7f503a48 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Mon Aug 28 11:33:39 2023 +0800 Merge remote-tracking branch 'origin/release' into release-zwr commit 7f503a482d79c0efb6f298978b1773de0219c2f7 Merge: fb8d5599 0066de28 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Mon Aug 28 11:31:24 2023 +0800 merge release-zhangcheng-2309 into release merge "release-zhangcheng-2309" into "release" codeCheck Created-by: zhangcheng Author-id: 7119759 MR-id: 7238945 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "release-zhangcheng-2309" into "release" codeCheck See merge request: openGaussythcs00001/openGauss-workbench!613 commit 0066de28da62c2c7839daeac7d309ee6603c5def Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Mon Aug 28 11:27:01 2023 +0800 codeCheck commit 6482ff6a3db199a41812802f1b15b77cdfce67a2 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Mon Aug 28 11:22:15 2023 +0800 bug修复 commit 790342e593a193893b99377eacea6aecdf222968 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Aug 28 11:21:41 2023 +0800 单元测试 commit fb8d5599e9aa6f579369eba3e5c8d80edf629593 Merge: f20445a5 7a28b209 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Mon Aug 28 11:12:29 2023 +0800 merge release-zhangcheng-2309 into release merge "release-zhangcheng-2309" into "release" 改bug Created-by: zhangcheng Author-id: 7119759 MR-id: 7238931 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "release-zhangcheng-2309" into "release" 改bug See merge request: openGaussythcs00001/openGauss-workbench!611 commit 7a28b2095e425587584bdb12372ae666ac6f96da Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Mon Aug 28 11:11:02 2023 +0800 改bug commit cd7f9ab3fb4fee8e0bb0d27058ea72a6224fe8c7 Merge: 4e5a437e 8bb63c89 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Mon Aug 28 10:52:18 2023 +0800 Merge remote-tracking branch 'origin/release' into release-zwr commit f20445a54eebf9933856c6664903f1b08dc16faa Merge: 8bb63c89 4e5a437e Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Mon Aug 28 10:52:09 2023 +0800 merge release-zwr into release merge "release-zwr" into "release" code check 修改 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7238923 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" code check 修改 See merge request: openGaussythcs00001/openGauss-workbench!610 commit 4e5a437e6ee284847655cb41d3b8dda67ce6ce9b Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Mon Aug 28 10:48:53 2023 +0800 code check 修改 commit e4fd7a13a396a5d6a495500793a49a2b35195c54 Merge: 64c848d5 dc62a65a Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Mon Aug 28 08:52:09 2023 +0800 merge develop into develop-930-lm merge "develop" into "develop-930-lm" 修正sql, 实例详情bug修改, 集群配置测试, Merge branch 'feature-instance-lpf' into feature-instance, topsql排序, 集群监控bug, cpu指标, 查找snapshot, 集群监控添加字段, Merge branch 'feature-instance-lpf' into feature-instance, 分离状态接口, 添加fullcommand,ssh采集本地指标, 首页等待事件, 更新事件类型sql, 内存数据更新, 端口号,线程会话/sqlid, 内存配置更新, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, 修改asp接口, exporter改用ssh连接, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'remotes/origin/feature-yangzihao-develop-930' into feature-instance, 修复exporter重启bug, 指标修改,修改等待事件接口,添加详情-系统资源, CPU部分指标修正,sqlid修改,topsql指标修改, 等待事件修改,top结果修改, 新版集群监控-首页接口, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 修改节点属性, 线程号,系统日志路径, 新版集群监控-集群详情, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, wdr接口, WDR版权, 集群监控, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, test, 集群监控, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 集群监控修改变量类型, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, wdr分析, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, wdr分析 Created-by: wuyuebin Author-id: 7158405 MR-id: 7237993 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, wdr分析 See merge request: openGaussythcs00001/openGauss-workbench!584, 移除旧metric,精简包, 移除无效测试, 提测前修复问题, merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" 提测前修复问题 Created-by: zhangcheng Author-id: 7119759 MR-id: 7238092 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "develop-zhangcheng-0930" into "develop" 提测前修复问题 See merge request: openGaussythcs00001/openGauss-workbench!585, session修改,代码清理, Merge remote-tracking branch 'remotes/origin/develop' into Branch_feature-instance # Conflicts: # plugins/observability-instance/InstanceExporter/src/main/resources/og_exporter.yml, merge Branch_feature-instance into develop merge "Branch_feature-instance" into "develop" 修正sql, 实例详情bug修改, 集群配置测试, Merge branch 'feature-instance-lpf' into feature-instance, topsql排序, 集群监控bug, cpu指标, 查找snapshot, 集群监控添加字段, Merge branch 'feature-instance-lpf' into feature-instance, 分离状态接口, 添加fullcommand,ssh采集本地指标, 首页等待事件, 更新事件类型sql, 内存数据更新, 端口号,线程会话/sqlid, 内存配置更新, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, 修改asp接口, exporter改用ssh连接, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'remotes/origin/feature-yangzihao-develop-930' into feature-instance, 修复exporter重启bug, 指标修改,修改等待事件接口,添加详情-系统资源, CPU部分指标修正,sqlid修改,topsql指标修改, 等待事件修改,top结果修改, 新版集群监控-首页接口, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 修改节点属性, 线程号,系统日志路径, 新版集群监控-集群详情, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, wdr接口, WDR版权, 集群监控, test, 集群监控, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 集群监控修改变量类型, 移除旧metric,精简包, 移除无效测试, session修改,代码清理, Merge remote-tracking branch 'remotes/origin/develop' into Branch_feature-instance # Conflicts: # plugins/observability-instance/InstanceExporter/src/main/resources/og_exporter.yml Created-by: zhanghaoyu Author-id: 7119760 MR-id: 7238124 Commit-by: 张昊宇;liupengfei Merged-by: zhanghaoyu Description: merge "Branch_feature-instance" into "develop" 修正sql, 实例详情bug修改, 集群配置测试, Merge branch 'feature-instance-lpf' into feature-instance, topsql排序, 集群监控bug, cpu指标, 查找snapshot, 集群监控添加字段, Merge branch 'feature-instance-lpf' into feature-instance, 分离状态接口, 添加fullcommand,ssh采集本地指标, 首页等待事件, 更新事件类型sql, 内存数据更新, 端口号,线程会话/sqlid, 内存配置更新, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, 修改asp接口, exporter改用ssh连接, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'remotes/origin/feature-yangzihao-develop-930' into feature-instance, 修复exporter重启bug, 指标修改,修改等待事件接口,添加详情-系统资源, CPU部分指标修正,sqlid修改,topsql指标修改, 等待事件修改,top结果修改, 新版集群监控-首页接口, Created-by: luomeng Author-id: 7119743 MR-id: 7238868 Commit-by: wuyuebin;张昊宇;zhanghaoyu;yangzihao;Zihao Yang;liupengfei;zhouwenruo;zhangcheng Merged-by: luomeng Description: merge "develop" into "develop-930-lm" 修正sql, 实例详情bug修改, 集群配置测试, Merge branch 'feature-instance-lpf' into feature-instance, topsql排序, 集群监控bug, cpu指标, 查找snapshot, 集群监控添加字段, Merge branch 'feature-instance-lpf' into feature-instance, 分离状态接口, 添加fullcommand,ssh采集本地指标, 首页等待事件, 更新事件类型sql, 内存数据更新, 端口号,线程会话/sqlid, 内存配置更新, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, 修改asp接口, exporter改用ssh连接, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'remotes/origin/feature-yangzihao-develop-930' into feature-instance, 修复exporter重启bug, 指标修改,修改等待事件接口,添加详情-系统资源, CPU部分指标修正,sqlid修改,topsql指标修改, 等待事件修改,top结果修改, 新版集群监控-首页接口, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 修改节点属性, 线程号,系统日志路径, 新版集群监控-集群详情, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, wdr接口, WDR版权, 集群监控, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, test, 集群监控, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 集群监控修改变量类型, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, wdr分析, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, wdr分析 Created-by: wuyuebin Author-id: 7158405 MR-id: 7237993 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, wdr分析 See merge request: openGaussythcs00001/openGauss-workbench!584, 移除旧metric,精简包, 移除无效测试, 提测前修复问题, merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" 提测前修复问题 Created-by: zhangcheng Author-id: 7119759 MR-id: 7238092 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "develop-zhangcheng-0930" into "develop" 提测前修复问题 See merge request: openGaussythcs00001/openGauss-workbench!585, session修改,代码清理, Merge remote-tracking branch 'remotes/origin/develop' into Branch_feature-instance # Conflicts: # plugins/observability-instance/InstanceExporter/src/main/resources/og_exporter.yml, merge Branch_feature-instance into develop merge "Branch_feature-instance" into "develop" 修正sql, 实例详情bug修改, 集群配置测试, Merge branch 'feature-instance-lpf' into feature-instance, topsql排序, 集群监控bug, cpu指标, 查找snapshot, 集群监控添加字段, Merge branch 'feature-instance-lpf' into feature-instance, 分离状态接口, 添加fullcommand,ssh采集本地指标, 首页等待事件, 更新事件类型sql, 内存数据更新, 端口号,线程会话/sqlid, 内存配置更新, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, 修改asp接口, exporter改用ssh连接, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'remotes/origin/feature-yangzihao-develop-930' into feature-instance, 修复exporter重启bug, 指标修改,修改等待事件接口,添加详情-系统资源, CPU部分指标修正,sqlid修改,topsql指标修改, 等待事件修改,top结果修改, 新版集群监控-首页接口, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 修改节点属性, 线程号,系统日志路径, 新版集群监控-集群详情, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, wdr接口, WDR版权, 集群监控, test, 集群监控, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 集群监控修改变量类型, 移除旧metric,精简包, 移除无效测试, session修改,代码清理, Merge remote-tracking branch 'remotes/origin/develop' into Branch_feature-instance # Conflicts: # plugins/observability-instance/InstanceExporter/src/main/resources/og_exporter.yml Created-by: zhanghaoyu Author-id: 7119760 MR-id: 7238124 Commit-by: 张昊宇;liupengfei Merged-by: zhanghaoyu Description: merge "Branch_feature-instance" into "develop" 修正sql, 实例详情bug修改, 集群配置测试, Merge branch 'feature-instance-lpf' into feature-instance, topsql排序, 集群监控bug, cpu指标, 查找snapshot, 集群监控添加字段, Merge branch 'feature-instance-lpf' into feature-instance, 分离状态接口, 添加fullcommand,ssh采集本地指标, 首页等待事件, 更新事件类型sql, 内存数据更新, 端口号,线程会话/sqlid, 内存配置更新, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, 修改asp接口, exporter改用ssh连接, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'remotes/origin/feature-yangzihao-develop-930' into feature-instance, 修复exporter重启bug, 指标修改,修改等待事件接口,添加详情-系统资源, CPU部分指标修正,sqlid修改,topsql指标修改, 等待事件修改,top结果修改, 新版集群监控-首页接口, See merge request: openGaussythcs00001/openGauss-workbench!609 commit 0ba4d3dbe809c1612391924d92ac13db318334b2 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Fri Aug 25 18:17:44 2023 +0800 codecheck commit bf4920b6141500782d2217f468a3fea31d50656c Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Fri Aug 25 17:58:28 2023 +0800 codecheck commit e844792c73e356f757b9d947908f127cefdb5b4d Merge: 794034ea dc62a65a Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Fri Aug 25 17:56:59 2023 +0800 Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930 commit dc62a65ac72fded4a0eb30f635f1bd075e9b9960 Merge: dbccad37 54cddd66 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Fri Aug 25 17:43:30 2023 +0800 merge Branch_develop into develop merge "Branch_develop" into "develop" es安装修改 Created-by: zhanghaoyu Author-id: 7119760 MR-id: 7238728 Commit-by: 张昊宇 Merged-by: wuyuebin Description: merge "Branch_develop" into "develop" es安装修改 See merge request: openGaussythcs00001/openGauss-workbench!608 commit 54cddd66686de40fa0577e1873228e281fc46552 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Aug 25 17:39:11 2023 +0800 es安装修改 commit dbccad37ffc5054113ddce63a0ba27f491d842be Merge: da604137 cff37893 Author: zhanghaoyu <e9a6a9f516404feeabca273d60808c07@example.com> Date: Fri Aug 25 17:20:57 2023 +0800 merge Branch_develop into develop merge "Branch_develop" into "develop" codecheck, 实例监控bug修复 Created-by: zhanghaoyu Author-id: 7119760 MR-id: 7238709 Commit-by: 张昊宇 Merged-by: zhanghaoyu Description: merge "Branch_develop" into "develop" codecheck, 实例监控bug修复 See merge request: openGaussythcs00001/openGauss-workbench!607 commit cff378935664570eef589081414d0fa2fad43ab2 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Aug 25 17:12:42 2023 +0800 codecheck, 实例监控bug修复 commit 794034ea61b3e729a2a359240ba48bae6d539efd Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Fri Aug 25 16:13:29 2023 +0800 codecheck commit 8bb63c89cbf3390503723d0488ab2103b21a4876 Merge: 3fc0da01 1d422e3a Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Fri Aug 25 16:10:27 2023 +0800 merge release-zhangcheng-2309 into release merge "release-zhangcheng-2309" into "release" 排序多选，修bug Created-by: zhangcheng Author-id: 7119759 MR-id: 7238666 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "release-zhangcheng-2309" into "release" 排序多选，修bug See merge request: openGaussythcs00001/openGauss-workbench!606 commit 1d422e3a5de2856b25c6ccc20dff3dbfec2f6d8c Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Fri Aug 25 16:07:57 2023 +0800 排序多选，修bug commit 3fc0da012f66ac63750cdff946dd8cc7bc20c2dc Merge: 55771cea 95f09cca Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Fri Aug 25 16:03:26 2023 +0800 merge release-zwr into release merge "release-zwr" into "release" code check 修改 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7238660 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" code check 修改 See merge request: openGaussythcs00001/openGauss-workbench!605 commit 95f09ccaeeabbdc06f0b0d85b59f4de78060e159 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Fri Aug 25 16:02:56 2023 +0800 code check 修改 commit 55771ceaf09718e45f3b1d9d94a575e86dfcaa71 Merge: 2df73d62 5e84533f Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Fri Aug 25 15:50:29 2023 +0800 merge release-zwr into release merge "release-zwr" into "release" code check 修改 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7238648 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" code check 修改 See merge request: openGaussythcs00001/openGauss-workbench!604 commit 5e84533f36373f9c5bc9ee130465b9ba0137a6ee Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Fri Aug 25 15:49:16 2023 +0800 code check 修改 commit 2df73d629906c34813678fcddfc63cf9b5e7986c Merge: 91cce720 7461b234 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Fri Aug 25 15:42:47 2023 +0800 merge release-zwr into release merge "release-zwr" into "release" code check 修改 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7238638 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" code check 修改 See merge request: openGaussythcs00001/openGauss-workbench!603 commit 7461b2348aca7a4c680237878c111f0efb5c4fad Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Fri Aug 25 15:41:16 2023 +0800 code check 修改 commit 88e904c14e01bcff8fba0442536b43c8866d9fdd Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Fri Aug 25 15:01:26 2023 +0800 codecheck commit 91cce720f5e5166e75d96875059d3132693c85be Merge: 99052d44 1f16be84 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Fri Aug 25 14:33:27 2023 +0800 merge release-zwr into release merge "release-zwr" into "release" code check 修改 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7238589 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" code check 修改 See merge request: openGaussythcs00001/openGauss-workbench!601 commit 1f16be8409d49f2ef6ddda0abac2cfc80d5beb1a Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Fri Aug 25 14:29:09 2023 +0800 code check 修改 commit da604137b8264cd7654c53f560605d7101404b7c Merge: 6b1dab63 9e479014 Author: zhanghaoyu <e9a6a9f516404feeabca273d60808c07@example.com> Date: Fri Aug 25 14:07:22 2023 +0800 merge Branch_develop into develop merge "Branch_develop" into "develop" codecheck Created-by: zhanghaoyu Author-id: 7119760 MR-id: 7238534 Commit-by: 张昊宇 Merged-by: zhanghaoyu Description: merge "Branch_develop" into "develop" codecheck See merge request: openGaussythcs00001/openGauss-workbench!599 commit 99052d44e1d1e29b97a0bd73d5e6dd3614444d85 Merge: 95dd7bae 06cb1ee9 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Fri Aug 25 11:50:44 2023 +0800 merge release-zwr into release merge "release-zwr" into "release" code check 修改 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7238553 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" code check 修改 See merge request: openGaussythcs00001/openGauss-workbench!600 commit 9e4790143f54cadcd8e613e2499aa4c7161621a6 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Aug 25 11:48:08 2023 +0800 elasticsearch安装命令修改 commit 06cb1ee98d28c44baf1b9c96afa548d2f4fc619e Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Fri Aug 25 11:47:20 2023 +0800 code check 修改 commit 6b1dab63700222ee7f403b9c044d90bfed063b2f Merge: 9020f7da 29606d97 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Fri Aug 25 11:23:56 2023 +0800 merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" wdr前端优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7238531 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" wdr前端优化 See merge request: openGaussythcs00001/openGauss-workbench!598 commit 2d712d6a11894afbdf5a781feb3d9a9e1947c443 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Aug 25 10:43:37 2023 +0800 codecheck commit 29606d9723efa5d0f0d506b906cf2c9457e23444 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Fri Aug 25 11:21:20 2023 +0800 wdr前端优化 commit 9020f7dadc88ef9ee5e01787484ab190e591b280 Merge: 23957578 cd4ca4d4 Author: zhanghaoyu <e9a6a9f516404feeabca273d60808c07@example.com> Date: Fri Aug 25 09:55:57 2023 +0800 merge brench into develop merge "brench" into "develop" 解决yml配置问题 Created-by: zhanghaoyu Author-id: 7119760 MR-id: 7238461 Commit-by: 张昊宇 Merged-by: zhanghaoyu Description: merge "brench" into "develop" 解决yml配置问题 See merge request: openGaussythcs00001/openGauss-workbench!597 commit cd4ca4d4f426fb237b31c2a48084d436297e458e Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Aug 25 09:37:44 2023 +0800 解决yml配置问题 commit 95dd7bae89cb180573a63f7bb60ef8bcd556a816 Merge: e89c31f7 23957578 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Fri Aug 25 09:02:37 2023 +0800 merge develop into release merge "develop" into "release" merge develop into develop-930-lm merge "develop" into "develop-930-lm" repair data-studio, Merge remote-tracking branch 'origin/master', Merge remote-tracking branch 'origin/master', !369 业务开发-列问题回滚 Merge pull request !369 from 吴雨霖/master, 增加websocket默认消息大小，取消正则表达式判断条件, !370 增加websocket消息大小，取消迁移正则表达式文本限制 Merge pull request !370 from 王亚龙/master, 修改正则表达式判断条件, !371 修改正则表达式判断条件 Merge pull request !371 from 王亚龙/master, 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off, !373 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off Merge pull request !373 from 王亚龙/master, 杨子浩 930 实例监控前端代码, 第三方通知——snmp通知方式, Merge branch 'master' of https://gitee.com/opengauss/openGauss-workbench, repair druid config, !377 [bugfix] 修复druid没有检查直接使用线程池链接的问题 Merge pull request !377 from 周斌/master, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 屏蔽部分单元测试, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" 第三方通知——snmp通知方式, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 屏蔽部分单元测试 Created-by: wuyuebin Author-id: 7158405 MR-id: 7236880 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" 第三方通知——snmp通知方式, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 屏蔽部分单元测试 See merge request: openGaussythcs00001/openGauss-workbench!569, web-ds支持匿名块调试, 单元测试及代码优化, 调整查看用户角色功能, 视图、新增角色、删除角色, 匿名块调试readme修改, !372 web-ds支持匿名块调试 Merge pull request !372 from 李秦朗/master, !379 web-ds匿名块调试readme修改 Merge pull request !379 from 李秦朗/readme, Test覆盖率, merge develop-zwr into develop merge "develop-zwr" into "develop" 调整查看用户角色功能 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7237663 Commit-by: zhouwenruo Merged-by: zhangcheng Description: merge "develop-zwr" into "develop" 调整查看用户角色功能 See merge request: openGaussythcs00001/openGauss-workbench!571, 社区pr代码修改, 合并社区代码, merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" 视图、新增角色、删除角色, 社区pr代码修改 Created-by: zhangcheng Author-id: 7119759 MR-id: 7237720 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "develop-zhangcheng-0930" into "develop" 视图、新增角色、删除角色, 社区pr代码修改 See merge request: openGaussythcs00001/openGauss-workbench!573, merge develop-zwr into develop merge "develop-zwr" into "develop" 合并社区代码 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7237730 Commit-by: zhouwenruo Merged-by: zhangcheng Description: merge "develop-zwr" into "develop" 合并社区代码 See merge request: openGaussythcs00001/openGauss-workbench!574, merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 实例监控前端代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7237690 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 实例监控前端代码 See merge request: openGaussythcs00001/openGauss-workbench!572, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" 单元测试及代码优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7237184 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" 单元测试及代码优化 See merge request: openGaussythcs00001/openGauss-workbench!570, 杨子浩 930 集群监控代码, 杨子浩 930 集群监控 增加刷新按钮, Merge remote-tracking branch 'origin/release' into develop-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/debug/AsyncHelper.java # plugins/data-studio/web-ui/src/components/terminal-editor/createTemplate.ts # plugins/data-studio/web-ui/src/layout/Sidebar/index.vue, merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 集群监控代码, 杨子浩 930 集群监控 增加刷新按钮 Created-by: yangzihao Author-id: 7119754 MR-id: 7237763 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 集群监控代码, 杨子浩 930 集群监控 增加刷新按钮 See merge request: openGaussythcs00001/openGauss-workbench!579, merge develop-zwr into develop merge "develop-zwr" into "develop" repair data-studio, Merge remote-tracking branch 'origin/master', Merge remote-tracking branch 'origin/master', !369 业务开发-列问题回滚 Merge pull request !369 from 吴雨霖/master, 增加websocket默认消息大小，取消正则表达式判断条件, !370 增加websocket消息大小，取消迁移正则表达式文本限制 Merge pull request !370 from 王亚龙/master, 修改正则表达式判断条件, !371 修改正则表达式判断条件 Merge pull request !371 from 王亚龙/master, 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off, !373 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off Merge pull request !373 from 王亚龙/master, Merge branch 'master' of https://gitee.com/opengauss/openGauss-workbench, repair druid config, !377 [bugfix] 修复druid没有检查直接使用线程池链接的问题 Merge pull request !377 from 周斌/master, web-ds支持匿名块调试, 匿名块调试readme修改, !372 web-ds支持匿名块调试 Merge pull request !372 from 李秦朗/master, !379 web-ds匿名块 Created-by: wuyuebin Author-id: 7158405 MR-id: 7238437 Commit-by: wuyuebin;yangzihao;Zihao Yang;liupengfei;罗梦;luomeng Merged-by: yangzihao Description: merge "develop" into "release" merge develop into develop-930-lm merge "develop" into "develop-930-lm" repair data-studio, Merge remote-tracking branch 'origin/master', Merge remote-tracking branch 'origin/master', !369 业务开发-列问题回滚 Merge pull request !369 from 吴雨霖/master, 增加websocket默认消息大小，取消正则表达式判断条件, !370 增加websocket消息大小，取消迁移正则表达式文本限制 Merge pull request !370 from 王亚龙/master, 修改正则表达式判断条件, !371 修改正则表达式判断条件 Merge pull request !371 from 王亚龙/master, 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off, !373 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off Merge pull request !373 from 王亚龙/master, 杨子浩 930 实例监控前端代码, 第三方通知——snmp通知方式, Merge branch 'master' of https://gitee.com/opengauss/openGauss-workbench, repair druid config, !377 [bugfix] 修复druid没有检查直接使用线程池链接的问题 Merge pull request !377 from 周斌/master, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 屏蔽部分单元测试, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" 第三方通知——snmp通知方式, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 屏蔽部分单元测试 Created-by: wuyuebin Author-id: 7158405 MR-id: 7236880 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" 第三方通知——snmp通知方式, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 屏蔽部分单元测试 See merge request: openGaussythcs00001/openGauss-workbench!569, web-ds支持匿名块调试, 单元测试及代码优化, 调整查看用户角色功能, 视图、新增角色、删除角色, 匿名块调试readme修改, !372 web-ds支持匿名块调试 Merge pull request !372 from 李秦朗/master, !379 web-ds匿名块调试readme修改 Merge pull request !379 from 李秦朗/readme, Test覆盖率, merge develop-zwr into develop merge "develop-zwr" into "develop" 调整查看用户角色功能 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7237663 Commit-by: zhouwenruo Merged-by: zhangcheng Description: merge "develop-zwr" into "develop" 调整查看用户角色功能 See merge request: openGaussythcs00001/openGauss-workbench!571, 社区pr代码修改, 合并社区代码, merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" 视图、新增角色、删除角色, 社区pr代码修改 Created-by: zhangcheng Author-id: 7119759 MR-id: 7237720 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "develop-zhangcheng-0930" into "develop" 视图、新增角色、删除角色, 社区pr代码修改 See merge request: openGaussythcs00001/openGauss-workbench!573, merge develop-zwr into develop merge "develop-zwr" into "develop" 合并社区代码 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7237730 Commit-by: zhouwenruo Merged-by: zhangcheng Description: merge "develop-zwr" into "develop" 合并社区代码 See merge request: openGaussythcs00001/openGauss-workbench!574, merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 实例监控前端代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7237690 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 实例监控前端代码 See merge request: openGaussythcs00001/openGauss-workbench!572, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" 单元测试及代码优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7237184 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" 单元测试及代码优化 See merge request: openGaussythcs00001/openGauss-workbench!570, 杨子浩 930 集群监控代码, 杨子浩 930 集群监控 增加刷新按钮, Merge remote-tracking branch 'origin/release' into develop-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/debug/AsyncHelper.java # plugins/data-studio/web-ui/src/components/terminal-editor/createTemplate.ts # plugins/data-studio/web-ui/src/layout/Sidebar/index.vue, merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 集群监控代码, 杨子浩 930 集群监控 增加刷新按钮 Created-by: yangzihao Author-id: 7119754 MR-id: 7237763 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 集群监控代码, 杨子浩 930 集群监控 增加刷新按钮 See merge request: openGaussythcs00001/openGauss-workbench!579, merge develop-zwr into develop merge "develop-zwr" into "develop" repair data-studio, Merge remote-tracking branch 'origin/master', Merge remote-tracking branch 'origin/master', !369 业务开发-列问题回滚 Merge pull request !369 from 吴雨霖/master, 增加websocket默认消息大小，取消正则表达式判断条件, !370 增加websocket消息大小，取消迁移正则表达式文本限制 Merge pull request !370 from 王亚龙/master, 修改正则表达式判断条件, !371 修改正则表达式判断条件 Merge pull request !371 from 王亚龙/master, 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off, !373 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off Merge pull request !373 from 王亚龙/master, Merge branch 'master' of https://gitee.com/opengauss/openGauss-workbench, repair druid config, !377 [bugfix] 修复druid没有检查直接使用线程池链接的问题 Merge pull request !377 from 周斌/master, web-ds支持匿名块调试, 匿名块调试readme修改, !372 web-ds支持匿名块调试 Merge pull request !372 from 李秦朗/master, !379 web-ds匿名块 See merge request: openGaussythcs00001/openGauss-workbench!596 commit 23957578177011badc6444d4932dc199653ac1a0 Merge: 04f1b6fb 8c8973ac Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Fri Aug 25 08:49:58 2023 +0800 merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" 单元测试, 单元测试 Created-by: wuyuebin Author-id: 7158405 MR-id: 7238436 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "develop-wyb-930" into "develop" 单元测试, 单元测试 See merge request: openGaussythcs00001/openGauss-workbench!595 commit 8c8973aca9c413d9e7416645eff1db0d60696e42 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Thu Aug 24 19:46:24 2023 +0800 单元测试 commit a87c46a05034f0c170ca3831cf2907ef5fdeb41e Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Thu Aug 24 19:44:57 2023 +0800 单元测试 commit 04f1b6fbb9898103b964a0578d20262a9fb72ba6 Merge: 8ddf9d5a bc2338b6 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Thu Aug 24 17:43:33 2023 +0800 merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 集群监控前端代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7238317 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 集群监控前端代码 See merge request: openGaussythcs00001/openGauss-workbench!594 commit bc2338b61bfa257c2a4971d060320a21439fc668 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Thu Aug 24 17:41:13 2023 +0800 杨子浩 930 集群监控前端代码 commit e89c31f7140d468a40efeb803fbbaefc5b650273 Merge: b9519de2 78d0120c Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Thu Aug 24 17:06:21 2023 +0800 merge release-zwr into release merge "release-zwr" into "release" 修改bug Created-by: zhouwenruo Author-id: 7119763 MR-id: 7238291 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 修改bug See merge request: openGaussythcs00001/openGauss-workbench!593 commit 78d0120cf62729d1c52629148bdc3ec3427cf637 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu Aug 24 17:05:21 2023 +0800 修改bug commit 8ddf9d5a6201c01e664667a7c8d5c5b1fcc71e28 Merge: bed75f72 1e2cc736 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Thu Aug 24 16:48:42 2023 +0800 merge feature-instance into develop merge "feature-instance" into "develop" 集群监控--WAL增长量, Merge branch 'feature-instance-lpf' into feature-instance Created-by: liupengfei Author-id: 7158026 MR-id: 7238241 Commit-by: liupengfei Merged-by: yangzihao Description: merge "feature-instance" into "develop" 集群监控--WAL增长量, Merge branch 'feature-instance-lpf' into feature-instance See merge request: openGaussythcs00001/openGauss-workbench!592 commit 1e2cc7363207c5fa174b9a318db2327c1db89c43 Merge: 274c200a 955ec76c Author: liupengfei <liupengfei@ncti-gba.cn> Date: Thu Aug 24 15:59:34 2023 +0800 Merge branch 'feature-instance-lpf' into feature-instance commit 955ec76c678098ec56fefbd2755713539f4fe770 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Thu Aug 24 15:56:50 2023 +0800 集群监控--WAL增长量 commit bed75f72fb61124d9288f26ad07ef3e914a0f5eb Merge: 49282e5a 96cb2017 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Thu Aug 24 15:53:04 2023 +0800 merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 SQL诊断提交 Created-by: yangzihao Author-id: 7119754 MR-id: 7238228 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 SQL诊断提交 See merge request: openGaussythcs00001/openGauss-workbench!591 commit 49282e5aa0a263c17ab58fadd425f1f12d2c5813 Merge: 6322a01d 64c848d5 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Thu Aug 24 15:52:10 2023 +0800 merge develop-930-lm into develop merge "develop-930-lm" into "develop" merge develop into develop-930-lm merge "develop" into "develop-930-lm" repair data-studio, Merge remote-tracking branch 'origin/master', Merge remote-tracking branch 'origin/master', !369 业务开发-列问题回滚 Merge pull request !369 from 吴雨霖/master, 增加websocket默认消息大小，取消正则表达式判断条件, !370 增加websocket消息大小，取消迁移正则表达式文本限制 Merge pull request !370 from 王亚龙/master, 修改正则表达式判断条件, !371 修改正则表达式判断条件 Merge pull request !371 from 王亚龙/master, 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off, !373 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off Merge pull request !373 from 王亚龙/master, 杨子浩 930 实例监控前端代码, 第三方通知——snmp通知方式, Merge branch 'master' of https://gitee.com/opengauss/openGauss-workbench, repair druid config, !377 [bugfix] 修复druid没有检查直接使用线程池链接的问题 Merge pull request !377 from 周斌/master, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 屏蔽部分单元测试, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" 第三方通知——snmp通知方式, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 屏蔽部分单元测试 Created-by: wuyuebin Author-id: 7158405 MR-id: 7236880 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" 第三方通知——snmp通知方式, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 屏蔽部分单元测试 See merge request: openGaussythcs00001/openGauss-workbench!569, web-ds支持匿名块调试, 单元测试及代码优化, 调整查看用户角色功能, 视图、新增角色、删除角色, 匿名块调试readme修改, !372 web-ds支持匿名块调试 Merge pull request !372 from 李秦朗/master, !379 web-ds匿名块调试readme修改 Merge pull request !379 from 李秦朗/readme, Test覆盖率, merge develop-zwr into develop merge "develop-zwr" into "develop" 调整查看用户角色功能 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7237663 Commit-by: zhouwenruo Merged-by: zhangcheng Description: merge "develop-zwr" into "develop" 调整查看用户角色功能 See merge request: openGaussythcs00001/openGauss-workbench!571, 社区pr代码修改, 合并社区代码, merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" 视图、新增角色、删除角色, 社区pr代码修改 Created-by: zhangcheng Author-id: 7119759 MR-id: 7237720 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "develop-zhangcheng-0930" into "develop" 视图、新增角色、删除角色, 社区pr代码修改 See merge request: openGaussythcs00001/openGauss-workbench!573, merge develop-zwr into develop merge "develop-zwr" into "develop" 合并社区代码 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7237730 Commit-by: zhouwenruo Merged-by: zhangcheng Description: merge "develop-zwr" into "develop" 合并社区代码 See merge request: openGaussythcs00001/openGauss-workbench!574, merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 实例监控前端代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7237690 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 实例监控前端代码 See merge request: openGaussythcs00001/openGauss-workbench!572, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" 单元测试及代码优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7237184 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" 单元测试及代码优化 See merge request: openGaussythcs00001/openGauss-workbench!570, 杨子浩 930 集群监控代码, 杨子浩 930 集群监控 增加刷新按钮, Merge remote-tracking branch 'origin/release' into develop-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/debug/AsyncHelper.java # plugins/data-studio/web-ui/src/components/terminal-editor/createTemplate.ts # plugins/data-studio/web-ui/src/layout/Sidebar/index.vue, merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 集群监控代码, 杨子浩 930 集群监控 增加刷新按钮 Created-by: yangzihao Author-id: 7119754 MR-id: 7237763 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 集群监控代码, 杨子浩 930 集群监控 增加刷新按钮 See merge request: openGaussythcs00001/openGauss-workbench!579, merge develop-zwr into develop merge "develop-zwr" into "develop" repair data-studio, Merge remote-tracking branch 'origin/master', Merge remote-tracking branch 'origin/master', !369 业务开发-列问题回滚 Merge pull request !369 from 吴雨霖/master, 增加websocket默认消息大小，取消正则表达式判断条件, !370 增加websocket消息大小，取消迁移正则表达式文本限制 Merge pull request !370 from 王亚龙/master, 修改正则表达式判断条件, !371 修改正则表达式判断条件 Merge pull request !371 from 王亚龙/master, 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off, !373 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off Merge pull request !373 from 王亚龙/master, Merge branch 'master' of https://gitee.com/opengauss/openGauss-workbench, repair druid config, !377 [bugfix] 修复druid没有检查直接使用线程池链接的问题 Merge pull request !377 from 周斌/master, web-ds支持匿名块调试, 匿名块调试readme修改, !372 web-ds支持匿名块调试 Merge pull request !372 from 李秦朗/master, !379 we Created-by: luomeng Author-id: 7119743 MR-id: 7238148 Commit-by: 罗梦;luomeng Merged-by: yangzihao Description: merge "develop-930-lm" into "develop" merge develop into develop-930-lm merge "develop" into "develop-930-lm" repair data-studio, Merge remote-tracking branch 'origin/master', Merge remote-tracking branch 'origin/master', !369 业务开发-列问题回滚 Merge pull request !369 from 吴雨霖/master, 增加websocket默认消息大小，取消正则表达式判断条件, !370 增加websocket消息大小，取消迁移正则表达式文本限制 Merge pull request !370 from 王亚龙/master, 修改正则表达式判断条件, !371 修改正则表达式判断条件 Merge pull request !371 from 王亚龙/master, 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off, !373 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off Merge pull request !373 from 王亚龙/master, 杨子浩 930 实例监控前端代码, 第三方通知——snmp通知方式, Merge branch 'master' of https://gitee.com/opengauss/openGauss-workbench, repair druid config, !377 [bugfix] 修复druid没有检查直接使用线程池链接的问题 Merge pull request !377 from 周斌/master, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 屏蔽部分单元测试, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" 第三方通知——snmp通知方式, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 屏蔽部分单元测试 Created-by: wuyuebin Author-id: 7158405 MR-id: 7236880 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" 第三方通知——snmp通知方式, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 屏蔽部分单元测试 See merge request: openGaussythcs00001/openGauss-workbench!569, web-ds支持匿名块调试, 单元测试及代码优化, 调整查看用户角色功能, 视图、新增角色、删除角色, 匿名块调试readme修改, !372 web-ds支持匿名块调试 Merge pull request !372 from 李秦朗/master, !379 web-ds匿名块调试readme修改 Merge pull request !379 from 李秦朗/readme, Test覆盖率, merge develop-zwr into develop merge "develop-zwr" into "develop" 调整查看用户角色功能 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7237663 Commit-by: zhouwenruo Merged-by: zhangcheng Description: merge "develop-zwr" into "develop" 调整查看用户角色功能 See merge request: openGaussythcs00001/openGauss-workbench!571, 社区pr代码修改, 合并社区代码, merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" 视图、新增角色、删除角色, 社区pr代码修改 Created-by: zhangcheng Author-id: 7119759 MR-id: 7237720 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "develop-zhangcheng-0930" into "develop" 视图、新增角色、删除角色, 社区pr代码修改 See merge request: openGaussythcs00001/openGauss-workbench!573, merge develop-zwr into develop merge "develop-zwr" into "develop" 合并社区代码 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7237730 Commit-by: zhouwenruo Merged-by: zhangcheng Description: merge "develop-zwr" into "develop" 合并社区代码 See merge request: openGaussythcs00001/openGauss-workbench!574, merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 实例监控前端代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7237690 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 实例监控前端代码 See merge request: openGaussythcs00001/openGauss-workbench!572, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" 单元测试及代码优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7237184 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" 单元测试及代码优化 See merge request: openGaussythcs00001/openGauss-workbench!570, 杨子浩 930 集群监控代码, 杨子浩 930 集群监控 增加刷新按钮, Merge remote-tracking branch 'origin/release' into develop-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/debug/AsyncHelper.java # plugins/data-studio/web-ui/src/components/terminal-editor/createTemplate.ts # plugins/data-studio/web-ui/src/layout/Sidebar/index.vue, merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 集群监控代码, 杨子浩 930 集群监控 增加刷新按钮 Created-by: yangzihao Author-id: 7119754 MR-id: 7237763 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 集群监控代码, 杨子浩 930 集群监控 增加刷新按钮 See merge request: openGaussythcs00001/openGauss-workbench!579, merge develop-zwr into develop merge "develop-zwr" into "develop" repair data-studio, Merge remote-tracking branch 'origin/master', Merge remote-tracking branch 'origin/master', !369 业务开发-列问题回滚 Merge pull request !369 from 吴雨霖/master, 增加websocket默认消息大小，取消正则表达式判断条件, !370 增加websocket消息大小，取消迁移正则表达式文本限制 Merge pull request !370 from 王亚龙/master, 修改正则表达式判断条件, !371 修改正则表达式判断条件 Merge pull request !371 from 王亚龙/master, 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off, !373 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off Merge pull request !373 from 王亚龙/master, Merge branch 'master' of https://gitee.com/opengauss/openGauss-workbench, repair druid config, !377 [bugfix] 修复druid没有检查直接使用线程池链接的问题 Merge pull request !377 from 周斌/master, web-ds支持匿名块调试, 匿名块调试readme修改, !372 web-ds支持匿名块调试 Merge pull request !372 from 李秦朗/master, !379 we See merge request: openGaussythcs00001/openGauss-workbench!589 commit 96cb20172e98589f31633d3011b0c8878b32b12e Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Thu Aug 24 15:50:39 2023 +0800 杨子浩 930 SQL诊断提交 commit b9519de2cbfb5e970ffb2cd37129cfc198e1a59f Merge: 0b556117 6322a01d Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Thu Aug 24 14:38:58 2023 +0800 merge develop into release merge "develop" into "release" merge develop into develop-930-lm merge "develop" into "develop-930-lm" 服务器管理去除多余的代码, 修复连接弹窗重置的逻辑, 完善国际化翻译，增加日志说明, 解决全局配置无法打开的问题, 提交智能运维630代码, 历史数据诊断前端修改, 修复历史数据诊断前端BUG, 历史数据和实例监控BUG修复, !273 【业务开发】- 连接弹窗等bug修复 Merge pull request !273 from sweet365/master, !277 智能运维模块630需求内容，含实例监控插件、SQL诊断插件、告警通知插件 Merge pull request !277 from 杨子浩/master, codecheck, !281 智能运维模块630告警通知需求内容 Merge pull request !281 from wuyuebin/master, codecheck, !282 智能运维模块630告警通知需求内容 Merge pull request !282 from wuyuebin/master, 告警接口过滤, !283 过滤prometheus发送告警信息的告警接口 Merge pull request !283 from wuyuebin/master, !274 完善迁移批量安装页面国际化翻译，增加迁移日志说明 Merge pull request !274 from 王亚龙/master, 修改ds文档、增加连接弹窗主机输入限制、删除连接提示, 中英文国际化优化和README修改, 实例监控、历史数据诊断bug修复, !289 智能运维模块630需求内容实例监控、历史数据诊断模块bug修复与优化 Merge pull request !289 from Lmeng梦/master, 2, 实例监控bug修复, !292 业务开发-接口优化 Merge pull request !292 from 吴雨霖/master, !293 智能运维模块实例监控插件bug修复 Merge pull request !293 from Lmeng梦/master, 实例监控bug修复, !294 智能运维模块实例监控插件bug修复 Merge pull request !294 from 板栗/master, dataStudio修复bug, 修改样式和操作手册, !296 智能运维模块告警通知插件bug修复 Merge pull request !296 from wuyuebin/master, !295 业务开发插件bug修复 Merge pull request !295 from sweet365/master, 代码优化, 代码优化, !297 智能运维模块告警通知插件bug修复 Merge pull request !297 from wuyuebin/master, 依据新的参数配置列表，修改迁移前端画面判断, add support for auto add plugin to manage, !265 服务器管理去除多余的代码 Merge pull request !265 from 杨森/master, !298 依据新的参数配置列表，修改迁移前端画面校验判断 Merge pull request !298 from 王亚龙/master, 代码优化, 样式调整, !299 智能运维模块告警通知插件bug修复 Merge pull request !299 from wuyuebin/master, 代码优化, 去掉中文, !300 智能运维模块告警通知插件bug修复 Merge pull request !300 from wuyuebin/master, 调整实例监控首页, 告警接口调整, !302 智能运维模块告警通知插件bug修复 Merge pull request !302 from wuyuebin/master, !301 调整实例监控首页 Merge pull request !301 from Ponfy_Liu/master, !290 【bugfix】修复windows版本下安装插件图标丢失和visualtool-plugin下自动安装的插件不能被插件中心管理的问题 Merge pull request !290 from 周斌/auto_plugin, 修改循环注入, !303 业务开发-0630循环依赖修复 Merge pull request !303 from 吴雨霖/master, 将jsch升级到最新版本, !304 将jsch升级到最新版本，解决部分场景下OpenEuler无法连接的问题 Merge pull request !304 from 王亚龙/master, 修复实例监控前端BUG, !306 实例监控前端样式优化 Merge pull request !306 from Lmeng梦/master, 代码检查，bug修复, !307 智能运维模块告警通知插件bug修复 Merge pull request !307 from wuyuebin/master, 修复实例监控、智能诊断模块前端问题, 会话详情等待事件记录BUG修复, 优化阻塞会话树状图, 提交前端优化代码, !308 实例监控前端样式优化 Merge pull request !308 from Lmeng梦/master, alert-center更改为alert-monitor, codecheck, !310 智能运维模块告警通知插件名称由alert-center改为alert-monitor Merge pull request !310 from wuyuebin/master, Merge branch 'master' of https://gitee.com/sweet365/openGauss-workbench, 业务开发模块创建表增加保存提示, !311 业务开发模块创建表增加保存提示 Merge pull request !311 from sweet365/master, 修复实例监控和历史数据诊断前端BUG, 历史数据诊断-修复缺陷和优化代码逻辑, 修复codeCheck, codeCheck修改, 修改前端空格缩进, !313 历史数据诊断-修复缺陷和优化代码逻辑 Merge pull request !313 from Lmeng梦/master, !312 实例监控、历史数据诊断样式优化 Merge pull request !312 from Lmeng梦/master, 移除无效文件,添加等待事件空即考验,添加安装端口校验,修改指标bug, !316 实例监控 bugfix Merge pull request !316 from 板栗/master, 移除无效文件,添加等待事件空即考验,添加安装端口校验,修改指标bug, !319 实例监控 bugfix Merge pull request !319 from 板栗/master, 补充遗漏提交, !321 实例监控 bugfix Merge pull request !321 from 板栗/master, bug, 修复实例监控WDRBUG, 修改代码缩进codecheck, !323 实例监控WDR报告BUG修复 Merge pull request !323 from Lmeng梦/master, 告警bug修复, codecheck, !322 业务开发 - 0630bug修复 Merge pull request !322 from RoaneZhou/master, !325 智能运维模块告警通知插件bug修复 Merge pull request !325 from wuyuebin/master, 修改会话监控接口响应结构体, Merge remote-tracking branch 'origin/master', !326 修改会话监控接口响应结构体 Merge pull request !326 from Ponfy_Liu/master, 修复SQL诊断页面显示BUG, !327 修复SQL诊断页面显示样式BUG Merge pull request !327 from Lmeng梦/master, 安装采集器端口检测方法修改，慢sql指标采集修改,操作手册, !328 实例监控 bugfix Merge pull request !328 from 板栗/master, 抛异常问题修复, !329 业务开发-序列DDL预览显示问题 Merge pull request !329 from 吴雨霖/master, 对自定义的appcationRunner启动出现异常进行处理, 对自定义的appcationRunner启动出现异常进行处理, !331 智能运维模块告警通知插件bug修复 Merge pull request !331 from wuyuebin/master, 1.实例监控首页接口性能优化, codeCheck, codeCheck, codeCheck, !332 实例监控首页接口性能优化 Merge pull request !332 from Ponfy_Liu/master, 修复实例监控和智能诊断前端BUG, 修复codeCheck, 警告/代码整理, 慢sql指标修改,TCP指标修改,移除无效文件, !334 修复实例监控和SQL诊断页面显示样式BUG Merge pull request !334 from Lmeng梦/master, !333 实例监控 bugfix Merge pull request !333 from 板栗/master, 智能运维模块logo更新，告警插件操作文档更新及代码优化, !336 块智能运维模块logo更新，告警插件操作文档更新及代码优化 Merge pull request !336 from wuyuebin/master, 优化实例监控代码结构, codeCheck, !337 优化实例监控代码结构 Merge pull request !337 from Ponfy_Liu/master, 建表语句修复, !338 业务开发-创建表DDL预览显示问题 Merge pull request !338 from 吴雨霖/master, 【日志检索】上下文框未被隐藏, !339 智能运维模块日志检索插件bug修复 Merge pull request !339 from wuyuebin/master, 修复列描述问题, !340 业务开发-列描述显示问题 Merge pull request !340 from 吴雨霖/master, TOPSQL，点击SQLID进入到SQL诊断页面，创建诊断任务，SQL不能修改参数。, !341 智能运维模块bug修复 Merge pull request !341 from wuyuebin/master, 删除关闭窗口清掉断点接口, !342 【业务开发】函数/过程0630版本优化 Merge pull request !342 from RoaneZhou/master, WDR报告，未选实例点击快照管理，页数错误，点击页数会报错。, !343 智能运维模块实例监控插件bug修复 Merge pull request !343 from wuyuebin/master, 说明文档添加下载地址, !344 添加下载地址 Merge pull request !344 from 刘桐/master, 优化代码, codecheck, !345 智能运维模块告警通知插件bug修复 Merge pull requ Created-by: zhangcheng Author-id: 7119759 MR-id: 7238094 Commit-by: zhanghaoyu;张昊宇;zhouwenruo;zhangcheng;yangzihao;wuyuebin;liupengfei;罗梦;luomeng Merged-by: zhouwenruo Description: merge "develop" into "release" merge develop into develop-930-lm merge "develop" into "develop-930-lm" 服务器管理去除多余的代码, 修复连接弹窗重置的逻辑, 完善国际化翻译，增加日志说明, 解决全局配置无法打开的问题, 提交智能运维630代码, 历史数据诊断前端修改, 修复历史数据诊断前端BUG, 历史数据和实例监控BUG修复, !273 【业务开发】- 连接弹窗等bug修复 Merge pull request !273 from sweet365/master, !277 智能运维模块630需求内容，含实例监控插件、SQL诊断插件、告警通知插件 Merge pull request !277 from 杨子浩/master, codecheck, !281 智能运维模块630告警通知需求内容 Merge pull request !281 from wuyuebin/master, codecheck, !282 智能运维模块630告警通知需求内容 Merge pull request !282 from wuyuebin/master, 告警接口过滤, !283 过滤prometheus发送告警信息的告警接口 Merge pull request !283 from wuyuebin/master, !274 完善迁移批量安装页面国际化翻译，增加迁移日志说明 Merge pull request !274 from 王亚龙/master, 修改ds文档、增加连接弹窗主机输入限制、删除连接提示, 中英文国际化优化和README修改, 实例监控、历史数据诊断bug修复, !289 智能运维模块630需求内容实例监控、历史数据诊断模块bug修复与优化 Merge pull request !289 from Lmeng梦/master, 2, 实例监控bug修复, !292 业务开发-接口优化 Merge pull request !292 from 吴雨霖/master, !293 智能运维模块实例监控插件bug修复 Merge pull request !293 from Lmeng梦/master, 实例监控bug修复, !294 智能运维模块实例监控插件bug修复 Merge pull request !294 from 板栗/master, dataStudio修复bug, 修改样式和操作手册, !296 智能运维模块告警通知插件bug修复 Merge pull request !296 from wuyuebin/master, !295 业务开发插件bug修复 Merge pull request !295 from sweet365/master, 代码优化, 代码优化, !297 智能运维模块告警通知插件bug修复 Merge pull request !297 from wuyuebin/master, 依据新的参数配置列表，修改迁移前端画面判断, add support for auto add plugin to manage, !265 服务器管理去除多余的代码 Merge pull request !265 from 杨森/master, !298 依据新的参数配置列表，修改迁移前端画面校验判断 Merge pull request !298 from 王亚龙/master, 代码优化, 样式调整, !299 智能运维模块告警通知插件bug修复 Merge pull request !299 from wuyuebin/master, 代码优化, 去掉中文, !300 智能运维模块告警通知插件bug修复 Merge pull request !300 from wuyuebin/master, 调整实例监控首页, 告警接口调整, !302 智能运维模块告警通知插件bug修复 Merge pull request !302 from wuyuebin/master, !301 调整实例监控首页 Merge pull request !301 from Ponfy_Liu/master, !290 【bugfix】修复windows版本下安装插件图标丢失和visualtool-plugin下自动安装的插件不能被插件中心管理的问题 Merge pull request !290 from 周斌/auto_plugin, 修改循环注入, !303 业务开发-0630循环依赖修复 Merge pull request !303 from 吴雨霖/master, 将jsch升级到最新版本, !304 将jsch升级到最新版本，解决部分场景下OpenEuler无法连接的问题 Merge pull request !304 from 王亚龙/master, 修复实例监控前端BUG, !306 实例监控前端样式优化 Merge pull request !306 from Lmeng梦/master, 代码检查，bug修复, !307 智能运维模块告警通知插件bug修复 Merge pull request !307 from wuyuebin/master, 修复实例监控、智能诊断模块前端问题, 会话详情等待事件记录BUG修复, 优化阻塞会话树状图, 提交前端优化代码, !308 实例监控前端样式优化 Merge pull request !308 from Lmeng梦/master, alert-center更改为alert-monitor, codecheck, !310 智能运维模块告警通知插件名称由alert-center改为alert-monitor Merge pull request !310 from wuyuebin/master, Merge branch 'master' of https://gitee.com/sweet365/openGauss-workbench, 业务开发模块创建表增加保存提示, !311 业务开发模块创建表增加保存提示 Merge pull request !311 from sweet365/master, 修复实例监控和历史数据诊断前端BUG, 历史数据诊断-修复缺陷和优化代码逻辑, 修复codeCheck, codeCheck修改, 修改前端空格缩进, !313 历史数据诊断-修复缺陷和优化代码逻辑 Merge pull request !313 from Lmeng梦/master, !312 实例监控、历史数据诊断样式优化 Merge pull request !312 from Lmeng梦/master, 移除无效文件,添加等待事件空即考验,添加安装端口校验,修改指标bug, !316 实例监控 bugfix Merge pull request !316 from 板栗/master, 移除无效文件,添加等待事件空即考验,添加安装端口校验,修改指标bug, !319 实例监控 bugfix Merge pull request !319 from 板栗/master, 补充遗漏提交, !321 实例监控 bugfix Merge pull request !321 from 板栗/master, bug, 修复实例监控WDRBUG, 修改代码缩进codecheck, !323 实例监控WDR报告BUG修复 Merge pull request !323 from Lmeng梦/master, 告警bug修复, codecheck, !322 业务开发 - 0630bug修复 Merge pull request !322 from RoaneZhou/master, !325 智能运维模块告警通知插件bug修复 Merge pull request !325 from wuyuebin/master, 修改会话监控接口响应结构体, Merge remote-tracking branch 'origin/master', !326 修改会话监控接口响应结构体 Merge pull request !326 from Ponfy_Liu/master, 修复SQL诊断页面显示BUG, !327 修复SQL诊断页面显示样式BUG Merge pull request !327 from Lmeng梦/master, 安装采集器端口检测方法修改，慢sql指标采集修改,操作手册, !328 实例监控 bugfix Merge pull request !328 from 板栗/master, 抛异常问题修复, !329 业务开发-序列DDL预览显示问题 Merge pull request !329 from 吴雨霖/master, 对自定义的appcationRunner启动出现异常进行处理, 对自定义的appcationRunner启动出现异常进行处理, !331 智能运维模块告警通知插件bug修复 Merge pull request !331 from wuyuebin/master, 1.实例监控首页接口性能优化, codeCheck, codeCheck, codeCheck, !332 实例监控首页接口性能优化 Merge pull request !332 from Ponfy_Liu/master, 修复实例监控和智能诊断前端BUG, 修复codeCheck, 警告/代码整理, 慢sql指标修改,TCP指标修改,移除无效文件, !334 修复实例监控和SQL诊断页面显示样式BUG Merge pull request !334 from Lmeng梦/master, !333 实例监控 bugfix Merge pull request !333 from 板栗/master, 智能运维模块logo更新，告警插件操作文档更新及代码优化, !336 块智能运维模块logo更新，告警插件操作文档更新及代码优化 Merge pull request !336 from wuyuebin/master, 优化实例监控代码结构, codeCheck, !337 优化实例监控代码结构 Merge pull request !337 from Ponfy_Liu/master, 建表语句修复, !338 业务开发-创建表DDL预览显示问题 Merge pull request !338 from 吴雨霖/master, 【日志检索】上下文框未被隐藏, !339 智能运维模块日志检索插件bug修复 Merge pull request !339 from wuyuebin/master, 修复列描述问题, !340 业务开发-列描述显示问题 Merge pull request !340 from 吴雨霖/master, TOPSQL，点击SQLID进入到SQL诊断页面，创建诊断任务，SQL不能修改参数。, !341 智能运维模块bug修复 Merge pull request !341 from wuyuebin/master, 删除关闭窗口清掉断点接口, !342 【业务开发】函数/过程0630版本优化 Merge pull request !342 from RoaneZhou/master, WDR报告，未选实例点击快照管理，页数错误，点击页数会报错。, !343 智能运维模块实例监控插件bug修复 Merge pull request !343 from wuyuebin/master, 说明文档添加下载地址, !344 添加下载地址 Merge pull request !344 from 刘桐/master, 优化代码, codecheck, !345 智能运维模块告警通知插件bug修复 Merge pull requ See merge request: openGaussythcs00001/openGauss-workbench!586 commit 0b55611732881df8237913cb140c8f63ad8a91d4 Merge: 84ae1c90 cef56553 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Thu Aug 24 14:33:39 2023 +0800 merge release-zwr into release merge "release-zwr" into "release" 修改bug Created-by: zhouwenruo Author-id: 7119763 MR-id: 7238172 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 修改bug See merge request: openGaussythcs00001/openGauss-workbench!590 commit cef565537193b021f8e11a40fe3204cfee5486a1 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu Aug 24 14:31:21 2023 +0800 修改bug commit 64c848d5122a0322f3ba5d7b1bc91db6d2b024a9 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Thu Aug 24 11:54:18 2023 +0800 智能诊断930版本代码 commit 6322a01d9a9a0de199da0023de5b80b0339034c1 Merge: 804ff909 f1c4fc67 Author: zhanghaoyu <e9a6a9f516404feeabca273d60808c07@example.com> Date: Thu Aug 24 11:33:21 2023 +0800 merge Branch_feature-instance into develop merge "Branch_feature-instance" into "develop" 修正sql, 实例详情bug修改, 集群配置测试, Merge branch 'feature-instance-lpf' into feature-instance, topsql排序, 集群监控bug, cpu指标, 查找snapshot, 集群监控添加字段, Merge branch 'feature-instance-lpf' into feature-instance, 分离状态接口, 添加fullcommand,ssh采集本地指标, 首页等待事件, 更新事件类型sql, 内存数据更新, 端口号,线程会话/sqlid, 内存配置更新, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, 修改asp接口, exporter改用ssh连接, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'remotes/origin/feature-yangzihao-develop-930' into feature-instance, 修复exporter重启bug, 指标修改,修改等待事件接口,添加详情-系统资源, CPU部分指标修正,sqlid修改,topsql指标修改, 等待事件修改,top结果修改, 新版集群监控-首页接口, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 修改节点属性, 线程号,系统日志路径, 新版集群监控-集群详情, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, wdr接口, WDR版权, 集群监控, test, 集群监控, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 集群监控修改变量类型, 移除旧metric,精简包, 移除无效测试, session修改,代码清理, Merge remote-tracking branch 'remotes/origin/develop' into Branch_feature-instance # Conflicts: # plugins/observability-instance/InstanceExporter/src/main/resources/og_exporter.yml Created-by: zhanghaoyu Author-id: 7119760 MR-id: 7238124 Commit-by: 张昊宇;liupengfei Merged-by: zhanghaoyu Description: merge "Branch_feature-instance" into "develop" 修正sql, 实例详情bug修改, 集群配置测试, Merge branch 'feature-instance-lpf' into feature-instance, topsql排序, 集群监控bug, cpu指标, 查找snapshot, 集群监控添加字段, Merge branch 'feature-instance-lpf' into feature-instance, 分离状态接口, 添加fullcommand,ssh采集本地指标, 首页等待事件, 更新事件类型sql, 内存数据更新, 端口号,线程会话/sqlid, 内存配置更新, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, 修改asp接口, exporter改用ssh连接, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'remotes/origin/feature-yangzihao-develop-930' into feature-instance, 修复exporter重启bug, 指标修改,修改等待事件接口,添加详情-系统资源, CPU部分指标修正,sqlid修改,topsql指标修改, 等待事件修改,top结果修改, 新版集群监控-首页接口, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 修改节点属性, 线程号,系统日志路径, 新版集群监控-集群详情, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, wdr接口, WDR版权, 集群监控, test, 集群监控, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 集群监控修改变量类型, 移除旧metric,精简包, 移除无效测试, session修改,代码清理, Merge remote-tracking branch 'remotes/origin/develop' into Branch_feature-instance # Conflicts: # plugins/observability-instance/InstanceExporter/src/main/resources/og_exporter.yml See merge request: openGaussythcs00001/openGauss-workbench!588 commit f1c4fc67fd5b8ade56c20dc31b368bd2ae59a896 Merge: 274c200a 804ff909 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Thu Aug 24 11:28:45 2023 +0800 Merge remote-tracking branch 'remotes/origin/develop' into Branch_feature-instance # Conflicts: # plugins/observability-instance/InstanceExporter/src/main/resources/og_exporter.yml commit 274c200a915750c1ebec54d0937b836ec51b980b Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Thu Aug 24 11:14:14 2023 +0800 session修改,代码清理 commit 804ff90981046c349e9818601c256d04ddcd2caa Merge: c29ab69a dd2a5867 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Thu Aug 24 10:51:40 2023 +0800 merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" 提测前修复问题 Created-by: zhangcheng Author-id: 7119759 MR-id: 7238092 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "develop-zhangcheng-0930" into "develop" 提测前修复问题 See merge request: openGaussythcs00001/openGauss-workbench!585 commit dd2a5867e4afc5591d64b3b4c70c732b05cf7f33 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Thu Aug 24 10:47:15 2023 +0800 提测前修复问题 commit bea0b5498276fb30d98a624cef7ab46b31d04aaa Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Thu Aug 24 09:52:20 2023 +0800 移除无效测试 commit 9eef94859eb627096a03f204e67825c11b12184d Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Thu Aug 24 09:40:44 2023 +0800 移除旧metric,精简包 commit c29ab69aaf589ed3520b707167cd102876aa66c5 Merge: be4dbbde 96ffef9b Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Thu Aug 24 08:33:26 2023 +0800 merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, wdr分析 Created-by: wuyuebin Author-id: 7158405 MR-id: 7237993 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, wdr分析 See merge request: openGaussythcs00001/openGauss-workbench!584 commit 96ffef9bf157be9a9378d4df68510eb3e725ae2d Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Aug 23 18:56:35 2023 +0800 wdr分析 commit 387440f221ff02fc0cd79f3942060a6dbde437da Merge: b6fb6852 be4dbbde Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Aug 23 18:54:10 2023 +0800 Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930 commit 6451ed7b430b82fcdfbc63c4f6e650f8a0955365 Merge: 9d39044e be4dbbde Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Wed Aug 23 17:17:19 2023 +0800 merge develop into develop-930-lm merge "develop" into "develop-930-lm" repair data-studio, Merge remote-tracking branch 'origin/master', Merge remote-tracking branch 'origin/master', !369 业务开发-列问题回滚 Merge pull request !369 from 吴雨霖/master, 增加websocket默认消息大小，取消正则表达式判断条件, !370 增加websocket消息大小，取消迁移正则表达式文本限制 Merge pull request !370 from 王亚龙/master, 修改正则表达式判断条件, !371 修改正则表达式判断条件 Merge pull request !371 from 王亚龙/master, 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off, !373 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off Merge pull request !373 from 王亚龙/master, 杨子浩 930 实例监控前端代码, 第三方通知——snmp通知方式, Merge branch 'master' of https://gitee.com/opengauss/openGauss-workbench, repair druid config, !377 [bugfix] 修复druid没有检查直接使用线程池链接的问题 Merge pull request !377 from 周斌/master, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 屏蔽部分单元测试, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" 第三方通知——snmp通知方式, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 屏蔽部分单元测试 Created-by: wuyuebin Author-id: 7158405 MR-id: 7236880 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" 第三方通知——snmp通知方式, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 屏蔽部分单元测试 See merge request: openGaussythcs00001/openGauss-workbench!569, web-ds支持匿名块调试, 单元测试及代码优化, 调整查看用户角色功能, 视图、新增角色、删除角色, 匿名块调试readme修改, !372 web-ds支持匿名块调试 Merge pull request !372 from 李秦朗/master, !379 web-ds匿名块调试readme修改 Merge pull request !379 from 李秦朗/readme, Test覆盖率, merge develop-zwr into develop merge "develop-zwr" into "develop" 调整查看用户角色功能 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7237663 Commit-by: zhouwenruo Merged-by: zhangcheng Description: merge "develop-zwr" into "develop" 调整查看用户角色功能 See merge request: openGaussythcs00001/openGauss-workbench!571, 社区pr代码修改, 合并社区代码, merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" 视图、新增角色、删除角色, 社区pr代码修改 Created-by: zhangcheng Author-id: 7119759 MR-id: 7237720 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "develop-zhangcheng-0930" into "develop" 视图、新增角色、删除角色, 社区pr代码修改 See merge request: openGaussythcs00001/openGauss-workbench!573, merge develop-zwr into develop merge "develop-zwr" into "develop" 合并社区代码 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7237730 Commit-by: zhouwenruo Merged-by: zhangcheng Description: merge "develop-zwr" into "develop" 合并社区代码 See merge request: openGaussythcs00001/openGauss-workbench!574, merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 实例监控前端代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7237690 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 实例监控前端代码 See merge request: openGaussythcs00001/openGauss-workbench!572, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" 单元测试及代码优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7237184 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" 单元测试及代码优化 See merge request: openGaussythcs00001/openGauss-workbench!570, 杨子浩 930 集群监控代码, 杨子浩 930 集群监控 增加刷新按钮, Merge remote-tracking branch 'origin/release' into develop-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/debug/AsyncHelper.java # plugins/data-studio/web-ui/src/components/terminal-editor/createTemplate.ts # plugins/data-studio/web-ui/src/layout/Sidebar/index.vue, merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 集群监控代码, 杨子浩 930 集群监控 增加刷新按钮 Created-by: yangzihao Author-id: 7119754 MR-id: 7237763 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 集群监控代码, 杨子浩 930 集群监控 增加刷新按钮 See merge request: openGaussythcs00001/openGauss-workbench!579, merge develop-zwr into develop merge "develop-zwr" into "develop" repair data-studio, Merge remote-tracking branch 'origin/master', Merge remote-tracking branch 'origin/master', !369 业务开发-列问题回滚 Merge pull request !369 from 吴雨霖/master, 增加websocket默认消息大小，取消正则表达式判断条件, !370 增加websocket消息大小，取消迁移正则表达式文本限制 Merge pull request !370 from 王亚龙/master, 修改正则表达式判断条件, !371 修改正则表达式判断条件 Merge pull request !371 from 王亚龙/master, 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off, !373 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off Merge pull request !373 from 王亚龙/master, Merge branch 'master' of https://gitee.com/opengauss/openGauss-workbench, repair druid config, !377 [bugfix] 修复druid没有检查直接使用线程池链接的问题 Merge pull request !377 from 周斌/master, web-ds支持匿名块调试, 匿名块调试readme修改, !372 web-ds支持匿名块调试 Merge pull request !372 from 李秦朗/master, !379 web-ds匿名块调试readme修改 Merge pull request !379 from 李秦朗/readme, Merge remote-t Created-by: luomeng Author-id: 7119743 MR-id: 7237931 Commit-by: yangzihao;zhouwenruo;Zihao Yang;zhangcheng;opengauss_bot;li-qinlang;wuyuebin;justbk;wangyl Merged-by: luomeng Description: merge "develop" into "develop-930-lm" repair data-studio, Merge remote-tracking branch 'origin/master', Merge remote-tracking branch 'origin/master', !369 业务开发-列问题回滚 Merge pull request !369 from 吴雨霖/master, 增加websocket默认消息大小，取消正则表达式判断条件, !370 增加websocket消息大小，取消迁移正则表达式文本限制 Merge pull request !370 from 王亚龙/master, 修改正则表达式判断条件, !371 修改正则表达式判断条件 Merge pull request !371 from 王亚龙/master, 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off, !373 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off Merge pull request !373 from 王亚龙/master, 杨子浩 930 实例监控前端代码, 第三方通知——snmp通知方式, Merge branch 'master' of https://gitee.com/opengauss/openGauss-workbench, repair druid config, !377 [bugfix] 修复druid没有检查直接使用线程池链接的问题 Merge pull request !377 from 周斌/master, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 屏蔽部分单元测试, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" 第三方通知——snmp通知方式, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 屏蔽部分单元测试 Created-by: wuyuebin Author-id: 7158405 MR-id: 7236880 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" 第三方通知——snmp通知方式, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 屏蔽部分单元测试 See merge request: openGaussythcs00001/openGauss-workbench!569, web-ds支持匿名块调试, 单元测试及代码优化, 调整查看用户角色功能, 视图、新增角色、删除角色, 匿名块调试readme修改, !372 web-ds支持匿名块调试 Merge pull request !372 from 李秦朗/master, !379 web-ds匿名块调试readme修改 Merge pull request !379 from 李秦朗/readme, Test覆盖率, merge develop-zwr into develop merge "develop-zwr" into "develop" 调整查看用户角色功能 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7237663 Commit-by: zhouwenruo Merged-by: zhangcheng Description: merge "develop-zwr" into "develop" 调整查看用户角色功能 See merge request: openGaussythcs00001/openGauss-workbench!571, 社区pr代码修改, 合并社区代码, merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" 视图、新增角色、删除角色, 社区pr代码修改 Created-by: zhangcheng Author-id: 7119759 MR-id: 7237720 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "develop-zhangcheng-0930" into "develop" 视图、新增角色、删除角色, 社区pr代码修改 See merge request: openGaussythcs00001/openGauss-workbench!573, merge develop-zwr into develop merge "develop-zwr" into "develop" 合并社区代码 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7237730 Commit-by: zhouwenruo Merged-by: zhangcheng Description: merge "develop-zwr" into "develop" 合并社区代码 See merge request: openGaussythcs00001/openGauss-workbench!574, merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 实例监控前端代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7237690 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 实例监控前端代码 See merge request: openGaussythcs00001/openGauss-workbench!572, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" 单元测试及代码优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7237184 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" 单元测试及代码优化 See merge request: openGaussythcs00001/openGauss-workbench!570, 杨子浩 930 集群监控代码, 杨子浩 930 集群监控 增加刷新按钮, Merge remote-tracking branch 'origin/release' into develop-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/debug/AsyncHelper.java # plugins/data-studio/web-ui/src/components/terminal-editor/createTemplate.ts # plugins/data-studio/web-ui/src/layout/Sidebar/index.vue, merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 集群监控代码, 杨子浩 930 集群监控 增加刷新按钮 Created-by: yangzihao Author-id: 7119754 MR-id: 7237763 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 集群监控代码, 杨子浩 930 集群监控 增加刷新按钮 See merge request: openGaussythcs00001/openGauss-workbench!579, merge develop-zwr into develop merge "develop-zwr" into "develop" repair data-studio, Merge remote-tracking branch 'origin/master', Merge remote-tracking branch 'origin/master', !369 业务开发-列问题回滚 Merge pull request !369 from 吴雨霖/master, 增加websocket默认消息大小，取消正则表达式判断条件, !370 增加websocket消息大小，取消迁移正则表达式文本限制 Merge pull request !370 from 王亚龙/master, 修改正则表达式判断条件, !371 修改正则表达式判断条件 Merge pull request !371 from 王亚龙/master, 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off, !373 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off Merge pull request !373 from 王亚龙/master, Merge branch 'master' of https://gitee.com/opengauss/openGauss-workbench, repair druid config, !377 [bugfix] 修复druid没有检查直接使用线程池链接的问题 Merge pull request !377 from 周斌/master, web-ds支持匿名块调试, 匿名块调试readme修改, !372 web-ds支持匿名块调试 Merge pull request !372 from 李秦朗/master, !379 web-ds匿名块调试readme修改 Merge pull request !379 from 李秦朗/readme, Merge remote-t See merge request: openGaussythcs00001/openGauss-workbench!583 commit be4dbbde1f969d0bc4d423d3af859394b1351884 Merge: a7669fa7 9d39044e Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Wed Aug 23 17:16:28 2023 +0800 merge develop-930-lm into develop merge "develop-930-lm" into "develop" merge develop into develop-930-lm merge "develop" into "develop-930-lm" 服务器管理去除多余的代码, 修复连接弹窗重置的逻辑, 完善国际化翻译，增加日志说明, 解决全局配置无法打开的问题, 提交智能运维630代码, 历史数据诊断前端修改, 修复历史数据诊断前端BUG, 历史数据和实例监控BUG修复, !273 【业务开发】- 连接弹窗等bug修复 Merge pull request !273 from sweet365/master, !277 智能运维模块630需求内容，含实例监控插件、SQL诊断插件、告警通知插件 Merge pull request !277 from 杨子浩/master, codecheck, !281 智能运维模块630告警通知需求内容 Merge pull request !281 from wuyuebin/master, codecheck, !282 智能运维模块630告警通知需求内容 Merge pull request !282 from wuyuebin/master, 告警接口过滤, !283 过滤prometheus发送告警信息的告警接口 Merge pull request !283 from wuyuebin/master, !274 完善迁移批量安装页面国际化翻译，增加迁移日志说明 Merge pull request !274 from 王亚龙/master, 修改ds文档、增加连接弹窗主机输入限制、删除连接提示, 中英文国际化优化和README修改, 实例监控、历史数据诊断bug修复, !289 智能运维模块630需求内容实例监控、历史数据诊断模块bug修复与优化 Merge pull request !289 from Lmeng梦/master, 2, 实例监控bug修复, !292 业务开发-接口优化 Merge pull request !292 from 吴雨霖/master, !293 智能运维模块实例监控插件bug修复 Merge pull request !293 from Lmeng梦/master, 实例监控bug修复, !294 智能运维模块实例监控插件bug修复 Merge pull request !294 from 板栗/master, dataStudio修复bug, 修改样式和操作手册, !296 智能运维模块告警通知插件bug修复 Merge pull request !296 from wuyuebin/master, !295 业务开发插件bug修复 Merge pull request !295 from sweet365/master, 代码优化, 代码优化, !297 智能运维模块告警通知插件bug修复 Merge pull request !297 from wuyuebin/master, 依据新的参数配置列表，修改迁移前端画面判断, add support for auto add plugin to manage, !265 服务器管理去除多余的代码 Merge pull request !265 from 杨森/master, !298 依据新的参数配置列表，修改迁移前端画面校验判断 Merge pull request !298 from 王亚龙/master, 代码优化, 样式调整, !299 智能运维模块告警通知插件bug修复 Merge pull request !299 from wuyuebin/master, 代码优化, 去掉中文, !300 智能运维模块告警通知插件bug修复 Merge pull request !300 from wuyuebin/master, 调整实例监控首页, 告警接口调整, !302 智能运维模块告警通知插件bug修复 Merge pull request !302 from wuyuebin/master, !301 调整实例监控首页 Merge pull request !301 from Ponfy_Liu/master, !290 【bugfix】修复windows版本下安装插件图标丢失和visualtool-plugin下自动安装的插件不能被插件中心管理的问题 Merge pull request !290 from 周斌/auto_plugin, 修改循环注入, !303 业务开发-0630循环依赖修复 Merge pull request !303 from 吴雨霖/master, 将jsch升级到最新版本, !304 将jsch升级到最新版本，解决部分场景下OpenEuler无法连接的问题 Merge pull request !304 from 王亚龙/master, 修复实例监控前端BUG, !306 实例监控前端样式优化 Merge pull request !306 from Lmeng梦/master, 代码检查，bug修复, !307 智能运维模块告警通知插件bug修复 Merge pull request !307 from wuyuebin/master, 修复实例监控、智能诊断模块前端问题, 会话详情等待事件记录BUG修复, 优化阻塞会话树状图, 提交前端优化代码, !308 实例监控前端样式优化 Merge pull request !308 from Lmeng梦/master, alert-center更改为alert-monitor, codecheck, !310 智能运维模块告警通知插件名称由alert-center改为alert-monitor Merge pull request !310 from wuyuebin/master, Merge branch 'master' of https://gitee.com/sweet365/openGauss-workbench, 业务开发模块创建表增加保存提示, !311 业务开发模块创建表增加保存提示 Merge pull request !311 from sweet365/master, 修复实例监控和历史数据诊断前端BUG, 历史数据诊断-修复缺陷和优化代码逻辑, 修复codeCheck, codeCheck修改, 修改前端空格缩进, !313 历史数据诊断-修复缺陷和优化代码逻辑 Merge pull request !313 from Lmeng梦/master, !312 实例监控、历史数据诊断样式优化 Merge pull request !312 from Lmeng梦/master, 移除无效文件,添加等待事件空即考验,添加安装端口校验,修改指标bug, !316 实例监控 bugfix Merge pull request !316 from 板栗/master, 移除无效文件,添加等待事件空即考验,添加安装端口校验,修改指标bug, !319 实例监控 bugfix Merge pull request !319 from 板栗/master, 补充遗漏提交, !321 实例监控 bugfix Merge pull request !321 from 板栗/master, bug, 修复实例监控WDRBUG, 修改代码缩进codecheck, !323 实例监控WDR报告BUG修复 Merge pull request !323 from Lmeng梦/master, 告警bug修复, codecheck, !322 业务开发 - 0630bug修复 Merge pull request !322 from RoaneZhou/master, !325 智能运维模块告警通知插件bug修复 Merge pull request !325 from wuyuebin/master, 修改会话监控接口响应结构体, Merge remote-tracking branch 'origin/master', !326 修改会话监控接口响应结构体 Merge pull request !326 from Ponfy_Liu/master, 修复SQL诊断页面显示BUG, !327 修复SQL诊断页面显示样式BUG Merge pull request !327 from Lmeng梦/master, 安装采集器端口检测方法修改，慢sql指标采集修改,操作手册, !328 实例监控 bugfix Merge pull request !328 from 板栗/master, 抛异常问题修复, !329 业务开发-序列DDL预览显示问题 Merge pull request !329 from 吴雨霖/master, 对自定义的appcationRunner启动出现异常进行处理, 对自定义的appcationRunner启动出现异常进行处理, !331 智能运维模块告警通知插件bug修复 Merge pull request !331 from wuyuebin/master, 1.实例监控首页接口性能优化, codeCheck, codeCheck, codeCheck, !332 实例监控首页接口性能优化 Merge pull request !332 from Ponfy_Liu/master, 修复实例监控和智能诊断前端BUG, 修复codeCheck, 警告/代码整理, 慢sql指标修改,TCP指标修改,移除无效文件, !334 修复实例监控和SQL诊断页面显示样式BUG Merge pull request !334 from Lmeng梦/master, !333 实例监控 bugfix Merge pull request !333 from 板栗/master, 智能运维模块logo更新，告警插件操作文档更新及代码优化, !336 块智能运维模块logo更新，告警插件操作文档更新及代码优化 Merge pull request !336 from wuyuebin/master, 优化实例监控代码结构, codeCheck, !337 优化实例监控代码结构 Merge pull request !337 from Ponfy_Liu/master, 建表语句修复, !338 业务开发-创建表DDL预览显示问题 Merge pull request !338 from 吴雨霖/master, 【日志检索】上下文框未被隐藏, !339 智能运维模块日志检索插件bug修复 Merge pull request !339 from wuyuebin/master, 修复列描述问题, !340 业务开发-列描述显示问题 Merge pull request !340 from 吴雨霖/master, TOPSQL，点击SQLID进入到SQL诊断页面，创建诊断任务，SQL不能修改参数。, !341 智能运维模块bug修复 Merge pull request !341 from wuyuebin/master, 删除关闭窗口清掉断点接口, !342 【业务开发】函数/过程0630版本优化 Merge pull request !342 from RoaneZhou/master, WDR报告，未选实例点击快照管理，页数错误，点击页数会报错。, !343 智能运维模块实例监控插件bug修复 Merge pull request !343 from wuyuebin/master, 说明文档添加下载地址, !344 添加下载地址 Merge pull request !344 from 刘桐/master, 优化代码, codecheck, !345 智能运维模块告警通知插件bug修复 Merge pu Created-by: luomeng Author-id: 7119743 MR-id: 7236591 Commit-by: 罗梦;luomeng Merged-by: yangzihao Description: merge "develop-930-lm" into "develop" merge develop into develop-930-lm merge "develop" into "develop-930-lm" 服务器管理去除多余的代码, 修复连接弹窗重置的逻辑, 完善国际化翻译，增加日志说明, 解决全局配置无法打开的问题, 提交智能运维630代码, 历史数据诊断前端修改, 修复历史数据诊断前端BUG, 历史数据和实例监控BUG修复, !273 【业务开发】- 连接弹窗等bug修复 Merge pull request !273 from sweet365/master, !277 智能运维模块630需求内容，含实例监控插件、SQL诊断插件、告警通知插件 Merge pull request !277 from 杨子浩/master, codecheck, !281 智能运维模块630告警通知需求内容 Merge pull request !281 from wuyuebin/master, codecheck, !282 智能运维模块630告警通知需求内容 Merge pull request !282 from wuyuebin/master, 告警接口过滤, !283 过滤prometheus发送告警信息的告警接口 Merge pull request !283 from wuyuebin/master, !274 完善迁移批量安装页面国际化翻译，增加迁移日志说明 Merge pull request !274 from 王亚龙/master, 修改ds文档、增加连接弹窗主机输入限制、删除连接提示, 中英文国际化优化和README修改, 实例监控、历史数据诊断bug修复, !289 智能运维模块630需求内容实例监控、历史数据诊断模块bug修复与优化 Merge pull request !289 from Lmeng梦/master, 2, 实例监控bug修复, !292 业务开发-接口优化 Merge pull request !292 from 吴雨霖/master, !293 智能运维模块实例监控插件bug修复 Merge pull request !293 from Lmeng梦/master, 实例监控bug修复, !294 智能运维模块实例监控插件bug修复 Merge pull request !294 from 板栗/master, dataStudio修复bug, 修改样式和操作手册, !296 智能运维模块告警通知插件bug修复 Merge pull request !296 from wuyuebin/master, !295 业务开发插件bug修复 Merge pull request !295 from sweet365/master, 代码优化, 代码优化, !297 智能运维模块告警通知插件bug修复 Merge pull request !297 from wuyuebin/master, 依据新的参数配置列表，修改迁移前端画面判断, add support for auto add plugin to manage, !265 服务器管理去除多余的代码 Merge pull request !265 from 杨森/master, !298 依据新的参数配置列表，修改迁移前端画面校验判断 Merge pull request !298 from 王亚龙/master, 代码优化, 样式调整, !299 智能运维模块告警通知插件bug修复 Merge pull request !299 from wuyuebin/master, 代码优化, 去掉中文, !300 智能运维模块告警通知插件bug修复 Merge pull request !300 from wuyuebin/master, 调整实例监控首页, 告警接口调整, !302 智能运维模块告警通知插件bug修复 Merge pull request !302 from wuyuebin/master, !301 调整实例监控首页 Merge pull request !301 from Ponfy_Liu/master, !290 【bugfix】修复windows版本下安装插件图标丢失和visualtool-plugin下自动安装的插件不能被插件中心管理的问题 Merge pull request !290 from 周斌/auto_plugin, 修改循环注入, !303 业务开发-0630循环依赖修复 Merge pull request !303 from 吴雨霖/master, 将jsch升级到最新版本, !304 将jsch升级到最新版本，解决部分场景下OpenEuler无法连接的问题 Merge pull request !304 from 王亚龙/master, 修复实例监控前端BUG, !306 实例监控前端样式优化 Merge pull request !306 from Lmeng梦/master, 代码检查，bug修复, !307 智能运维模块告警通知插件bug修复 Merge pull request !307 from wuyuebin/master, 修复实例监控、智能诊断模块前端问题, 会话详情等待事件记录BUG修复, 优化阻塞会话树状图, 提交前端优化代码, !308 实例监控前端样式优化 Merge pull request !308 from Lmeng梦/master, alert-center更改为alert-monitor, codecheck, !310 智能运维模块告警通知插件名称由alert-center改为alert-monitor Merge pull request !310 from wuyuebin/master, Merge branch 'master' of https://gitee.com/sweet365/openGauss-workbench, 业务开发模块创建表增加保存提示, !311 业务开发模块创建表增加保存提示 Merge pull request !311 from sweet365/master, 修复实例监控和历史数据诊断前端BUG, 历史数据诊断-修复缺陷和优化代码逻辑, 修复codeCheck, codeCheck修改, 修改前端空格缩进, !313 历史数据诊断-修复缺陷和优化代码逻辑 Merge pull request !313 from Lmeng梦/master, !312 实例监控、历史数据诊断样式优化 Merge pull request !312 from Lmeng梦/master, 移除无效文件,添加等待事件空即考验,添加安装端口校验,修改指标bug, !316 实例监控 bugfix Merge pull request !316 from 板栗/master, 移除无效文件,添加等待事件空即考验,添加安装端口校验,修改指标bug, !319 实例监控 bugfix Merge pull request !319 from 板栗/master, 补充遗漏提交, !321 实例监控 bugfix Merge pull request !321 from 板栗/master, bug, 修复实例监控WDRBUG, 修改代码缩进codecheck, !323 实例监控WDR报告BUG修复 Merge pull request !323 from Lmeng梦/master, 告警bug修复, codecheck, !322 业务开发 - 0630bug修复 Merge pull request !322 from RoaneZhou/master, !325 智能运维模块告警通知插件bug修复 Merge pull request !325 from wuyuebin/master, 修改会话监控接口响应结构体, Merge remote-tracking branch 'origin/master', !326 修改会话监控接口响应结构体 Merge pull request !326 from Ponfy_Liu/master, 修复SQL诊断页面显示BUG, !327 修复SQL诊断页面显示样式BUG Merge pull request !327 from Lmeng梦/master, 安装采集器端口检测方法修改，慢sql指标采集修改,操作手册, !328 实例监控 bugfix Merge pull request !328 from 板栗/master, 抛异常问题修复, !329 业务开发-序列DDL预览显示问题 Merge pull request !329 from 吴雨霖/master, 对自定义的appcationRunner启动出现异常进行处理, 对自定义的appcationRunner启动出现异常进行处理, !331 智能运维模块告警通知插件bug修复 Merge pull request !331 from wuyuebin/master, 1.实例监控首页接口性能优化, codeCheck, codeCheck, codeCheck, !332 实例监控首页接口性能优化 Merge pull request !332 from Ponfy_Liu/master, 修复实例监控和智能诊断前端BUG, 修复codeCheck, 警告/代码整理, 慢sql指标修改,TCP指标修改,移除无效文件, !334 修复实例监控和SQL诊断页面显示样式BUG Merge pull request !334 from Lmeng梦/master, !333 实例监控 bugfix Merge pull request !333 from 板栗/master, 智能运维模块logo更新，告警插件操作文档更新及代码优化, !336 块智能运维模块logo更新，告警插件操作文档更新及代码优化 Merge pull request !336 from wuyuebin/master, 优化实例监控代码结构, codeCheck, !337 优化实例监控代码结构 Merge pull request !337 from Ponfy_Liu/master, 建表语句修复, !338 业务开发-创建表DDL预览显示问题 Merge pull request !338 from 吴雨霖/master, 【日志检索】上下文框未被隐藏, !339 智能运维模块日志检索插件bug修复 Merge pull request !339 from wuyuebin/master, 修复列描述问题, !340 业务开发-列描述显示问题 Merge pull request !340 from 吴雨霖/master, TOPSQL，点击SQLID进入到SQL诊断页面，创建诊断任务，SQL不能修改参数。, !341 智能运维模块bug修复 Merge pull request !341 from wuyuebin/master, 删除关闭窗口清掉断点接口, !342 【业务开发】函数/过程0630版本优化 Merge pull request !342 from RoaneZhou/master, WDR报告，未选实例点击快照管理，页数错误，点击页数会报错。, !343 智能运维模块实例监控插件bug修复 Merge pull request !343 from wuyuebin/master, 说明文档添加下载地址, !344 添加下载地址 Merge pull request !344 from 刘桐/master, 优化代码, codecheck, !345 智能运维模块告警通知插件bug修复 Merge pu See merge request: openGaussythcs00001/openGauss-workbench!568 commit 84ae1c908a8ecadf30d7e90f848ed4999f5f1642 Merge: 0c5de4d7 a7669fa7 Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Wed Aug 23 16:24:53 2023 +0800 merge develop into release merge "develop" into "release" 测试, merge "feature_wgb_test" into "develop" 测试, 测试, merge "feature_wgb_test" into "develop" 测试, 修改加长连接名称长度限制, merge "develop_wyl" into "develop" 修改加长连接名称长度限制, merge "develop" into "master" 测试, merge "feature_wgb_test" into "develop" 测试, 测试, merge "feature_wgb_test" into "develop" 测试, 修改加长连接名称长度限制, merge "develop_wyl" into "develop" 修改加长连接名称长度限制, 连接信息删除后重置, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, sql诊断_%IOWait高-分布图_数据显示被遮挡, sql诊断_%IOWait高-分布图_数据显示被遮挡, 重新设计AppStore的lastestConnectDatabase, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, 修改文案,添加历史数据源, 添加压缩包, SQL诊断-国际化参数诊断, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, merge "bugfix_lm_20230321" into "develop" 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "feature-wyb" into "develop" 修改文案,添加历史数据源, 添加压缩包, SQL诊断-国际化参数诊断, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "develop" into "master" 连接信息删除后重置, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, sql诊断_%IOWait高-分布图_数据显示被遮挡, sql诊断_%IOWait高-分布图_数据显示被遮挡, 重新设计AppStore的lastestConnectDatabase, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, merge "bugfix_lm_20230321" into "develop" 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "feature-wyb" into "develop" 修改文案,添加历史数据源, 添加压缩包, SQL诊断-国际化参数诊断, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, merge "feature-wyb" into "develop" 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, merge "develop" into "master" 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, merge "feature-wyb" into "develop" 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, 日志检索-修复日志内容解析问题, merge "bugfix_lm_20230321" into "develop" 日志检索-修复日志内容解析问题, 添加unzip安装/校验, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, 添加旧数据处理, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, merge "feature-wyb" into "develop" merge "develop" into "master" 连接信息删除后重置, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, sql诊断_%IOWait高-分布图_数据显示被遮挡, sql诊断_%IOWait高-分布图_数据显示被遮挡, 重新设计AppStore的lastestConnectDatabase, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, merge "bugfix_lm_20230321" into "develop" 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "feature-wyb" into "develop" 修改文案,添加历史数据源, 添加压缩包, SQL诊断-国际化参数诊断, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'devel Created-by: zhouwenruo Author-id: 7119763 MR-id: 7237874 Commit-by: zhangcheng;yangzihao;Zihao Yang;张昊宇;luomeng;罗梦;wuyuebin;liupengfei;zengseliang;zhouwenruo;wuyulin;hw73730920/wuguobiao;user;wuguobiao;opengauss-bot Merged-by: wuguobiao Description: merge "develop" into "release" 测试, merge "feature_wgb_test" into "develop" 测试, 测试, merge "feature_wgb_test" into "develop" 测试, 修改加长连接名称长度限制, merge "develop_wyl" into "develop" 修改加长连接名称长度限制, merge "develop" into "master" 测试, merge "feature_wgb_test" into "develop" 测试, 测试, merge "feature_wgb_test" into "develop" 测试, 修改加长连接名称长度限制, merge "develop_wyl" into "develop" 修改加长连接名称长度限制, 连接信息删除后重置, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, sql诊断_%IOWait高-分布图_数据显示被遮挡, sql诊断_%IOWait高-分布图_数据显示被遮挡, 重新设计AppStore的lastestConnectDatabase, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, 修改文案,添加历史数据源, 添加压缩包, SQL诊断-国际化参数诊断, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, merge "bugfix_lm_20230321" into "develop" 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "feature-wyb" into "develop" 修改文案,添加历史数据源, 添加压缩包, SQL诊断-国际化参数诊断, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "develop" into "master" 连接信息删除后重置, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, sql诊断_%IOWait高-分布图_数据显示被遮挡, sql诊断_%IOWait高-分布图_数据显示被遮挡, 重新设计AppStore的lastestConnectDatabase, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, merge "bugfix_lm_20230321" into "develop" 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "feature-wyb" into "develop" 修改文案,添加历史数据源, 添加压缩包, SQL诊断-国际化参数诊断, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, merge "feature-wyb" into "develop" 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, merge "develop" into "master" 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, merge "feature-wyb" into "develop" 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, 日志检索-修复日志内容解析问题, merge "bugfix_lm_20230321" into "develop" 日志检索-修复日志内容解析问题, 添加unzip安装/校验, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, 添加旧数据处理, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, merge "feature-wyb" into "develop" merge "develop" into "master" 连接信息删除后重置, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, sql诊断_%IOWait高-分布图_数据显示被遮挡, sql诊断_%IOWait高-分布图_数据显示被遮挡, 重新设计AppStore的lastestConnectDatabase, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, merge "bugfix_lm_20230321" into "develop" 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "feature-wyb" into "develop" 修改文案,添加历史数据源, 添加压缩包, SQL诊断-国际化参数诊断, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'devel See merge request: openGaussythcs00001/openGauss-workbench!580 commit a7669fa750adf9af7913ac8bb801561d7dffb147 Merge: f77a3881 35be156f Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Wed Aug 23 16:22:37 2023 +0800 merge develop-zwr into develop merge "develop-zwr" into "develop" repair data-studio, Merge remote-tracking branch 'origin/master', Merge remote-tracking branch 'origin/master', !369 业务开发-列问题回滚 Merge pull request !369 from 吴雨霖/master, 增加websocket默认消息大小，取消正则表达式判断条件, !370 增加websocket消息大小，取消迁移正则表达式文本限制 Merge pull request !370 from 王亚龙/master, 修改正则表达式判断条件, !371 修改正则表达式判断条件 Merge pull request !371 from 王亚龙/master, 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off, !373 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off Merge pull request !373 from 王亚龙/master, Merge branch 'master' of https://gitee.com/opengauss/openGauss-workbench, repair druid config, !377 [bugfix] 修复druid没有检查直接使用线程池链接的问题 Merge pull request !377 from 周斌/master, web-ds支持匿名块调试, 匿名块调试readme修改, !372 web-ds支持匿名块调试 Merge pull request !372 from 李秦朗/master, !379 web-ds匿名块调试readme修改 Merge pull request !379 from 李秦朗/readme, Merge remote-tracking branch 'origin/release' into develop-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/debug/AsyncHelper.java # plugins/data-studio/web-ui/src/components/terminal-editor/createTemplate.ts # plugins/data-studio/web-ui/src/layout/Sidebar/index.vue Created-by: zhouwenruo Author-id: 7119763 MR-id: 7237879 Commit-by: zhouwenruo;opengauss_bot;li-qinlang;justbk;wangyl Merged-by: zhouwenruo Description: merge "develop-zwr" into "develop" repair data-studio, Merge remote-tracking branch 'origin/master', Merge remote-tracking branch 'origin/master', !369 业务开发-列问题回滚 Merge pull request !369 from 吴雨霖/master, 增加websocket默认消息大小，取消正则表达式判断条件, !370 增加websocket消息大小，取消迁移正则表达式文本限制 Merge pull request !370 from 王亚龙/master, 修改正则表达式判断条件, !371 修改正则表达式判断条件 Merge pull request !371 from 王亚龙/master, 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off, !373 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off Merge pull request !373 from 王亚龙/master, Merge branch 'master' of https://gitee.com/opengauss/openGauss-workbench, repair druid config, !377 [bugfix] 修复druid没有检查直接使用线程池链接的问题 Merge pull request !377 from 周斌/master, web-ds支持匿名块调试, 匿名块调试readme修改, !372 web-ds支持匿名块调试 Merge pull request !372 from 李秦朗/master, !379 web-ds匿名块调试readme修改 Merge pull request !379 from 李秦朗/readme, Merge remote-tracking branch 'origin/release' into develop-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/debug/AsyncHelper.java # plugins/data-studio/web-ui/src/components/terminal-editor/createTemplate.ts # plugins/data-studio/web-ui/src/layout/Sidebar/index.vue See merge request: openGaussythcs00001/openGauss-workbench!581 commit f77a38812f9f4a4be8b7cc593453bff26855f930 Merge: 47a32bac 01a75cbc Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Wed Aug 23 16:20:52 2023 +0800 merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 集群监控代码, 杨子浩 930 集群监控 增加刷新按钮 Created-by: yangzihao Author-id: 7119754 MR-id: 7237763 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 集群监控代码, 杨子浩 930 集群监控 增加刷新按钮 See merge request: openGaussythcs00001/openGauss-workbench!579 commit 35be156f20d73a70fc3ed173971effa6d9bde9c4 Merge: ea66e4cb 0c5de4d7 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Wed Aug 23 16:17:49 2023 +0800 Merge remote-tracking branch 'origin/release' into develop-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/debug/AsyncHelper.java # plugins/data-studio/web-ui/src/components/terminal-editor/createTemplate.ts # plugins/data-studio/web-ui/src/layout/Sidebar/index.vue commit 29443c9b3c319062c9602c4a307e680796ee4bef Author: liupengfei <liupengfei@ncti-gba.cn> Date: Wed Aug 23 11:29:33 2023 +0800 集群监控修改变量类型 commit 01a75cbc0479164528d6487fad5a85132591529d Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Wed Aug 23 11:29:07 2023 +0800 杨子浩 930 集群监控 增加刷新按钮 commit 30f21a8c0b5caf28cce1e7a3ffcaba3e935f3b24 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Wed Aug 23 11:24:06 2023 +0800 杨子浩 930 集群监控代码 commit 67fb797bf2b27f94e3e615aff605467bd4164969 Merge: 3c34e2e9 1fee98bc Author: liupengfei <liupengfei@ncti-gba.cn> Date: Wed Aug 23 11:22:43 2023 +0800 Merge remote-tracking branch 'origin/feature-instance' into feature-instance commit 3c34e2e9faa8fe7f41057178d4a8222e6bf7f572 Merge: 7e5587d1 38a226e7 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Wed Aug 23 11:22:10 2023 +0800 Merge branch 'feature-instance-lpf' into feature-instance commit 38a226e7e99ef6ef704131426899d0954dfdd1b0 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Wed Aug 23 11:21:20 2023 +0800 集群监控 commit 1fee98bcc24fe083e7f923db895db1679f5d51db Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Aug 23 11:20:33 2023 +0800 test commit 47a32bac93c7f8c73abd1f9dae53ed8f05c2ae29 Merge: c8803f2e f5137a89 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Wed Aug 23 11:16:54 2023 +0800 merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" 单元测试及代码优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7237184 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" 单元测试及代码优化 See merge request: openGaussythcs00001/openGauss-workbench!570 commit c8803f2efa9dc606df43881eac409494d687188c Merge: ea66e4cb 49f3cd65 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Wed Aug 23 11:16:27 2023 +0800 merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 实例监控前端代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7237690 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 实例监控前端代码 See merge request: openGaussythcs00001/openGauss-workbench!572 commit ea66e4cbbfeb4eeee728635fc356933154e56554 Merge: daa493c5 575535e8 Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Wed Aug 23 10:50:37 2023 +0800 merge develop-zwr into develop merge "develop-zwr" into "develop" 合并社区代码 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7237730 Commit-by: zhouwenruo Merged-by: zhangcheng Description: merge "develop-zwr" into "develop" 合并社区代码 See merge request: openGaussythcs00001/openGauss-workbench!574 commit daa493c51f6032541bad4c5c032095a03d474148 Merge: 48c1f99c 60bd7015 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Wed Aug 23 10:49:58 2023 +0800 merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" 视图、新增角色、删除角色, 社区pr代码修改 Created-by: zhangcheng Author-id: 7119759 MR-id: 7237720 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "develop-zhangcheng-0930" into "develop" 视图、新增角色、删除角色, 社区pr代码修改 See merge request: openGaussythcs00001/openGauss-workbench!573 commit 575535e8e18652b9c30e773ed037b6656a85e364 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Wed Aug 23 10:48:24 2023 +0800 合并社区代码 commit 60bd7015c84903485c0eb75f75b33e75d5fff35a Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Wed Aug 23 10:42:13 2023 +0800 社区pr代码修改 commit b6fb6852e430cbe3cd113e3ea98660413fce9ba2 Merge: f5137a89 48c1f99c Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Aug 23 10:16:08 2023 +0800 Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930 commit 48c1f99cb6d8b6945ecf20b9e1bcc0b712441737 Merge: 934d24c5 461e21ed Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Wed Aug 23 10:03:24 2023 +0800 merge develop-zwr into develop merge "develop-zwr" into "develop" 调整查看用户角色功能 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7237663 Commit-by: zhouwenruo Merged-by: zhangcheng Description: merge "develop-zwr" into "develop" 调整查看用户角色功能 See merge request: openGaussythcs00001/openGauss-workbench!571 commit 461e21edbfaafe6cc6d572487d2f470fa3bdb78e Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Wed Aug 23 09:56:33 2023 +0800 Test覆盖率 commit 92413265c0652d60819692da9b1749eae1536776 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Tue Aug 22 16:17:40 2023 +0800 视图、新增角色、删除角色 commit 006da4f29b774890f0edd82275e96e76387079d4 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Tue Aug 22 11:38:59 2023 +0800 调整查看用户角色功能 commit f7d01b31859ffd216b4133a74f92927cd32e0879 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Mon Aug 21 21:12:50 2023 +0800 集群监控 commit f5137a89a47ae92f9c02124cee10eab1bccc7320 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Aug 21 17:50:48 2023 +0800 单元测试及代码优化 commit 37ad300b73f015932e0df124324219b7746bc0ed Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon Aug 21 17:37:29 2023 +0800 WDR版权 commit 934d24c5072eadd6b1eeef12651653a55cf68dee Merge: 455496df edfa9837 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Mon Aug 21 10:37:35 2023 +0800 merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" 第三方通知——snmp通知方式, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 屏蔽部分单元测试 Created-by: wuyuebin Author-id: 7158405 MR-id: 7236880 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" 第三方通知——snmp通知方式, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 屏蔽部分单元测试 See merge request: openGaussythcs00001/openGauss-workbench!569 commit edfa98378387e439fdd9559d72f3e6820e8310a2 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Aug 21 09:08:38 2023 +0800 屏蔽部分单元测试 commit 4a23ccf79e1ba86a3dc67e825ffb106f10bf9431 Merge: 4f8f7203 455496df Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Aug 21 09:07:34 2023 +0800 Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930 commit 4f8f72032bca0bf8a92860475a4cebf05ff2ae49 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Sun Aug 20 11:20:25 2023 +0800 第三方通知——snmp通知方式 commit 0dbae86d2d0136d4ff0a2b6671605aac9c4f43d8 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Aug 18 15:40:00 2023 +0800 wdr接口 commit 9d39044e5b754ad64becfa52749bae38474ba059 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Fri Aug 18 15:29:05 2023 +0800 智能诊断930版本代码 commit cdbf840273193bfa697ee42e7cdfe793f251a66d Author: 罗梦 <luomeng@ncti-gba.cn> Date: Fri Aug 18 15:24:26 2023 +0800 智能诊断930版本代码 commit 909c791c85030a46d72075844856a63932d4143f Merge: d3f84f81 455496df Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Fri Aug 18 15:12:44 2023 +0800 merge develop into develop-930-lm merge "develop" into "develop-930-lm" 告警监控优化代码，添加校验功能、告警模板规则启动/停止功能, 修增视图编辑功能, merge develop-zwr into develop merge "develop-zwr" into "develop" 修增视图编辑功能 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7236381 Commit-by: zhouwenruo Merged-by: zhangcheng Description: merge "develop-zwr" into "develop" 修增视图编辑功能 See merge request: openGaussythcs00001/openGauss-workbench!565, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" 告警监控优化代码，添加校验功能、告警模板规则启动/停止功能 Created-by: wuyuebin Author-id: 7158405 MR-id: 7235998 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" 告警监控优化代码，添加校验功能、告警模板规则启动/停止功能 See merge request: openGaussythcs00001/openGauss-workbench!563, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 第三方通知——http通知方式, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 第三方通知——http通知方式 Created-by: wuyuebin Author-id: 7158405 MR-id: 7236474 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 第三方通知——http通知方式 See merge request: openGaussythcs00001/openGauss-workbench!566 Created-by: luomeng Author-id: 7119743 MR-id: 7236583 Commit-by: yangzihao;wuyuebin;zhangcheng;zhouwenruo Merged-by: luomeng Description: merge "develop" into "develop-930-lm" 告警监控优化代码，添加校验功能、告警模板规则启动/停止功能, 修增视图编辑功能, merge develop-zwr into develop merge "develop-zwr" into "develop" 修增视图编辑功能 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7236381 Commit-by: zhouwenruo Merged-by: zhangcheng Description: merge "develop-zwr" into "develop" 修增视图编辑功能 See merge request: openGaussythcs00001/openGauss-workbench!565, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" 告警监控优化代码，添加校验功能、告警模板规则启动/停止功能 Created-by: wuyuebin Author-id: 7158405 MR-id: 7235998 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" 告警监控优化代码，添加校验功能、告警模板规则启动/停止功能 See merge request: openGaussythcs00001/openGauss-workbench!563, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 第三方通知——http通知方式, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 第三方通知——http通知方式 Created-by: wuyuebin Author-id: 7158405 MR-id: 7236474 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 第三方通知——http通知方式 See merge request: openGaussythcs00001/openGauss-workbench!566 See merge request: openGaussythcs00001/openGauss-workbench!567 commit 49f3cd654414a5bc796a59eed30bbd7a8e89cf75 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Fri Aug 18 14:40:42 2023 +0800 杨子浩 930 实例监控前端代码 commit 455496dfd204c7161c5cf269fbd600eb2f87a858 Merge: 8f6e7424 3853ac9e Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Fri Aug 18 09:33:57 2023 +0800 merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 第三方通知——http通知方式 Created-by: wuyuebin Author-id: 7158405 MR-id: 7236474 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 第三方通知——http通知方式 See merge request: openGaussythcs00001/openGauss-workbench!566 commit 3853ac9ec45a98d7fa4dd43d5327c8832b1117ad Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Fri Aug 18 09:11:36 2023 +0800 第三方通知——http通知方式 commit 94767930101abd72d3efce97c2a490d13fc85fd6 Merge: 45c81a4e 8f6e7424 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Fri Aug 18 09:09:28 2023 +0800 Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930 commit 7e5587d1cbe7644101c76f2f6646280cbf32e04d Merge: 8939c764 1491d031 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Fri Aug 18 09:08:30 2023 +0800 Merge remote-tracking branch 'origin/feature-instance' into feature-instance commit 8939c7647ee1495a74ac74e426532d5ff90ad5cc Merge: 5ec21e4c b121129c Author: liupengfei <liupengfei@ncti-gba.cn> Date: Fri Aug 18 09:07:58 2023 +0800 Merge branch 'feature-instance-lpf' into feature-instance commit b121129ceea2bbf57a3427959ed93ef8ded513b1 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Fri Aug 18 09:07:07 2023 +0800 新版集群监控-集群详情 commit 8f6e7424bee8a21fe75b26db375c423b5d0ee882 Merge: 489584ea 38a4d6ef Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Fri Aug 18 09:04:33 2023 +0800 merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" 告警监控优化代码，添加校验功能、告警模板规则启动/停止功能 Created-by: wuyuebin Author-id: 7158405 MR-id: 7235998 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" 告警监控优化代码，添加校验功能、告警模板规则启动/停止功能 See merge request: openGaussythcs00001/openGauss-workbench!563 commit 45c81a4e22b56b5902f6dfca9dfa67ccf5b0a639 Merge: 38a4d6ef 489584ea Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Fri Aug 18 08:55:45 2023 +0800 Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930 commit 489584ea838101adf1c95bb2e5f15358a8e01c32 Merge: d95f6b82 2acfd6ed Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Thu Aug 17 17:54:45 2023 +0800 merge develop-zwr into develop merge "develop-zwr" into "develop" 修增视图编辑功能 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7236381 Commit-by: zhouwenruo Merged-by: zhangcheng Description: merge "develop-zwr" into "develop" 修增视图编辑功能 See merge request: openGaussythcs00001/openGauss-workbench!565 commit 2acfd6edabf307c64e3a4e91409f72422453daef Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu Aug 17 17:53:04 2023 +0800 修增视图编辑功能 commit 1491d0314fa4c770fa966ec45c5c1c665f4432d7 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Thu Aug 17 17:04:15 2023 +0800 线程号,系统日志路径 commit 438b5d3a33bba02417d9de1104fe063be5484c84 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Thu Aug 17 16:39:12 2023 +0800 修改节点属性 commit 5ec21e4cdbfeed3dad7ba548e805a6090bf1a291 Merge: abdd9ad2 b8936f3c Author: liupengfei <liupengfei@ncti-gba.cn> Date: Thu Aug 17 14:37:43 2023 +0800 Merge remote-tracking branch 'origin/feature-instance' into feature-instance commit abdd9ad21a1f173fb573ce9cbbb64bfd96f865f1 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Thu Aug 17 14:33:49 2023 +0800 新版集群监控-首页接口 commit d3f84f81da551dbfc24d1714e85528c195e49838 Merge: 30309011 d95f6b82 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Thu Aug 17 10:42:13 2023 +0800 merge develop into develop-930-lm merge "develop" into "develop-930-lm" 杨子浩 930 实例监控代码, 杨子浩 930 实例监控前端代码, 杨子浩 930 SQL诊断前端代码, 杨子浩 930 实例监控前端代码, merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 实例监控代码, 杨子浩 930 实例监控前端代码, 杨子浩 930 SQL诊断前端代码, 杨子浩 930 实例监控前端代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7235987 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 实例监控代码, 杨子浩 930 实例监控前端代码, 杨子浩 930 SQL诊断前端代码, 杨子浩 930 实例监控前端代码 See merge request: openGaussythcs00001/openGauss-workbench!562 Created-by: luomeng Author-id: 7119743 MR-id: 7236111 Commit-by: yangzihao;Zihao Yang Merged-by: luomeng Description: merge "develop" into "develop-930-lm" 杨子浩 930 实例监控代码, 杨子浩 930 实例监控前端代码, 杨子浩 930 SQL诊断前端代码, 杨子浩 930 实例监控前端代码, merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 实例监控代码, 杨子浩 930 实例监控前端代码, 杨子浩 930 SQL诊断前端代码, 杨子浩 930 实例监控前端代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7235987 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 实例监控代码, 杨子浩 930 实例监控前端代码, 杨子浩 930 SQL诊断前端代码, 杨子浩 930 实例监控前端代码 See merge request: openGaussythcs00001/openGauss-workbench!562 See merge request: openGaussythcs00001/openGauss-workbench!564 commit 38a4d6ef89bb83e4c0fa16c0aa1438b3b62385ba Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Aug 16 17:51:57 2023 +0800 告警监控优化代码，添加校验功能、告警模板规则启动/停止功能 commit d95f6b826cd719556b85cf8fdcb2fffd7bdcb608 Merge: cde6ade6 b2483d51 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Wed Aug 16 17:45:41 2023 +0800 merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 实例监控代码, 杨子浩 930 实例监控前端代码, 杨子浩 930 SQL诊断前端代码, 杨子浩 930 实例监控前端代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7235987 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 实例监控代码, 杨子浩 930 实例监控前端代码, 杨子浩 930 SQL诊断前端代码, 杨子浩 930 实例监控前端代码 See merge request: openGaussythcs00001/openGauss-workbench!562 commit b2483d5131585d9599f1c5faa337f4c30d915ecd Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Wed Aug 16 17:28:41 2023 +0800 杨子浩 930 实例监控前端代码 commit eb77eb17cf15c626457f09ce4038ebc11e3269ad Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Wed Aug 16 17:28:22 2023 +0800 杨子浩 930 SQL诊断前端代码 commit 03c590f6a358aa2cc828749a1cdcfeb412e23331 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Wed Aug 16 17:27:09 2023 +0800 杨子浩 930 实例监控前端代码 commit ed62fd7c02bfd6f943a375a28ea5d02b23734b5b Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Wed Aug 16 17:06:23 2023 +0800 杨子浩 930 实例监控代码 commit b8936f3c7439962c2832696537169bdf2a43a4c5 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Aug 16 16:16:59 2023 +0800 等待事件修改,top结果修改 commit 13f320f69cfa3decc20ab009b840a7f74c888bda Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Aug 16 10:47:57 2023 +0800 CPU部分指标修正,sqlid修改,topsql指标修改 commit 6e45d969b2ebb76443ba62483397ae8f41e9e2be Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Aug 15 18:11:52 2023 +0800 指标修改,修改等待事件接口,添加详情-系统资源 commit 303090115a4abec61432629157d220b68e170425 Merge: 18c6910d cde6ade6 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Tue Aug 15 15:59:51 2023 +0800 merge develop into develop-930-lm merge "develop" into "develop-930-lm" 服务器管理去除多余的代码, 修复连接弹窗重置的逻辑, 完善国际化翻译，增加日志说明, 解决全局配置无法打开的问题, 提交智能运维630代码, 历史数据诊断前端修改, 修复历史数据诊断前端BUG, 历史数据和实例监控BUG修复, !273 【业务开发】- 连接弹窗等bug修复 Merge pull request !273 from sweet365/master, !277 智能运维模块630需求内容，含实例监控插件、SQL诊断插件、告警通知插件 Merge pull request !277 from 杨子浩/master, codecheck, !281 智能运维模块630告警通知需求内容 Merge pull request !281 from wuyuebin/master, codecheck, !282 智能运维模块630告警通知需求内容 Merge pull request !282 from wuyuebin/master, 告警接口过滤, !283 过滤prometheus发送告警信息的告警接口 Merge pull request !283 from wuyuebin/master, !274 完善迁移批量安装页面国际化翻译，增加迁移日志说明 Merge pull request !274 from 王亚龙/master, 修改ds文档、增加连接弹窗主机输入限制、删除连接提示, 中英文国际化优化和README修改, 实例监控、历史数据诊断bug修复, !289 智能运维模块630需求内容实例监控、历史数据诊断模块bug修复与优化 Merge pull request !289 from Lmeng梦/master, 2, 实例监控bug修复, !292 业务开发-接口优化 Merge pull request !292 from 吴雨霖/master, !293 智能运维模块实例监控插件bug修复 Merge pull request !293 from Lmeng梦/master, 实例监控bug修复, !294 智能运维模块实例监控插件bug修复 Merge pull request !294 from 板栗/master, dataStudio修复bug, 修改样式和操作手册, !296 智能运维模块告警通知插件bug修复 Merge pull request !296 from wuyuebin/master, !295 业务开发插件bug修复 Merge pull request !295 from sweet365/master, 代码优化, 代码优化, !297 智能运维模块告警通知插件bug修复 Merge pull request !297 from wuyuebin/master, 依据新的参数配置列表，修改迁移前端画面判断, add support for auto add plugin to manage, !265 服务器管理去除多余的代码 Merge pull request !265 from 杨森/master, !298 依据新的参数配置列表，修改迁移前端画面校验判断 Merge pull request !298 from 王亚龙/master, 代码优化, 样式调整, !299 智能运维模块告警通知插件bug修复 Merge pull request !299 from wuyuebin/master, 代码优化, 去掉中文, !300 智能运维模块告警通知插件bug修复 Merge pull request !300 from wuyuebin/master, 调整实例监控首页, 告警接口调整, !302 智能运维模块告警通知插件bug修复 Merge pull request !302 from wuyuebin/master, !301 调整实例监控首页 Merge pull request !301 from Ponfy_Liu/master, !290 【bugfix】修复windows版本下安装插件图标丢失和visualtool-plugin下自动安装的插件不能被插件中心管理的问题 Merge pull request !290 from 周斌/auto_plugin, 修改循环注入, !303 业务开发-0630循环依赖修复 Merge pull request !303 from 吴雨霖/master, 将jsch升级到最新版本, !304 将jsch升级到最新版本，解决部分场景下OpenEuler无法连接的问题 Merge pull request !304 from 王亚龙/master, 修复实例监控前端BUG, !306 实例监控前端样式优化 Merge pull request !306 from Lmeng梦/master, 代码检查，bug修复, !307 智能运维模块告警通知插件bug修复 Merge pull request !307 from wuyuebin/master, 修复实例监控、智能诊断模块前端问题, 会话详情等待事件记录BUG修复, 优化阻塞会话树状图, 提交前端优化代码, !308 实例监控前端样式优化 Merge pull request !308 from Lmeng梦/master, alert-center更改为alert-monitor, codecheck, !310 智能运维模块告警通知插件名称由alert-center改为alert-monitor Merge pull request !310 from wuyuebin/master, Merge branch 'master' of https://gitee.com/sweet365/openGauss-workbench, 业务开发模块创建表增加保存提示, !311 业务开发模块创建表增加保存提示 Merge pull request !311 from sweet365/master, 修复实例监控和历史数据诊断前端BUG, 历史数据诊断-修复缺陷和优化代码逻辑, 修复codeCheck, codeCheck修改, 修改前端空格缩进, !313 历史数据诊断-修复缺陷和优化代码逻辑 Merge pull request !313 from Lmeng梦/master, !312 实例监控、历史数据诊断样式优化 Merge pull request !312 from Lmeng梦/master, 移除无效文件,添加等待事件空即考验,添加安装端口校验,修改指标bug, !316 实例监控 bugfix Merge pull request !316 from 板栗/master, 移除无效文件,添加等待事件空即考验,添加安装端口校验,修改指标bug, !319 实例监控 bugfix Merge pull request !319 from 板栗/master, 补充遗漏提交, !321 实例监控 bugfix Merge pull request !321 from 板栗/master, bug, 修复实例监控WDRBUG, 修改代码缩进codecheck, !323 实例监控WDR报告BUG修复 Merge pull request !323 from Lmeng梦/master, 告警bug修复, codecheck, !322 业务开发 - 0630bug修复 Merge pull request !322 from RoaneZhou/master, !325 智能运维模块告警通知插件bug修复 Merge pull request !325 from wuyuebin/master, 修改会话监控接口响应结构体, Merge remote-tracking branch 'origin/master', !326 修改会话监控接口响应结构体 Merge pull request !326 from Ponfy_Liu/master, 修复SQL诊断页面显示BUG, !327 修复SQL诊断页面显示样式BUG Merge pull request !327 from Lmeng梦/master, 安装采集器端口检测方法修改，慢sql指标采集修改,操作手册, !328 实例监控 bugfix Merge pull request !328 from 板栗/master, 抛异常问题修复, !329 业务开发-序列DDL预览显示问题 Merge pull request !329 from 吴雨霖/master, 对自定义的appcationRunner启动出现异常进行处理, 对自定义的appcationRunner启动出现异常进行处理, !331 智能运维模块告警通知插件bug修复 Merge pull request !331 from wuyuebin/master, 1.实例监控首页接口性能优化, codeCheck, codeCheck, codeCheck, !332 实例监控首页接口性能优化 Merge pull request !332 from Ponfy_Liu/master, 修复实例监控和智能诊断前端BUG, 修复codeCheck, 警告/代码整理, 慢sql指标修改,TCP指标修改,移除无效文件, !334 修复实例监控和SQL诊断页面显示样式BUG Merge pull request !334 from Lmeng梦/master, !333 实例监控 bugfix Merge pull request !333 from 板栗/master, 智能运维模块logo更新，告警插件操作文档更新及代码优化, !336 块智能运维模块logo更新，告警插件操作文档更新及代码优化 Merge pull request !336 from wuyuebin/master, 优化实例监控代码结构, codeCheck, !337 优化实例监控代码结构 Merge pull request !337 from Ponfy_Liu/master, 建表语句修复, !338 业务开发-创建表DDL预览显示问题 Merge pull request !338 from 吴雨霖/master, 【日志检索】上下文框未被隐藏, !339 智能运维模块日志检索插件bug修复 Merge pull request !339 from wuyuebin/master, 修复列描述问题, !340 业务开发-列描述显示问题 Merge pull request !340 from 吴雨霖/master, TOPSQL，点击SQLID进入到SQL诊断页面，创建诊断任务，SQL不能修改参数。, !341 智能运维模块bug修复 Merge pull request !341 from wuyuebin/master, 删除关闭窗口清掉断点接口, !342 【业务开发】函数/过程0630版本优化 Merge pull request !342 from RoaneZhou/master, WDR报告，未选实例点击快照管理，页数错误，点击页数会报错。, !343 智能运维模块实例监控插件bug修复 Merge pull request !343 from wuyuebin/master, 说明文档添加下载地址, !344 添加下载地址 Merge pull request !344 from 刘桐/master, 优化代码, codecheck, !345 智能运维模块告警通知插件bug修复 Merge pull request !345 from wuyuebin/master, 更改告警接口白名单url, !346 更改告警接口白名单的url Me Created-by: luomeng Author-id: 7119743 MR-id: 7235454 Commit-by: yangzihao;Zihao Yang;zhangcheng;zhouwenruo;wuyuebin;wuyulin;liupengfei;张昊宇;opengauss_bot;吴雨霖;luomeng;wangyl;罗梦;pengjiong;liu-tong-8848;justbk;yangs Merged-by: luomeng Description: merge "develop" into "develop-930-lm" 服务器管理去除多余的代码, 修复连接弹窗重置的逻辑, 完善国际化翻译，增加日志说明, 解决全局配置无法打开的问题, 提交智能运维630代码, 历史数据诊断前端修改, 修复历史数据诊断前端BUG, 历史数据和实例监控BUG修复, !273 【业务开发】- 连接弹窗等bug修复 Merge pull request !273 from sweet365/master, !277 智能运维模块630需求内容，含实例监控插件、SQL诊断插件、告警通知插件 Merge pull request !277 from 杨子浩/master, codecheck, !281 智能运维模块630告警通知需求内容 Merge pull request !281 from wuyuebin/master, codecheck, !282 智能运维模块630告警通知需求内容 Merge pull request !282 from wuyuebin/master, 告警接口过滤, !283 过滤prometheus发送告警信息的告警接口 Merge pull request !283 from wuyuebin/master, !274 完善迁移批量安装页面国际化翻译，增加迁移日志说明 Merge pull request !274 from 王亚龙/master, 修改ds文档、增加连接弹窗主机输入限制、删除连接提示, 中英文国际化优化和README修改, 实例监控、历史数据诊断bug修复, !289 智能运维模块630需求内容实例监控、历史数据诊断模块bug修复与优化 Merge pull request !289 from Lmeng梦/master, 2, 实例监控bug修复, !292 业务开发-接口优化 Merge pull request !292 from 吴雨霖/master, !293 智能运维模块实例监控插件bug修复 Merge pull request !293 from Lmeng梦/master, 实例监控bug修复, !294 智能运维模块实例监控插件bug修复 Merge pull request !294 from 板栗/master, dataStudio修复bug, 修改样式和操作手册, !296 智能运维模块告警通知插件bug修复 Merge pull request !296 from wuyuebin/master, !295 业务开发插件bug修复 Merge pull request !295 from sweet365/master, 代码优化, 代码优化, !297 智能运维模块告警通知插件bug修复 Merge pull request !297 from wuyuebin/master, 依据新的参数配置列表，修改迁移前端画面判断, add support for auto add plugin to manage, !265 服务器管理去除多余的代码 Merge pull request !265 from 杨森/master, !298 依据新的参数配置列表，修改迁移前端画面校验判断 Merge pull request !298 from 王亚龙/master, 代码优化, 样式调整, !299 智能运维模块告警通知插件bug修复 Merge pull request !299 from wuyuebin/master, 代码优化, 去掉中文, !300 智能运维模块告警通知插件bug修复 Merge pull request !300 from wuyuebin/master, 调整实例监控首页, 告警接口调整, !302 智能运维模块告警通知插件bug修复 Merge pull request !302 from wuyuebin/master, !301 调整实例监控首页 Merge pull request !301 from Ponfy_Liu/master, !290 【bugfix】修复windows版本下安装插件图标丢失和visualtool-plugin下自动安装的插件不能被插件中心管理的问题 Merge pull request !290 from 周斌/auto_plugin, 修改循环注入, !303 业务开发-0630循环依赖修复 Merge pull request !303 from 吴雨霖/master, 将jsch升级到最新版本, !304 将jsch升级到最新版本，解决部分场景下OpenEuler无法连接的问题 Merge pull request !304 from 王亚龙/master, 修复实例监控前端BUG, !306 实例监控前端样式优化 Merge pull request !306 from Lmeng梦/master, 代码检查，bug修复, !307 智能运维模块告警通知插件bug修复 Merge pull request !307 from wuyuebin/master, 修复实例监控、智能诊断模块前端问题, 会话详情等待事件记录BUG修复, 优化阻塞会话树状图, 提交前端优化代码, !308 实例监控前端样式优化 Merge pull request !308 from Lmeng梦/master, alert-center更改为alert-monitor, codecheck, !310 智能运维模块告警通知插件名称由alert-center改为alert-monitor Merge pull request !310 from wuyuebin/master, Merge branch 'master' of https://gitee.com/sweet365/openGauss-workbench, 业务开发模块创建表增加保存提示, !311 业务开发模块创建表增加保存提示 Merge pull request !311 from sweet365/master, 修复实例监控和历史数据诊断前端BUG, 历史数据诊断-修复缺陷和优化代码逻辑, 修复codeCheck, codeCheck修改, 修改前端空格缩进, !313 历史数据诊断-修复缺陷和优化代码逻辑 Merge pull request !313 from Lmeng梦/master, !312 实例监控、历史数据诊断样式优化 Merge pull request !312 from Lmeng梦/master, 移除无效文件,添加等待事件空即考验,添加安装端口校验,修改指标bug, !316 实例监控 bugfix Merge pull request !316 from 板栗/master, 移除无效文件,添加等待事件空即考验,添加安装端口校验,修改指标bug, !319 实例监控 bugfix Merge pull request !319 from 板栗/master, 补充遗漏提交, !321 实例监控 bugfix Merge pull request !321 from 板栗/master, bug, 修复实例监控WDRBUG, 修改代码缩进codecheck, !323 实例监控WDR报告BUG修复 Merge pull request !323 from Lmeng梦/master, 告警bug修复, codecheck, !322 业务开发 - 0630bug修复 Merge pull request !322 from RoaneZhou/master, !325 智能运维模块告警通知插件bug修复 Merge pull request !325 from wuyuebin/master, 修改会话监控接口响应结构体, Merge remote-tracking branch 'origin/master', !326 修改会话监控接口响应结构体 Merge pull request !326 from Ponfy_Liu/master, 修复SQL诊断页面显示BUG, !327 修复SQL诊断页面显示样式BUG Merge pull request !327 from Lmeng梦/master, 安装采集器端口检测方法修改，慢sql指标采集修改,操作手册, !328 实例监控 bugfix Merge pull request !328 from 板栗/master, 抛异常问题修复, !329 业务开发-序列DDL预览显示问题 Merge pull request !329 from 吴雨霖/master, 对自定义的appcationRunner启动出现异常进行处理, 对自定义的appcationRunner启动出现异常进行处理, !331 智能运维模块告警通知插件bug修复 Merge pull request !331 from wuyuebin/master, 1.实例监控首页接口性能优化, codeCheck, codeCheck, codeCheck, !332 实例监控首页接口性能优化 Merge pull request !332 from Ponfy_Liu/master, 修复实例监控和智能诊断前端BUG, 修复codeCheck, 警告/代码整理, 慢sql指标修改,TCP指标修改,移除无效文件, !334 修复实例监控和SQL诊断页面显示样式BUG Merge pull request !334 from Lmeng梦/master, !333 实例监控 bugfix Merge pull request !333 from 板栗/master, 智能运维模块logo更新，告警插件操作文档更新及代码优化, !336 块智能运维模块logo更新，告警插件操作文档更新及代码优化 Merge pull request !336 from wuyuebin/master, 优化实例监控代码结构, codeCheck, !337 优化实例监控代码结构 Merge pull request !337 from Ponfy_Liu/master, 建表语句修复, !338 业务开发-创建表DDL预览显示问题 Merge pull request !338 from 吴雨霖/master, 【日志检索】上下文框未被隐藏, !339 智能运维模块日志检索插件bug修复 Merge pull request !339 from wuyuebin/master, 修复列描述问题, !340 业务开发-列描述显示问题 Merge pull request !340 from 吴雨霖/master, TOPSQL，点击SQLID进入到SQL诊断页面，创建诊断任务，SQL不能修改参数。, !341 智能运维模块bug修复 Merge pull request !341 from wuyuebin/master, 删除关闭窗口清掉断点接口, !342 【业务开发】函数/过程0630版本优化 Merge pull request !342 from RoaneZhou/master, WDR报告，未选实例点击快照管理，页数错误，点击页数会报错。, !343 智能运维模块实例监控插件bug修复 Merge pull request !343 from wuyuebin/master, 说明文档添加下载地址, !344 添加下载地址 Merge pull request !344 from 刘桐/master, 优化代码, codecheck, !345 智能运维模块告警通知插件bug修复 Merge pull request !345 from wuyuebin/master, 更改告警接口白名单url, !346 更改告警接口白名单的url Me See merge request: openGaussythcs00001/openGauss-workbench!561 commit cde6ade6638a4fe4d30ca78d9a95532a03b1c2f3 Merge: 6a35b895 02a26561 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Tue Aug 15 15:57:44 2023 +0800 merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 SQL诊断前端代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7235443 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 SQL诊断前端代码 See merge request: openGaussythcs00001/openGauss-workbench!560 commit 02a26561ad37035ae45f7c3165fd0c83d1fad6d2 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue Aug 15 15:43:26 2023 +0800 杨子浩 930 SQL诊断前端代码 commit 6a35b89543302bc70a04299ba71856f528fe9160 Merge: 025c0550 45879157 Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Tue Aug 15 09:22:11 2023 +0800 merge develop-zwr into develop merge "develop-zwr" into "develop" 调整导入表数据为空的情况, 新增编辑视图功能 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7235194 Commit-by: zhouwenruo Merged-by: zhangcheng Description: merge "develop-zwr" into "develop" 调整导入表数据为空的情况, 新增编辑视图功能 See merge request: openGaussythcs00001/openGauss-workbench!559 commit 025c05500e8d6a0cb0ae7b9f6ff173386124eef6 Merge: f6a81d8a f767e482 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Tue Aug 15 09:21:52 2023 +0800 merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" 导入导出表数据 Created-by: zhangcheng Author-id: 7119759 MR-id: 7235105 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "develop-zhangcheng-0930" into "develop" 导入导出表数据 See merge request: openGaussythcs00001/openGauss-workbench!557 commit 45879157e1a114f9a6bb10b7d156b3f05e3b3173 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Tue Aug 15 09:19:29 2023 +0800 新增编辑视图功能 commit b706651ebf45a220cec6b6454f0c2487079092c8 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Tue Aug 15 09:11:14 2023 +0800 调整导入表数据为空的情况 commit f6a81d8a407be8e167378999042d2239bfc5c123 Merge: 42a11af3 afae8839 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Mon Aug 14 17:40:44 2023 +0800 merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 ASP代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7235114 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 ASP代码 See merge request: openGaussythcs00001/openGauss-workbench!558 commit afae8839edcc491b75c5aade9b1d12f97eb8b02c Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Mon Aug 14 17:24:07 2023 +0800 杨子浩 930 ASP代码 commit f767e482d1fee2a32b0ee16c0ab7756527e4f372 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Mon Aug 14 17:23:00 2023 +0800 导入导出表数据 commit 42a11af3c7a2397fd7d91e11debc330b0946e404 Merge: 275ab22c 0c57ee23 Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Mon Aug 14 11:39:31 2023 +0800 merge develop-zwr into develop merge "develop-zwr" into "develop" 调整导出表数据功能 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7234937 Commit-by: zhouwenruo Merged-by: zhangcheng Description: merge "develop-zwr" into "develop" 调整导出表数据功能 See merge request: openGaussythcs00001/openGauss-workbench!556 commit 0c57ee2386585f1be61a20d567af2c179c333350 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Mon Aug 14 11:38:03 2023 +0800 调整导出表数据功能 commit 275ab22c1f46d516313dc30ed82ad8306cd6300f Merge: bf2dd59f 4bd6e86a Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Mon Aug 14 11:21:07 2023 +0800 merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" 告警监控 Created-by: wuyuebin Author-id: 7158405 MR-id: 7234919 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" 告警监控 See merge request: openGaussythcs00001/openGauss-workbench!555 commit 4bd6e86af0c2bdfcaa2ead6d354c02df1eaead08 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Aug 14 10:56:58 2023 +0800 告警监控 commit 3b279aa04b374e58e91615340855468149c233ae Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon Aug 14 10:00:20 2023 +0800 修复exporter重启bug commit bf2dd59f31afff456763a8a8c076d3a6a2448782 Merge: 13d4d8c7 e39d0ba3 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Fri Aug 11 16:51:55 2023 +0800 merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 ASP代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7234692 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 ASP代码 See merge request: openGaussythcs00001/openGauss-workbench!554 commit e39d0ba3518fc79141484596db2183925b191074 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Fri Aug 11 16:38:46 2023 +0800 杨子浩 930 ASP代码 commit 13d4d8c750d3a971fc99936d7059957d327f0c5a Merge: 4e1176a2 722ae71b Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Fri Aug 11 16:38:46 2023 +0800 merge feature-0930-wyl into develop merge "feature-0930-wyl" into "develop" 测试问题修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7234676 Commit-by: wuyulin Merged-by: zhouwenruo Description: merge "feature-0930-wyl" into "develop" 测试问题修复 See merge request: openGaussythcs00001/openGauss-workbench!552 commit 4e1176a292d77ecfbb02fe5a86b745dbcb05efb5 Merge: 2f6344f2 0bb90d81 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Fri Aug 11 16:37:30 2023 +0800 merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" 编辑表提交删除的数据结构 Created-by: zhangcheng Author-id: 7119759 MR-id: 7234678 Commit-by: zhangcheng Merged-by: wuyulin Description: merge "develop-zhangcheng-0930" into "develop" 编辑表提交删除的数据结构 See merge request: openGaussythcs00001/openGauss-workbench!553 commit 0bb90d81f2a115e4f03db9997f04a37d4cc7b809 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Fri Aug 11 16:34:16 2023 +0800 编辑表提交删除的数据结构 commit 2f6344f2d5755e2bf06141c30e57162a488e6795 Merge: 1342afc9 e3f86337 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Fri Aug 11 15:52:43 2023 +0800 merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 ASP部分代码, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-yangzihao-develop-930 Created-by: yangzihao Author-id: 7119754 MR-id: 7234653 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 ASP部分代码, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-yangzihao-develop-930 See merge request: openGaussythcs00001/openGauss-workbench!551 commit e3f863374eb7042288536b2fe08e44f70c9587a3 Merge: 7b9a2adc 1342afc9 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Fri Aug 11 15:46:08 2023 +0800 Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-yangzihao-develop-930 commit 7b9a2adc5aa624debd857da28547fc8245be1593 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Fri Aug 11 15:45:13 2023 +0800 杨子浩 930 ASP部分代码 commit 722ae71be8e2ad3bce308b26f0e4175192143831 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri Aug 11 15:00:50 2023 +0800 测试问题修复 commit f88f22f99ec4b77ea65fb964bcc0b2a109b5670b Merge: 5ff7d258 280f7234 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Aug 11 14:19:37 2023 +0800 Merge remote-tracking branch 'remotes/origin/feature-yangzihao-develop-930' into feature-instance commit 1342afc9995bc33ed8a736e1f5285f029927678c Merge: d51c9c6f 91ea88b5 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Fri Aug 11 11:50:38 2023 +0800 merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" 编辑表数据的type改成operationType Created-by: zhangcheng Author-id: 7119759 MR-id: 7234588 Commit-by: zhangcheng Merged-by: wuyulin Description: merge "develop-zhangcheng-0930" into "develop" 编辑表数据的type改成operationType See merge request: openGaussythcs00001/openGauss-workbench!550 commit 91ea88b53895efb9c8564bb260f7e4c62392916a Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Fri Aug 11 11:49:09 2023 +0800 编辑表数据的type改成operationType commit d51c9c6fba4d6b4b810147b73653e909119891f9 Merge: a14eefe8 b91da294 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Fri Aug 11 11:19:34 2023 +0800 merge develop-zwr into develop merge "develop-zwr" into "develop" 调整package调试功能 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7234572 Commit-by: zhouwenruo Merged-by: wuyulin Description: merge "develop-zwr" into "develop" 调整package调试功能 See merge request: openGaussythcs00001/openGauss-workbench!549 commit b91da294a19c46a0ef0d43b6de9c3c6c0d62875e Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Fri Aug 11 11:17:16 2023 +0800 调整package调试功能 commit a14eefe8728804a066a357554d0495f919c5d2ef Merge: 3dfa919c 991d087b Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Fri Aug 11 11:14:56 2023 +0800 merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" 编辑表分区表数据可编辑 Created-by: zhangcheng Author-id: 7119759 MR-id: 7234537 Commit-by: zhangcheng Merged-by: wuyulin Description: merge "develop-zhangcheng-0930" into "develop" 编辑表分区表数据可编辑 See merge request: openGaussythcs00001/openGauss-workbench!548 commit 5ff7d258ecb3d2b25544a2af7cf512e3f25d5800 Merge: 38d25e69 d8f644fc Author: liupengfei <liupengfei@ncti-gba.cn> Date: Fri Aug 11 10:57:52 2023 +0800 Merge branch 'feature-instance-lpf' into feature-instance commit d8f644fc23557013d8f0bf1c74ad8157c2e18ab2 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Fri Aug 11 10:54:38 2023 +0800 修改asp接口 commit 991d087b9b4d1c0a583c69da0168026763268c40 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Fri Aug 11 10:10:37 2023 +0800 编辑表分区表数据可编辑 commit 38d25e690cda52263216e28c50c20040de4c2f2c Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Aug 11 09:42:05 2023 +0800 exporter改用ssh连接 commit 3dfa919c523aa6bdd8292c8837312f699f01947f Merge: 227e73b8 41e646dc Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Thu Aug 10 18:44:18 2023 +0800 merge feature-0930-wyl into develop merge "feature-0930-wyl" into "develop" 删除用户, 修改请求方式, Merge branch 'feature-0930-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-0930-wyl # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/controller/DatabaseUserController.java Created-by: wuyulin Author-id: 7119753 MR-id: 7234381 Commit-by: wuyulin Merged-by: zhouwenruo Description: merge "feature-0930-wyl" into "develop" 删除用户, 修改请求方式, Merge branch 'feature-0930-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-0930-wyl # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/controller/DatabaseUserController.java See merge request: openGaussythcs00001/openGauss-workbench!547 commit 41e646dc26019d471316307cd30bc85e4b006ee6 Merge: 7ba5482d d2b34444 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Thu Aug 10 18:41:40 2023 +0800 Merge branch 'feature-0930-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-0930-wyl # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/controller/DatabaseUserController.java commit 7ba5482de08e5574e79a1e3d679094ed106f3f40 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Thu Aug 10 18:37:01 2023 +0800 修改请求方式 commit 34a889ab57df00e86b372e841dac49aa2ed628bb Author: wuyulin <wuyulin@ncti-gba.cn> Date: Thu Aug 10 18:25:39 2023 +0800 删除用户 commit 227e73b854483fa192f6277c86e7b6b5993d32db Merge: 6caac354 d2b34444 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Thu Aug 10 18:29:01 2023 +0800 merge feature-0930-wyl into develop merge "feature-0930-wyl" into "develop" 删除用户 Created-by: wuyulin Author-id: 7119753 MR-id: 7234372 Commit-by: wuyulin Merged-by: zhouwenruo Description: merge "feature-0930-wyl" into "develop" 删除用户 See merge request: openGaussythcs00001/openGauss-workbench!545 commit d2b3444499e20f30bf50139703f99c1864bd400c Author: wuyulin <wuyulin@ncti-gba.cn> Date: Thu Aug 10 18:25:39 2023 +0800 删除用户 commit db2fe2ea3b7990495ee01b5d036efe89270ab3e5 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Thu Aug 10 17:59:18 2023 +0800 修改asp接口 commit 5c276aa35aa828c5f6beaafa0d787fce3280e89a Merge: 72e69984 ba01affb Author: liupengfei <liupengfei@ncti-gba.cn> Date: Thu Aug 10 17:47:20 2023 +0800 Merge branch 'feature-instance-lpf' into feature-instance commit ba01affbddebf560a5ae23c5de67898aacf46e7f Author: liupengfei <liupengfei@ncti-gba.cn> Date: Thu Aug 10 17:45:01 2023 +0800 修改asp接口 commit 6caac35495bd6787cdbcb9a636c27959ae615551 Merge: d2b88324 99317d82 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Thu Aug 10 17:35:09 2023 +0800 merge feature-0930-wyl into develop merge "feature-0930-wyl" into "develop" 创建用户 Created-by: wuyulin Author-id: 7119753 MR-id: 7234319 Commit-by: wuyulin Merged-by: zhouwenruo Description: merge "feature-0930-wyl" into "develop" 创建用户 See merge request: openGaussythcs00001/openGauss-workbench!544 commit 99317d8229a5f45a3497a6dca12bb2c04d0c0ed0 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Thu Aug 10 17:34:24 2023 +0800 创建用户 commit d2b88324062f4dd16e6cc9851213be27946949ea Merge: 0c69e69e 1929fb38 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Thu Aug 10 15:44:18 2023 +0800 merge develop-zwr into develop merge "develop-zwr" into "develop" 调整导出DDL文件名称, 调整执行完package关闭窗口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7234228 Commit-by: zhouwenruo Merged-by: wuyulin Description: merge "develop-zwr" into "develop" 调整导出DDL文件名称, 调整执行完package关闭窗口 See merge request: openGaussythcs00001/openGauss-workbench!543 commit 1929fb388d7601d37196edf6e80ab0569a312a7d Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu Aug 10 15:42:44 2023 +0800 调整执行完package关闭窗口 commit d32dae6076f24d4abe533d6d3e6a70387fbb32bb Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu Aug 10 15:17:16 2023 +0800 调整导出DDL文件名称 commit 0c69e69e5c537b2a20bbcc7b05b6919b4ac5e77e Merge: 8f2934d9 97a5a127 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Thu Aug 10 11:41:51 2023 +0800 merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" 新增package功能 Created-by: zhangcheng Author-id: 7119759 MR-id: 7234102 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "develop-zhangcheng-0930" into "develop" 新增package功能 See merge request: openGaussythcs00001/openGauss-workbench!542 commit 97a5a12769edc4d2da107994951b57e0548c4aa7 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Thu Aug 10 11:39:46 2023 +0800 新增package功能 commit 8f2934d98be845382d86dbd75d08b12018e16162 Merge: 5ba0cc9b 280f7234 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Thu Aug 10 09:55:20 2023 +0800 merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 实例监控前端代码, 杨子浩 930 实例监控前端代码, 杨子浩 930 实例监控前端, 杨子浩 930 撤回删除LazyLine, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-yangzihao-develop-930 Created-by: yangzihao Author-id: 7119754 MR-id: 7234006 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 实例监控前端代码, 杨子浩 930 实例监控前端代码, 杨子浩 930 实例监控前端, 杨子浩 930 撤回删除LazyLine, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-yangzihao-develop-930 See merge request: openGaussythcs00001/openGauss-workbench!541 commit 5ba0cc9b401955a38c748318dbbfaafc692bd7f2 Merge: 8c0af4b5 02b93355 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Thu Aug 10 09:28:39 2023 +0800 merge develop-zwr into develop merge "develop-zwr" into "develop" 新增删除package接口, 新增删除package接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7234002 Commit-by: zhouwenruo Merged-by: wuyulin Description: merge "develop-zwr" into "develop" 新增删除package接口, 新增删除package接口 See merge request: openGaussythcs00001/openGauss-workbench!540 commit 280f72340bc20547acd67b21ac6ce0e896379e33 Merge: 3ef0802f 8c0af4b5 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Thu Aug 10 09:25:12 2023 +0800 Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-yangzihao-develop-930 commit 02b9335530ee5bbf406a53847e36401cbfc595c6 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu Aug 10 09:24:50 2023 +0800 新增删除package接口 commit 763643c66b55b3efdb285f9bc807657d506c3a86 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu Aug 10 09:23:26 2023 +0800 新增删除package接口 commit 3ef0802f2114b98d658e28740845ec23d22bdf81 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Thu Aug 10 09:19:00 2023 +0800 杨子浩 930 撤回删除LazyLine commit a1eedb94a60d702d6a2b8c5f6556c85ca8f10d87 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Wed Aug 9 17:43:23 2023 +0800 杨子浩 930 实例监控前端 commit 72e6998492058c9e33f2a9b349abb7eeca6d48e6 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Aug 9 17:11:36 2023 +0800 内存配置更新 commit 8c0af4b58bbd7a69fc7e305cf51400b464dbf6ac Merge: be9747ca eab05600 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Wed Aug 9 16:33:03 2023 +0800 merge feature-0930-wyl into develop merge "feature-0930-wyl" into "develop" 列表 Created-by: wuyulin Author-id: 7119753 MR-id: 7233768 Commit-by: wuyulin Merged-by: zhouwenruo Description: merge "feature-0930-wyl" into "develop" 列表 See merge request: openGaussythcs00001/openGauss-workbench!538 commit eab0560043f17be13ce9ad3f4a1b6d1dca85188b Author: wuyulin <wuyulin@ncti-gba.cn> Date: Wed Aug 9 16:32:12 2023 +0800 列表 commit 1b60b1954d4c361541340d5b62fa2fcd3c554a7a Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Aug 9 16:15:31 2023 +0800 端口号,线程会话/sqlid commit be9747ca367caa89bcb8dc68528370317bba8f2e Merge: 6c417ea4 1a8a851b Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Wed Aug 9 15:18:14 2023 +0800 merge feature-0930-wyl into develop merge "feature-0930-wyl" into "develop" user列表和其他列表优化 Created-by: wuyulin Author-id: 7119753 MR-id: 7233714 Commit-by: wuyulin Merged-by: zhouwenruo Description: merge "feature-0930-wyl" into "develop" user列表和其他列表优化 See merge request: openGaussythcs00001/openGauss-workbench!537 commit 69572d121059e33627dcff78299d7cfc65e18bed Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Aug 9 15:00:47 2023 +0800 内存数据更新 commit 1a8a851b6eb2f5fcb35b803e3aa8e558e1a65629 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Wed Aug 9 15:03:21 2023 +0800 user列表和其他列表优化 commit 0e9cf4732e19af9c24bf70a9c41faeebef515e61 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Aug 9 14:30:05 2023 +0800 更新事件类型sql commit b2f38553d2a1fba9dd08ccf740b8d54759ed19c1 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Wed Aug 9 11:28:54 2023 +0800 杨子浩 930 实例监控前端代码 commit 1a398aaf678fa1fd6d6b366cef39ee6c1fe0d5d2 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Aug 9 11:28:20 2023 +0800 首页等待事件 commit 47b8480e5f0d6ad036490d9cb8ef8a9b665250f7 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Wed Aug 9 11:27:59 2023 +0800 杨子浩 930 实例监控前端代码 commit 94ccf894a812f7d2c36e47cac204fd035903587e Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Aug 9 09:18:48 2023 +0800 添加fullcommand,ssh采集本地指标 commit 6c417ea485e5877bd690c23176ac975645eeac43 Merge: 281c57d6 f2e4732f Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Tue Aug 8 17:16:22 2023 +0800 merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" 修改表数据的提交结构 Created-by: zhangcheng Author-id: 7119759 MR-id: 7233401 Commit-by: zhangcheng Merged-by: wuyulin Description: merge "develop-zhangcheng-0930" into "develop" 修改表数据的提交结构 See merge request: openGaussythcs00001/openGauss-workbench!536 commit f2e4732f70663b8df24285b9132089df3ab46651 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Tue Aug 8 17:12:56 2023 +0800 修改表数据的提交结构 commit 281c57d6c6f1fa97f19c2022808b05456c33a746 Merge: 070b55b5 c15b69f9 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Tue Aug 8 16:34:56 2023 +0800 merge develop-zwr into develop merge "develop-zwr" into "develop" 调整package函数相关 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7233366 Commit-by: zhouwenruo Merged-by: wuyulin Description: merge "develop-zwr" into "develop" 调整package函数相关 See merge request: openGaussythcs00001/openGauss-workbench!535 commit c15b69f9641de49e002f8cfdd5ba6427ff2c4820 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Tue Aug 8 16:32:32 2023 +0800 调整package函数相关 commit 070b55b5d53b3c34a4ccfd04cdabed381410c386 Merge: 01076f4a e80ebdce Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Tue Aug 8 15:14:32 2023 +0800 merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" sql助手url路径删除空格 (cherry picked from commit 313901955b95bf540b3392307a8a49fa1b67248c), 终端sql执行历史、表数据排序筛选、表分析、表分区 Created-by: zhangcheng Author-id: 7119759 MR-id: 7233284 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "develop-zhangcheng-0930" into "develop" sql助手url路径删除空格 (cherry picked from commit 313901955b95bf540b3392307a8a49fa1b67248c), 终端sql执行历史、表数据排序筛选、表分析、表分区 See merge request: openGaussythcs00001/openGauss-workbench!534 commit e80ebdceb1ac1708b5104e94fafc88e51b64a2f8 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Tue Aug 8 15:11:54 2023 +0800 终端sql执行历史、表数据排序筛选、表分析、表分区 commit 01076f4ad3f50a0ef4b2f6fba21ab85186b87cba Merge: ec743239 2b0022de Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Tue Aug 8 15:10:12 2023 +0800 merge feature-0930-wyl into develop merge "feature-0930-wyl" into "develop" 数据修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7233258 Commit-by: wuyulin Merged-by: zhouwenruo Description: merge "feature-0930-wyl" into "develop" 数据修改 See merge request: openGaussythcs00001/openGauss-workbench!533 commit 2b0022de6edae8413e9651e5a2ea053e8d8587f9 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Tue Aug 8 15:02:23 2023 +0800 数据修改 commit ec743239be27671366e6fe2fb84e5df8df13fdcf Merge: 714020cf 5a53d95a Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Tue Aug 8 14:34:00 2023 +0800 merge develop-zwr into develop merge "develop-zwr" into "develop" 新增删除sql记录时判断是否锁定, Merge remote-tracking branch 'origin/develop' into develop-zwr, 新增删除sql记录时判断是否锁定 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7233220 Commit-by: zhouwenruo Merged-by: wuyulin Description: merge "develop-zwr" into "develop" 新增删除sql记录时判断是否锁定, Merge remote-tracking branch 'origin/develop' into develop-zwr, 新增删除sql记录时判断是否锁定 See merge request: openGaussythcs00001/openGauss-workbench!532 commit 5a53d95a38d616aa4fc2fa590917cc7ba9072f2d Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Tue Aug 8 14:32:04 2023 +0800 新增删除sql记录时判断是否锁定 commit 6237c5f2124d5b1fd4ce8bd0eb10f7505bab4fa0 Merge: 28b28262 714020cf Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Tue Aug 8 14:30:03 2023 +0800 Merge remote-tracking branch 'origin/develop' into develop-zwr commit 28b282628249301a8838eff1ddbd3f1bb703a7ef Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Tue Aug 8 14:26:23 2023 +0800 新增删除sql记录时判断是否锁定 commit 2158c89d368fd263a01f58af29c8843eb1101459 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Tue Aug 8 11:23:23 2023 +0800 分离状态接口 commit c70d7d5882a3029a902b689fb9b5996d3f42c8fb Merge: e363d12e b23a095b Author: liupengfei <liupengfei@ncti-gba.cn> Date: Tue Aug 8 10:30:19 2023 +0800 Merge branch 'feature-instance-lpf' into feature-instance commit b23a095bc34631c85e2fb62b6e0cc0e930decf3c Author: liupengfei <liupengfei@ncti-gba.cn> Date: Tue Aug 8 10:28:49 2023 +0800 集群监控添加字段 commit e363d12e137b7b9de1d97d9b92f0646595ec42a0 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Aug 8 09:59:24 2023 +0800 查找snapshot commit 714020cf2ff3cd8bdfa92775f6cb3964378d22b7 Merge: 79a5bc3f 3c7a31c3 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Mon Aug 7 09:30:02 2023 +0800 merge develop-zwr into develop merge "develop-zwr" into "develop" 导入表数据接口修改, Merge remote-tracking branch 'origin/develop-zwr' into develop-zwr, Merge remote-tracking branch 'origin/develop' into develop-zwr, Merge remote-tracking branch 'origin/develop' into develop-zwr, Merge remote-tracking branch 'origin/develop' into develop-zwr, Merge remote-tracking branch 'origin/develop' into develop-zwr, Merge remote-tracking branch 'origin/develop' into develop-zwr, Merge remote-tracking branch 'origin/develop' into develop-zwr, Merge remote-tracking branch 'origin/develop' into develop-zwr, 提取公共方法 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7232665 Commit-by: zhouwenruo Merged-by: wuyulin Description: merge "develop-zwr" into "develop" 导入表数据接口修改, Merge remote-tracking branch 'origin/develop-zwr' into develop-zwr, Merge remote-tracking branch 'origin/develop' into develop-zwr, Merge remote-tracking branch 'origin/develop' into develop-zwr, Merge remote-tracking branch 'origin/develop' into develop-zwr, Merge remote-tracking branch 'origin/develop' into develop-zwr, Merge remote-tracking branch 'origin/develop' into develop-zwr, Merge remote-tracking branch 'origin/develop' into develop-zwr, Merge remote-tracking branch 'origin/develop' into develop-zwr, 提取公共方法 See merge request: openGaussythcs00001/openGauss-workbench!530 commit 3c7a31c3f9ad89efbc09c8aa8c1dbbdb152967bd Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Mon Aug 7 09:26:28 2023 +0800 提取公共方法 commit 79a5bc3f29f6cd97eab2a0eac22eaa0973941e03 Merge: 25613659 5b1f89af Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Fri Aug 4 17:55:14 2023 +0800 merge feature-0930-wyl into develop merge "feature-0930-wyl" into "develop" 分析表, 分区表问题, Merge branch 'feature-0930-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-0930-wyl # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/compatible/opengauss/TableObjectSQLServiceImpl.java Created-by: wuyulin Author-id: 7119753 MR-id: 7232484 Commit-by: wuyulin Merged-by: zhouwenruo Description: merge "feature-0930-wyl" into "develop" 分析表, 分区表问题, Merge branch 'feature-0930-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-0930-wyl # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/compatible/opengauss/TableObjectSQLServiceImpl.java See merge request: openGaussythcs00001/openGauss-workbench!529 commit 5b1f89af676ec933dcf5e371bad2620d3a21c319 Merge: 154ce4b9 fa36a6c2 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri Aug 4 17:53:21 2023 +0800 Merge branch 'feature-0930-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-0930-wyl # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/compatible/opengauss/TableObjectSQLServiceImpl.java commit 154ce4b952225781ea8f7be25dba9fabd6237d35 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri Aug 4 17:50:48 2023 +0800 分区表问题 commit 256136595585f17fe04b88744cfc7f4e51005045 Merge: 43d707e7 fa36a6c2 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Fri Aug 4 17:35:13 2023 +0800 merge feature-0930-wyl into develop merge "feature-0930-wyl" into "develop" 修改问题, 分析表, Merge branch 'feature-0930-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-0930-wyl Created-by: wuyulin Author-id: 7119753 MR-id: 7232475 Commit-by: wuyulin Merged-by: zhouwenruo Description: merge "feature-0930-wyl" into "develop" 修改问题, 分析表, Merge branch 'feature-0930-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-0930-wyl See merge request: openGaussythcs00001/openGauss-workbench!528 commit 7b52b4ff6f84d1f0eb9f9638251ccd0813452370 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri Aug 4 17:32:08 2023 +0800 分析表 commit fa36a6c2caaa67b3ece1e16758a3b6a81f68e0a5 Merge: f7d01f92 64deb748 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri Aug 4 17:32:25 2023 +0800 Merge branch 'feature-0930-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-0930-wyl commit f7d01f9241a189ac2ec206664d4d84f4c3f7e09b Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri Aug 4 17:32:08 2023 +0800 分析表 commit ccc5297f5c53f6b106c19a616d967a99e4cf86d2 Merge: 92ab75a8 43d707e7 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Fri Aug 4 17:26:33 2023 +0800 Merge remote-tracking branch 'origin/develop' into develop-zwr commit 92ab75a8e86aa741569baaaa8e7ccb396903524d Merge: 5501d3e2 853792d7 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Fri Aug 4 15:28:51 2023 +0800 Merge remote-tracking branch 'origin/develop' into develop-zwr commit 43d707e7acd67575af4f68dcae99b1bad98305c2 Merge: 853792d7 64deb748 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Fri Aug 4 15:25:56 2023 +0800 merge feature-0930-wyl into develop merge "feature-0930-wyl" into "develop" 修改问题 Created-by: wuyulin Author-id: 7119753 MR-id: 7232412 Commit-by: wuyulin Merged-by: zhouwenruo Description: merge "feature-0930-wyl" into "develop" 修改问题 See merge request: openGaussythcs00001/openGauss-workbench!527 commit b9efa429eb854bbdd644a4acaf2be7b3edf49886 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri Aug 4 15:24:01 2023 +0800 修改问题 commit 64deb748cf631500e002b31fa7ff8ad4df926185 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri Aug 4 15:24:01 2023 +0800 修改问题 commit 2022e0af170aa9d60e1413a7b932cfe56a7acc12 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Aug 4 14:50:20 2023 +0800 cpu指标 commit 5077f7838a4a82ce658598cf5dd29333d00838a9 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Fri Aug 4 10:25:04 2023 +0800 集群监控bug commit f5855a595c0eb81f0a640710e717bd60ddcfd679 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Aug 4 09:39:38 2023 +0800 topsql排序 commit 6170b02ce7c29267ea88302ac57965746971a567 Merge: 4f20ff3a 635b9c8a Author: liupengfei <liupengfei@ncti-gba.cn> Date: Fri Aug 4 09:19:50 2023 +0800 Merge branch 'feature-instance-lpf' into feature-instance commit 635b9c8a8196bc2cc57504b315315fb4dbed7808 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Fri Aug 4 09:18:37 2023 +0800 集群配置测试 commit 4f20ff3a9b1f5b4f6c9cfeb34200d08d03c482e4 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Aug 4 08:35:06 2023 +0800 实例详情bug修改 commit 853792d74dd3968fbd5274cab18edd468b465860 Merge: 6d971b1f 0a74527b Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Thu Aug 3 17:18:05 2023 +0800 merge feature-0930-wyl into develop merge "feature-0930-wyl" into "develop" 修改值名称, 查询修改, Merge branch 'feature-0930-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-0930-wyl Created-by: wuyulin Author-id: 7119753 MR-id: 7232162 Commit-by: wuyulin Merged-by: zhouwenruo Description: merge "feature-0930-wyl" into "develop" 修改值名称, 查询修改, Merge branch 'feature-0930-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-0930-wyl See merge request: openGaussythcs00001/openGauss-workbench!526 commit 0a74527b99bb2df608bd3cac49919e0ff5a71016 Merge: 0fedacec 5bca2204 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Thu Aug 3 17:16:14 2023 +0800 Merge branch 'feature-0930-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-0930-wyl commit 0fedacecd439bccf0297fd5f8dd75690c329450d Author: wuyulin <wuyulin@ncti-gba.cn> Date: Thu Aug 3 17:16:05 2023 +0800 查询修改 commit d895b4a82e540ff41099e261932f171587ffd236 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Thu Aug 3 16:07:11 2023 +0800 修正sql commit 6d971b1f6b041f3af5d4ed3b8cf96850924f787f Merge: 5c2e1f36 42572575 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Thu Aug 3 15:36:05 2023 +0800 merge feature-instance into develop merge "feature-instance" into "develop" ds注解, @Ds生效, 添加注释, 添加注释, 实时sql详情, 集群运维, topsql waitevent 更改, 实例信息, 防止单主机多采集bug, Asp, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, Merge branch 'feature-instance-lpf' into feature-instance, 添加菜单, Merge branch 'feature-instance-lpf' into feature-instance Created-by: liupengfei Author-id: 7158026 MR-id: 7232039 Commit-by: liupengfei;张昊宇 Merged-by: yangzihao Description: merge "feature-instance" into "develop" ds注解, @Ds生效, 添加注释, 添加注释, 实时sql详情, 集群运维, topsql waitevent 更改, 实例信息, 防止单主机多采集bug, Asp, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, Merge branch 'feature-instance-lpf' into feature-instance, 添加菜单, Merge branch 'feature-instance-lpf' into feature-instance See merge request: openGaussythcs00001/openGauss-workbench!525 commit 42572575a407ba125e008d19eeea47df6143603c Author: liupengfei <liupengfei@ncti-gba.cn> Date: Thu Aug 3 15:31:59 2023 +0800 删除重复语句 commit 62eab80e0843ee5d2d7668be5e569864b93da6df Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Thu Aug 3 15:19:53 2023 +0800 恢复pom提交 commit dc8125e63aeca8fe74b760d408f2be89fd78f1b7 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Thu Aug 3 15:15:10 2023 +0800 首页等待事件，活跃会话数量状态更改 commit 2acb5c3e0b68192a2b713c46303aad0527e6a3b9 Merge: 20bfe417 d270521d Author: liupengfei <liupengfei@ncti-gba.cn> Date: Thu Aug 3 15:13:31 2023 +0800 Merge branch 'feature-instance-lpf' into feature-instance commit d270521d0ccd69f8d0508788631be23056b75e44 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Thu Aug 3 15:11:39 2023 +0800 添加菜单 commit 20bfe4177f1cba4e3b35677c89dbb300fd7baeab Merge: 7f0e7098 05016af7 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Thu Aug 3 14:58:14 2023 +0800 Merge branch 'feature-instance-lpf' into feature-instance commit 7f0e709894e310421b71715a5769421e87aefbff Merge: ec0bcbe0 cab1f869 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Thu Aug 3 14:57:51 2023 +0800 Merge remote-tracking branch 'origin/feature-instance' into feature-instance commit 05016af7d6d9c1ae3275278f346c6b2fb42fda49 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Thu Aug 3 14:50:43 2023 +0800 Asp commit 5501d3e28b44a4d850923749044cd6ed063f9e84 Merge: e3892a6f 5c2e1f36 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu Aug 3 14:09:41 2023 +0800 Merge remote-tracking branch 'origin/develop' into develop-zwr commit e3892a6fa84c7a44c0403e24c93b9360e9b3e014 Merge: cac9a498 f830db9b Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu Aug 3 11:39:11 2023 +0800 Merge remote-tracking branch 'origin/develop' into develop-zwr commit 5c2e1f36e45f07419efa7343025dd3fd697022e6 Merge: f830db9b 5bca2204 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Thu Aug 3 11:38:02 2023 +0800 merge feature-0930-wyl into develop merge "feature-0930-wyl" into "develop" 删除多余代码, 导入表数据接口修改, 修改值名称 Created-by: wuyulin Author-id: 7119753 MR-id: 7231932 Commit-by: wuyulin;zhouwenruo Merged-by: zhouwenruo Description: merge "feature-0930-wyl" into "develop" 删除多余代码, 导入表数据接口修改, 修改值名称 See merge request: openGaussythcs00001/openGauss-workbench!524 commit 9a54d2446f076e0f53542efffe3c2799ac6c8881 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Thu Aug 3 11:32:35 2023 +0800 修改值名称 commit 5bca2204a35f336dd02ac24316e9a90910f765ca Author: wuyulin <wuyulin@ncti-gba.cn> Date: Thu Aug 3 11:32:35 2023 +0800 修改值名称 commit cab1f86990f4afe55b5d72f53b3fb2d302b5d392 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Thu Aug 3 10:30:29 2023 +0800 防止单主机多采集bug commit 88c6cc74e6e406d3c5a8df3506ae17805541ad86 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Thu Aug 3 10:05:13 2023 +0800 实例信息 commit 42ee4b71490fe53bfac67402a206e0a8fdc3b67d Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Fri Jul 28 14:32:57 2023 +0800 导入表数据接口修改 commit 3e2e4987a300d5b7fedc1355b833a48e60a10150 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu Jul 27 16:40:04 2023 +0800 删除多余代码 commit 1bd6b11f5ba9f2dbe552459431be4f7204117de6 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Thu Aug 3 09:00:28 2023 +0800 topsql waitevent 更改 commit 7ba7b00ea658d87a75198a0564139feba8c2a126 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Wed Aug 2 16:28:05 2023 +0800 集群运维 commit f830db9b5d8e138e5ca81ceeb042755b0dbf6d7c Merge: 371e6d04 2cbbc84a Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Wed Aug 2 08:59:09 2023 +0800 merge feature-0930-wyl into develop merge "feature-0930-wyl" into "develop" 数据类型 Created-by: wuyulin Author-id: 7119753 MR-id: 7231467 Commit-by: wuyulin Merged-by: zhouwenruo Description: merge "feature-0930-wyl" into "develop" 数据类型 See merge request: openGaussythcs00001/openGauss-workbench!522 commit 2cbbc84a8109eca55cdbe25ba5deb79a7e47c604 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Wed Aug 2 08:52:28 2023 +0800 数据类型 commit 19cdcb5e2b7f03313473120f78c63fddcde7676e Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Aug 1 17:17:11 2023 +0800 实时sql详情 commit b17504cd7f6333d4ea3100576cb7918862ea8dac Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Aug 1 09:14:56 2023 +0800 添加注释 commit ec0bcbe0576ff358db3922bfcb5076871100e6df Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Aug 1 09:14:56 2023 +0800 添加注释 commit 8a9e56ffe1d4bc1dd2e44e6971163b2989e8f0ae Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon Jul 31 18:10:03 2023 +0800 @Ds生效 commit cbb879d753983580efc3191d1c7e8b4d2d1642dd Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon Jul 31 17:56:07 2023 +0800 ds注解 commit 371e6d0456dbfee7fb52e1472f8c276b9c9efde4 Merge: df48739b da697da8 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Mon Jul 31 14:26:40 2023 +0800 merge feature-0930-wyl into develop merge "feature-0930-wyl" into "develop" bug, 无, bug, !364 业务开发-约束问题 Merge pull request !364 from 吴雨霖/master, 分区, Merge branch 'master' of https://gitee.com/wu-yulin110/openGauss-workbench into gitee-master, 无, Merge branch 'master' of https://gitee.com/wu-yulin110/openGauss-workbench into gitee-master, o'k ok Signed-off-by: 吴雨霖 <wuyulin@ncti-gba.cn>, !368 业务开发-分区问题 Merge pull request !368 from 吴雨霖/master, Merge branch 'master' of https://gitee.com/wu-yulin110/openGauss-workbench into gitee-master, 列默认值, Merge remote-tracking branch 'remotes/gitt/master' into feature-0930-wyl # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/constants/SqlConstants.java Created-by: wuyulin Author-id: 7119753 MR-id: 7230781 Commit-by: wuyulin;opengauss_bot;吴雨霖 Merged-by: zhouwenruo Description: merge "feature-0930-wyl" into "develop" bug, 无, bug, !364 业务开发-约束问题 Merge pull request !364 from 吴雨霖/master, 分区, Merge branch 'master' of https://gitee.com/wu-yulin110/openGauss-workbench into gitee-master, 无, Merge branch 'master' of https://gitee.com/wu-yulin110/openGauss-workbench into gitee-master, o'k ok Signed-off-by: 吴雨霖 <wuyulin@ncti-gba.cn>, !368 业务开发-分区问题 Merge pull request !368 from 吴雨霖/master, Merge branch 'master' of https://gitee.com/wu-yulin110/openGauss-workbench into gitee-master, 列默认值, Merge remote-tracking branch 'remotes/gitt/master' into feature-0930-wyl # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/constants/SqlConstants.java See merge request: openGaussythcs00001/openGauss-workbench!521 commit da697da80a6e26d9f2a1a5d42d56ff921e6ca469 Merge: 945d9ec1 a16b041f Author: wuyulin <wuyulin@ncti-gba.cn> Date: Mon Jul 31 14:24:21 2023 +0800 Merge remote-tracking branch 'remotes/gitt/master' into feature-0930-wyl # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/constants/SqlConstants.java commit cac9a498b3960fbfdb7b15ee87e0afe7be03155d Merge: 738f6b70 df48739b Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Fri Jul 28 15:33:28 2023 +0800 Merge remote-tracking branch 'origin/develop' into develop-zwr commit df48739b36eda7ccdabdfc1de93ee52baa27ceb5 Merge: 791b5248 945d9ec1 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Fri Jul 28 15:32:41 2023 +0800 merge feature-0930-wyl into develop merge "feature-0930-wyl" into "develop" 排序 Created-by: wuyulin Author-id: 7119753 MR-id: 7230451 Commit-by: wuyulin Merged-by: zhouwenruo Description: merge "feature-0930-wyl" into "develop" 排序 See merge request: openGaussythcs00001/openGauss-workbench!520 commit 945d9ec178559d700b54e9cc78f192cd541b9c7c Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri Jul 28 15:31:11 2023 +0800 排序 commit 738f6b70ab35ee59a1b788a523cd4152619193e5 Merge: 9c29e8e0 791b5248 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Fri Jul 28 15:20:56 2023 +0800 Merge remote-tracking branch 'origin/develop' into develop-zwr commit 9c29e8e0081a8d34737f8c778009f2aa87ac23b5 Merge: 0fa18b3f 71afd06c Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Fri Jul 28 15:07:12 2023 +0800 Merge remote-tracking branch 'origin/develop' into develop-zwr commit 791b52485685c26f2308afb40a93feaf700e274f Merge: 71afd06c 14497141 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Fri Jul 28 15:05:05 2023 +0800 merge feature-0930-wyl into develop merge "feature-0930-wyl" into "develop" 加排序 Created-by: wuyulin Author-id: 7119753 MR-id: 7230436 Commit-by: wuyulin Merged-by: zhouwenruo Description: merge "feature-0930-wyl" into "develop" 加排序 See merge request: openGaussythcs00001/openGauss-workbench!519 commit 144971415f25103365b8e1cc693d2bfd3775380a Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri Jul 28 15:03:51 2023 +0800 加排序 commit 0fa18b3f33e1018121a92251719b82baaf239ea7 Merge: 7c49fa01 95a27d22 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Fri Jul 28 14:35:34 2023 +0800 Merge remote-tracking branch 'origin/develop-zwr' into develop-zwr commit 71afd06c17b8084d5f4217cfc84fdd7d99dcd275 Merge: d1a1014d 95a27d22 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Fri Jul 28 14:34:56 2023 +0800 merge develop-zwr into develop merge "develop-zwr" into "develop" 导入表数据接口修改 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7230413 Commit-by: zhouwenruo Merged-by: wuyulin Description: merge "develop-zwr" into "develop" 导入表数据接口修改 See merge request: openGaussythcs00001/openGauss-workbench!518 commit 7c49fa01fef66543c960f48bd55f76891089f1b9 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Fri Jul 28 14:32:57 2023 +0800 导入表数据接口修改 commit 95a27d22899b476cce695e4b6916d0c06dc73d5a Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Fri Jul 28 14:32:57 2023 +0800 导入表数据接口修改 commit d1a1014d6d7f8c50912be83d4cfee2ff7292924d Merge: eca3de5a 2d7b898c Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Fri Jul 28 14:10:02 2023 +0800 merge feature-0930-wyl into develop merge "feature-0930-wyl" into "develop" bug Created-by: wuyulin Author-id: 7119753 MR-id: 7230373 Commit-by: wuyulin Merged-by: zhouwenruo Description: merge "feature-0930-wyl" into "develop" bug See merge request: openGaussythcs00001/openGauss-workbench!517 commit 2d7b898c584547e4419c8a702b0a8dbc19daf34e Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri Jul 28 11:46:52 2023 +0800 bug commit eca3de5a4ef3282a46623cc87da6533857976553 Merge: cf47d7a5 36e9bcf1 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Thu Jul 27 16:41:07 2023 +0800 merge develop-zwr into develop merge "develop-zwr" into "develop" 删除多余代码 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7230195 Commit-by: zhouwenruo Merged-by: wuyulin Description: merge "develop-zwr" into "develop" 删除多余代码 See merge request: openGaussythcs00001/openGauss-workbench!516 commit 36e9bcf1be9468e40b4ceaea3133e5b53248ea59 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu Jul 27 16:40:04 2023 +0800 删除多余代码 commit cf47d7a5b938be2d66c012627a502f56983dd115 Merge: 14970546 496fbc26 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Thu Jul 27 16:36:21 2023 +0800 merge feature-0930-wyl into develop merge "feature-0930-wyl" into "develop" test, test Created-by: wuyulin Author-id: 7119753 MR-id: 7230193 Commit-by: wuyulin Merged-by: zhouwenruo Description: merge "feature-0930-wyl" into "develop" test, test See merge request: openGaussythcs00001/openGauss-workbench!515 commit 149705460b1e6d90f7de15abb2639a6ee11d0216 Merge: 3a4a9b3f 3bd5e72e Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Thu Jul 27 16:35:19 2023 +0800 merge develop-zwr into develop merge "develop-zwr" into "develop" 导入导出表数据, 分析表, 分区, 导入导出表数据, 导入导出表数据 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7230189 Commit-by: zhouwenruo;wuyulin Merged-by: wuyulin Description: merge "develop-zwr" into "develop" 导入导出表数据, 分析表, 分区, 导入导出表数据, 导入导出表数据 See merge request: openGaussythcs00001/openGauss-workbench!514 commit 3bd5e72eeb8b3ed533c56ba9ceb06ebf41eacdee Merge: 4b2edc25 3a4a9b3f Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Thu Jul 27 16:34:07 2023 +0800 导入导出表数据 commit 4b2edc25f3242e73546f387a0112ea569b368a5a Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu Jul 27 16:21:32 2023 +0800 导入导出表数据 commit d7b38288003bcca6b3c0f75644cee0d8bde6baea Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu Jul 27 15:59:36 2023 +0800 导入导出表数据 commit 2e148633c9a62cb487478b0796948212cfb1122b Author: wuyulin <wuyulin@ncti-gba.cn> Date: Thu Jul 27 15:47:17 2023 +0800 分区 commit 08f870843e5886b97da538b717fb91616017c595 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Tue Jul 25 15:47:12 2023 +0800 分析表 commit 496fbc264c231921489a272d7f84a2cb58b0e3d7 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Thu Jul 27 16:09:55 2023 +0800 test commit 514e9325791ecaaefb4ced7eb818f470869f8aac Author: wuyulin <wuyulin@ncti-gba.cn> Date: Thu Jul 27 15:59:46 2023 +0800 test commit 83697d9b80f9c577c5e33a1bad1d9a709cdf5cc2 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu Jul 27 15:59:36 2023 +0800 导入导出表数据 commit 3a4a9b3f2fb35204b3424a42bf7dd99c0bc689c3 Merge: c63ecb9f c2c4f685 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Thu Jul 27 15:58:32 2023 +0800 merge feature-0930-wyl into develop merge "feature-0930-wyl" into "develop" 分析表, 分区 Created-by: wuyulin Author-id: 7119753 MR-id: 7230155 Commit-by: wuyulin Merged-by: zhouwenruo Description: merge "feature-0930-wyl" into "develop" 分析表, 分区 See merge request: openGaussythcs00001/openGauss-workbench!512 commit c2c4f6853e9125c8007c8018e15a0af21b0e6ec8 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Thu Jul 27 15:47:17 2023 +0800 分区 commit c63ecb9fb5d1fb3c31f450b66a308b4847da387e Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Thu Jul 27 14:55:35 2023 +0800 解决冲突 commit 20b071baa404d71c166a99e0b8d7a09d1fcefc01 Merge: 0a567ff2 7a505487 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Thu Jul 27 14:47:44 2023 +0800 Merge branch 'master' into develop # Conflicts: # openGauss-visualtool/visualtool-framework/src/main/java/org/opengauss/admin/framework/config/SecurityConfig.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/compatible/TableObjectSQLService.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/compatible/opengauss/GainObjectSQLServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/compatible/opengauss/SequenceObjectSQLServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/compatible/opengauss/TableColumnSQLServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/compatible/opengauss/ViewObjectSQLServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/constants/SqlConstants.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/controller/DatabaseTableController.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/dao/ResultSetMapDAO.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/model/dto/DatabaseCreUpdColumnDTO.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/debug/AsyncHelper.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/debug/CreateCoverageRateImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/ExportServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/StartSqlImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/util/DebugUtils.java # plugins/data-studio/web-ui/package-lock.json # plugins/data-studio/web-ui/src/i18n/lang/en.ts # plugins/data-studio/web-ui/src/i18n/lang/zh-Cn.ts # plugins/data-studio/web-ui/src/views/home/index.vue # plugins/observability-instance/InstanceExporter/.gitignore # plugins/observability-instance/InstanceExporter/pom.xml # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/Application.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/config/DbConfig.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/controller/Command.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/controller/Config.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/Ametric.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/DBmetric.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/Metric.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/OSmetric.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/opengauss/OpengaussExporter.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/opengauss/Top.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/system/VmStat.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/system/cpu/LoadAvg.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/system/cpu/ProcStat.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/system/disk/DiskStats.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/system/memory/Free.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/system/memory/ProcMeminfo.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/system/network/NetDev.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/system/network/Netstat.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/system/network/SockStat.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/system/network/Socket.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/server/HostMetric.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/util/CmdUtil.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/util/DbUtil.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/util/FileUtil.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/util/StringUtil.java # plugins/observability-instance/InstanceExporter/src/main/resources/application.yml # plugins/observability-instance/InstanceExporter/src/main/resources/logbak-spring.xml # plugins/observability-instance/InstanceExporter/src/main/resources/og_exporter.yml # plugins/observability-instance/README.md # plugins/observability-instance/doc/instance_install_offline.png # plugins/observability-instance/doc/instance_install_offline_upload.png # plugins/observability-instance/doc/instance_install_proxy.png # plugins/observability-instance/doc/instance_install_server_offline.png # plugins/observability-instance/doc/instance_proxy_install_online.png # plugins/observability-instance/doc/instance_uninstall_proxy_form.png # plugins/observability-instance/doc/instance_uninstall_server_form.png # plugins/observability-instance/pom.xml # plugins/observability-instance/src/main/java/com/nctigba/common/web/exception/InstanceException.java # plugins/observability-instance/src/main/java/com/nctigba/common/web/result/AppResult.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/ObservabilityPluginApplication.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/DataSourceConfig.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/MybatisPlusConfig.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/PluginExtensionInfoConfig.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/constants/CommonConstants.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/constants/DatabaseType.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/constants/DriverConstants.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/constants/JdbcConnectConstants.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/constants/MetricsLine.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/constants/MetricsValue.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/constants/MonitoringConstants.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/constants/MonitoringResultType.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/constants/MonitoringType.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/controller/ControllerConfig.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/controller/EnvironmentController.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/controller/IndexController.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/controller/Installer.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/controller/MonitoringController.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/controller/PageController.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/controller/ParamInfoController.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/controller/ResourceCPUController.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/controller/SessionController.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/controller/TopSQLController.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/controller/WdrController.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/dto/param/ParamInfoDTO.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/dto/server/ServerInfoReq.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/dto/session/DetailStatisticDto.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/dto/topsql/TopSQLInfoReq.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/dto/topsql/TopSQLListReq.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/dto/topsql/TopSQLNowReq.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/entity/NctigbaEnv.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/entity/OpsWdrEntity.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/entity/ParamInfo.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/entity/ParamValueInfo.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/entity/ServerInfoEntity.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/factory/MonitoringHandlerFactory.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/factory/SessionHandlerFactory.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/factory/TopSQLHandlerFactory.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/handler/monitoring/MonitoringHandler.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/handler/monitoring/NormalMonitoringHandler.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/handler/session/OpenGaussSessionHandler.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/handler/session/SessionHandler.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/handler/topsql/OpenGaussTopSQLHandler.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/handler/topsql/TopSQLHandler.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/listener/PluginListener.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/mapper/DbConfigMapper.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/mapper/NctigbaEnvMapper.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/mapper/OpsWdrMapper.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/mapper/ParamInfoMapper.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/mapper/ParamValueInfoMapper.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/mapper/ServerInfoMapper.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/mapper/TopSqlMapper.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/model/DictionaryConfig.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/model/ExecutionPlan.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/model/IndexAdvice.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/model/InstanceInfo.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/model/InstanceNodeInfo.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/model/PartitionDataResp.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/model/ResInfo.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/model/WdrGeneratorBody.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/model/WdrSnapshotVO.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/model/monitoring/MonitoringMetric.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/model/monitoring/MonitoringParam.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/model/param/ParamQuery.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/AbstractInstaller.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/ClusterManager.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/ExporterInstallService.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/IServerInfoService.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/MetricsService.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/MonitoringService.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/OpsWdrService.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/ParamInfoService.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/PrometheusService.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/SessionService.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/TopSQLService.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/impl/MonitoringServiceImpl.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/impl/SessionServiceImpl.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/provider/AbstractOpsProvider.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/provider/ClusterOpsProvider.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/provider/ClusterOpsProviderManager.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/provider/EnterpriseOpsProvider.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/provider/LiteOpsProvider.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/provider/MinimaListOpsProvider.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/provider/OpenEulerArch64EnterpriseOpsProvider.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/provider/OpenEulerArch64LiteOpsProvider.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/provider/OpenEulerArch64MinimaListOpsProvider.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/provider/OpenEulerX86EnterpriseOpsProvider.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/provider/OpenEulerX86LiteOpsProvider.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/provider/OpenEulerX86MinimaListOpsProvider.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/util/Download.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/util/HttpUtils.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/util/JschUtil.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/util/Language.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/util/ListUtil.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/util/MessageSourceUtil.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/util/SshSession.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/util/YamlUtil.java # plugins/observability-instance/src/main/resources/application-dev.yml # plugins/observability-instance/src/main/resources/application.yml # plugins/observability-instance/src/main/resources/messages.properties # plugins/observability-instance/src/main/resources/messages_en_US.properties # plugins/observability-instance/src/main/resources/messages_zh_CN.properties # plugins/observability-instance/src/main/resources/schema-all.sql # plugins/observability-instance/src/test/java/com/nctigba/observability/instance/ObservabilityPluginApplicationTests.java # plugins/observability-instance/src/test/java/com/nctigba/observability/instance/controller/SessionControllerTest.java # plugins/observability-instance/src/test/java/com/nctigba/observability/instance/handler/session/OpenGaussSessionHandlerTest.java # plugins/observability-instance/src/test/java/com/nctigba/observability/instance/service/MonitoringServiceTest.java # plugins/observability-instance/src/test/java/com/nctigba/observability/instance/service/TopSQLServiceTest.java # plugins/observability-instance/src/test/java/com/nctigba/observability/instance/service/impl/SessionServiceImplTest.java # plugins/observability-instance/web-ui/.eslintrc.json # plugins/observability-instance/web-ui/.prettierrc.json # plugins/observability-instance/web-ui/src/api/observability.ts # plugins/observability-instance/web-ui/src/components/echarts/IndexLine.vue # plugins/observability-instance/web-ui/src/components/echarts/LazyLine.vue # plugins/observability-instance/web-ui/src/i18n/en.ts # plugins/observability-instance/web-ui/src/i18n/zhCn.ts # plugins/observability-instance/web-ui/src/pages/dashboardV2/Index.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/instanceMonitor/instanceMetrics/Index.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/instanceMonitor/sessionMonitor/Detail.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/instanceMonitor/topSQL/Index.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/performanceLoad/Index.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/resourceMonitor/Index.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/resourceMonitor/memory/Index.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/resourceMonitor/network/Index.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/wdr/Index.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/wdr/buildWdr.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/wdr/snapshotManage.vue # plugins/observability-instance/web-ui/src/pages/sql_detail/sql_diagnose/trackAdd.vue # plugins/observability-instance/web-ui/src/store/monitor.ts # plugins/observability-instance/web-ui/tsconfig.json # plugins/observability-instance/web-ui/yarn.lock # plugins/observability-log-search/src/main/java/com/nctigba/observability/log/config/PluginExtensionInfoConfig.java # plugins/observability-sql-diagnosis/src/main/resources/messages_en_US.properties # plugins/observability-sql-diagnosis/src/main/resources/messages_zh_CN.properties commit 0a567ff2251f6f885bb17fe1b4937297dce7412b Merge: 9963d191 18c6910d Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Wed Jul 26 15:08:43 2023 +0800 merge develop-930-lm into develop merge "develop-930-lm" into "develop" 智能诊断同步社区代码 Created-by: luomeng Author-id: 7119743 MR-id: 7229672 Commit-by: 罗梦 Merged-by: luomeng Description: merge "develop-930-lm" into "develop" 智能诊断同步社区代码 See merge request: openGaussythcs00001/openGauss-workbench!509 commit 18c6910db664efe89bda343317ea2b32f2a16769 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Wed Jul 26 15:04:39 2023 +0800 智能诊断同步社区代码 commit 9963d19150f2272851878a9ed38fcb21c8ae29f4 Merge: 5024581a f2557300 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Wed Jul 26 14:29:44 2023 +0800 merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" 更新代码 Created-by: wuyuebin Author-id: 7158405 MR-id: 7229651 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" 更新代码 See merge request: openGaussythcs00001/openGauss-workbench!508 commit f2557300ae4369f94bf6dc7965c8ee6c26028605 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Jul 26 14:19:44 2023 +0800 更新代码 commit 52e8d5d877a6fe981c617ddbaae2c91bc5a84fcd Author: wuyulin <wuyulin@ncti-gba.cn> Date: Tue Jul 25 15:47:12 2023 +0800 分析表 commit 5024581ae26a2cc4bbd68ac89ddf1f524b2d6df3 Merge: feb0a4a0 4d958f0f Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Tue Jul 25 14:56:02 2023 +0800 merge feature-0930-wyl into develop merge "feature-0930-wyl" into "develop" 视图与表查询，列修改, 表查询加条件，表名校验 Created-by: wuyulin Author-id: 7119753 MR-id: 7229291 Commit-by: wuyulin Merged-by: zhouwenruo Description: merge "feature-0930-wyl" into "develop" 视图与表查询，列修改, 表查询加条件，表名校验 See merge request: openGaussythcs00001/openGauss-workbench!507 commit 4d958f0f41accb70baab326da6c54060419deb32 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Tue Jul 25 14:54:15 2023 +0800 1 commit 3e535223fc9c5ffbc00407b2aa64254eaa2fbcdc Author: wuyulin <wuyulin@ncti-gba.cn> Date: Tue Jul 25 14:35:45 2023 +0800 表查询加条件，表名校验 commit 3cfa203d32c663fff64a21d995d1196aa6051605 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Mon Jul 24 10:50:52 2023 +0800 sql助手url路径删除空格 (cherry picked from commit 313901955b95bf540b3392307a8a49fa1b67248c) commit 6108238352d9febfaef2ebed5a3a40f9339fb6d6 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Mon Jul 24 10:33:20 2023 +0800 视图与表查询，列修改 commit feb0a4a00e994db7e11f1016ea564cb7f075e9ea Merge: 3e850797 5ebdc648 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Fri Jul 21 16:55:50 2023 +0800 merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" 恢复修改变量的代码 (cherry picked from commit 8e401350ffe7f537da9a8d14a3b67f9539028601) Created-by: zhangcheng Author-id: 7119759 MR-id: 7228623 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "develop-zhangcheng-0930" into "develop" 恢复修改变量的代码 (cherry picked from commit 8e401350ffe7f537da9a8d14a3b67f9539028601) See merge request: openGaussythcs00001/openGauss-workbench!506 commit 5ebdc648eee74d20b562dc13099f001cb4a3e9da Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Fri Jul 21 16:54:36 2023 +0800 恢复修改变量的代码 (cherry picked from commit 8e401350ffe7f537da9a8d14a3b67f9539028601) commit 3e8507971a8695c94a5324266901e7db15d84d09 Merge: 04a98bb5 fd412842 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Fri Jul 21 15:44:08 2023 +0800 merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" 迁移0930纯前端功能代码 Created-by: zhangcheng Author-id: 7119759 MR-id: 7228569 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "develop-zhangcheng-0930" into "develop" 迁移0930纯前端功能代码 See merge request: openGaussythcs00001/openGauss-workbench!505 commit fd412842b3814775e5e94e34073e92194624317c Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Fri Jul 21 15:41:32 2023 +0800 迁移0930纯前端功能代码 commit 04a98bb5c175fc66b8c20fb5a344afa2c7e557b4 Merge: 2aaa3025 30ba7e90 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Thu Jul 20 15:43:15 2023 +0800 merge develop-zwr into develop merge "develop-zwr" into "develop" 修改解锁和锁定sql执行记录逻辑, 校验名称是否合规工具类, 校验名称是否合规工具类, 校验名称是否合规工具类 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7228221 Commit-by: zhouwenruo Merged-by: wuyulin Description: merge "develop-zwr" into "develop" 修改解锁和锁定sql执行记录逻辑, 校验名称是否合规工具类, 校验名称是否合规工具类, 校验名称是否合规工具类 See merge request: openGaussythcs00001/openGauss-workbench!503 commit 30ba7e9094b4f99995fd9b8e03d6834610c29169 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu Jul 20 15:41:38 2023 +0800 校验名称是否合规工具类 commit 1f68503872db350ccedcb37cf23091653d54ae5c Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu Jul 20 15:32:38 2023 +0800 校验名称是否合规工具类 commit 65d62c3d96262b068e789e2bfb2bee1e8abd23f7 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu Jul 20 15:31:48 2023 +0800 校验名称是否合规工具类 commit 381c45e59d67e15b79109d18d4ac188854422b79 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu Jul 20 14:54:52 2023 +0800 修改解锁和锁定sql执行记录逻辑 commit 2aaa30254d1f57bad76beecf4a84e4fcf7f3aa8a Merge: 2e3b9d13 bf54bcb6 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Thu Jul 20 11:14:32 2023 +0800 merge develop-zwr into develop merge "develop-zwr" into "develop" 调整SQL执行历史记录功能 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7228119 Commit-by: zhouwenruo Merged-by: wuyulin Description: merge "develop-zwr" into "develop" 调整SQL执行历史记录功能 See merge request: openGaussythcs00001/openGauss-workbench!501 commit bf54bcb66e4309d470150050429f73f39c8b8b8a Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu Jul 20 11:02:16 2023 +0800 调整SQL执行历史记录功能 commit 2e3b9d1355a2442c156ba1bf692034b61ab8d82e Merge: 1ea15627 99d47e06 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Wed Jul 19 11:05:41 2023 +0800 merge develop-zwr into develop merge "develop-zwr" into "develop" SQL执行历史记录功能 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7227729 Commit-by: zhouwenruo Merged-by: wuyulin Description: merge "develop-zwr" into "develop" SQL执行历史记录功能 See merge request: openGaussythcs00001/openGauss-workbench!500 commit 99d47e06e60d7309a499664b1bfa8090a191bebe Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Wed Jul 19 11:04:10 2023 +0800 SQL执行历史记录功能 commit 1ea156270f7291bb585af312c61cc98826c55797 Merge: e0633806 ea402ae5 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Tue Jul 18 11:51:16 2023 +0800 merge develop-zwr into develop merge "develop-zwr" into "develop" SQL执行历史记录管理, CodeCheck修改 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7227240 Commit-by: zhouwenruo Merged-by: wuyulin Description: merge "develop-zwr" into "develop" SQL执行历史记录管理, CodeCheck修改 See merge request: openGaussythcs00001/openGauss-workbench!481 commit ea402ae56313ffdce73024be7139f60db62c1858 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Mon Jul 17 17:36:32 2023 +0800 CodeCheck修改 commit 7a37d3c3d8d7217a954a2d97270b63f911482804 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Mon Jul 17 17:07:03 2023 +0800 SQL执行历史记录管理 commit e063380663ede51600f63c93b92cb11a0af94db6 Merge: c4d95dbf e103b819 Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Mon Jul 17 08:53:48 2023 +0800 merge develop-zwr into develop merge "develop-zwr" into "develop" codecheck和单元测试 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7226961 Commit-by: zhouwenruo Merged-by: wuguobiao Description: merge "develop-zwr" into "develop" codecheck和单元测试 See merge request: openGaussythcs00001/openGauss-workbench!467 commit e103b819902fece5cdee11b9cd1ed5f3a78a7f65 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Mon Jul 17 08:38:35 2023 +0800 codecheck和单元测试 commit c4d95dbf520616687f2af7978ce85f6c83a676af Merge: 57595b71 e2902607 Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Fri Jul 14 14:54:49 2023 +0800 merge dev-bill-14 into develop merge "dev-bill-14" into "develop" gitee社区合并ds Created-by: wuguobiao Author-id: 7157987 MR-id: 7226696 Commit-by: hw73730920/wuguobiao Merged-by: wuguobiao Description: merge "dev-bill-14" into "develop" gitee社区合并ds See merge request: openGaussythcs00001/openGauss-workbench!460 commit e29026073ab04cafabf3de0c4f33ecde94293bbf Author: hw73730920/wuguobiao <4027thg32*Wug126> Date: Fri Jul 14 14:54:05 2023 +0800 gitee社区合并ds commit 57595b7100e1c70b1cb23acc8e4f0559bd031e8d Author: wuyulin <wuyulin@ncti-gba.cn> Date: Wed Jul 5 17:01:12 2023 +0800 冲突 commit eab21a0d05395519f4ce40033c5ba1b17414af72 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Wed Jul 5 16:47:58 2023 +0800 冲突 commit 42822242948f2ad1237cfcae77fb5bc89b0a0c25 Merge: 084f8027 bd8d499d Author: wuyulin <wuyulin@ncti-gba.cn> Date: Wed Jul 5 16:46:17 2023 +0800 Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop commit 084f802748193caf8a1a60257787c8891f3c8d1d Author: wuyulin <wuyulin@ncti-gba.cn> Date: Wed Jul 5 16:45:57 2023 +0800 冲突 commit bd8d499d253fdd5420863e5d3413c00f464178c2 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Wed Jul 5 16:44:55 2023 +0800 修改响应体结构 commit 2692e2c52bd186f8548089c890da8e15c08e07be Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Jul 5 10:39:08 2023 +0800 恢复前端提交 commit d0527673d73a00d85f37e09eb2a093f9e5dab6de Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Jul 5 10:34:15 2023 +0800 添加端口校验,bug修复 commit 8298e4523818282408c8f8de564b25ebd6aa9aed Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Jul 5 10:21:56 2023 +0800 恢复前端提交 commit c5628c95301e61818829919b95164f2cb3d3ab6b Merge: 1122941b f37c05cd Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Jul 5 09:31:37 2023 +0800 Merge branch 'dev-zhy' into develop # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/controller/PageController.java # plugins/observability-instance/src/test/java/com/nctigba/observability/instance/handler/session/OpenGaussSessionHandlerTest.java commit f37c05cd5d9c2e4efee4c98cc1c224dcbcf807d4 Merge: eba8a62f 5ebbbeca Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Jul 5 09:28:39 2023 +0800 Merge branch 'release' into dev-zhy commit 5ebbbecaeebde6617a480f9f779fb9b9a463d4fb Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Jul 5 09:28:14 2023 +0800 codecheck, topsql bug, delete unused file commit eba8a62fa9a1f348e531a348615db49722688a3c Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Jul 5 09:03:53 2023 +0800 install port check topsql waitevent null commit ed223ff2f210ce806ac192bab57af7aedb51a7fb Merge: 2a849fb5 41236dc5 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Tue Jul 4 20:12:51 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 代码检查 Created-by: wuyuebin Author-id: 7158405 MR-id: 7224039 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码检查 See merge request: openGaussythcs00001/openGauss-workbench!393 commit 41236dc54cd23b55d3696a5781287ee5428af7e7 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Jul 4 20:11:51 2023 +0800 代码检查 commit 2a849fb596e6f18d341639969b25a4a3840f0d28 Merge: 53629cb5 ec0502ce Author: 罗梦 <luomeng@ncti-gba.cn> Date: Tue Jul 4 19:44:29 2023 +0800 Merge remote-tracking branch 'origin/release' into release commit 53629cb598c946b254b1aa54a9054d91dfba1c52 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Tue Jul 4 19:43:41 2023 +0800 历史数据诊断-修复缺陷和优化代码逻辑 commit ec0502ce53cada7df1045c8c1644b549d6fd094d Merge: 41f338da e2c22aaf Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Tue Jul 4 19:37:54 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 更改插件logo Created-by: wuyuebin Author-id: 7158405 MR-id: 7224033 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 更改插件logo See merge request: openGaussythcs00001/openGauss-workbench!392 commit e2c22aafef06daade5fdad2885124a7068c29f43 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Jul 4 19:36:52 2023 +0800 更改插件logo commit 41f338da6cb0e84903a042e7b526d4aff3cae5b2 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Tue Jul 4 17:46:29 2023 +0800 历史数据诊断-修复缺陷和优化代码逻辑 commit c94f222f0f681b0f84ae110f018fa105c7770655 Merge: 9256aab5 01a01bfd Author: 罗梦 <luomeng@ncti-gba.cn> Date: Tue Jul 4 17:25:57 2023 +0800 Merge remote-tracking branch 'origin/release' into release commit 01a01bfd90077391f08af16a871d2684ebfbc0cc Merge: 95f7fb14 d95d060b Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Tue Jul 4 17:19:23 2023 +0800 merge feature-yangzihao-instance into release merge "feature-yangzihao-instance" into "release" #708867934 实例监控，会话监控，刷新页面重新进入会话监控，折线图显示异常。 Created-by: yangzihao Author-id: 7119754 MR-id: 7223959 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "release" #708867934 实例监控，会话监控，刷新页面重新进入会话监控，折线图显示异常。 See merge request: openGaussythcs00001/openGauss-workbench!391 commit 95f7fb14a130dbdbceb0d4927694e1206d948d63 Merge: 7f6598c1 36d3175f Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Tue Jul 4 17:18:13 2023 +0800 merge feature-yangzihao-history into release merge "feature-yangzihao-history" into "release" #708867934 实例监控，会话监控，刷新页面重新进入会话监控，折线图显示异常。 Created-by: yangzihao Author-id: 7119754 MR-id: 7223957 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-history" into "release" #708867934 实例监控，会话监控，刷新页面重新进入会话监控，折线图显示异常。 See merge request: openGaussythcs00001/openGauss-workbench!390 commit 36d3175f70d8532ced962ea419b49db29783858c Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue Jul 4 17:17:21 2023 +0800 #708867934 实例监控，会话监控，刷新页面重新进入会话监控，折线图显示异常。 commit d95d060b81f24d32b1690c2e626d20a6c2fdca46 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue Jul 4 17:16:36 2023 +0800 #708867934 实例监控，会话监控，刷新页面重新进入会话监控，折线图显示异常。 commit 7f6598c14ef37fd32691408f2e921a853f4ceca3 Merge: 22502746 62541b20 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Tue Jul 4 17:09:54 2023 +0800 merge feature-yangzihao-instance into release merge "feature-yangzihao-instance" into "release" #708867934 实例监控，会话监控，刷新页面重新进入会话监控，折线图显示异常。 Created-by: yangzihao Author-id: 7119754 MR-id: 7223948 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "release" #708867934 实例监控，会话监控，刷新页面重新进入会话监控，折线图显示异常。 See merge request: openGaussythcs00001/openGauss-workbench!389 commit 62541b20981a9cbd8aee6c31c3a0f3101c90d803 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue Jul 4 17:09:09 2023 +0800 #708867934 实例监控，会话监控，刷新页面重新进入会话监控，折线图显示异常。 commit 22502746f925b5ce844ee66bdea900b554a8a18f Merge: 013ff803 51820332 Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Tue Jul 4 16:48:49 2023 +0800 merge bugfix-zhangcheng-0630-3 into release merge "bugfix-zhangcheng-0630-3" into "release" createTable做关闭保存提示 Created-by: zhangcheng Author-id: 7119759 MR-id: 7223930 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-3" into "release" createTable做关闭保存提示 See merge request: openGaussythcs00001/openGauss-workbench!388 commit 5182033299dadd7d2b6565db637f7ab7227c27d7 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Tue Jul 4 16:47:38 2023 +0800 createTable做关闭保存提示 commit 013ff80323603107863beb4a5984905a06b1696d Merge: 775690b2 a0f6e7c6 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Tue Jul 4 16:35:08 2023 +0800 merge feature-yangzihao-history into release merge "feature-yangzihao-history" into "release" 修复历史数据诊断前端BUG #708867934 实例监控，会话监控，刷新页面重新进入会话监控，折线图显示异常。 #708899860 历史诊断_业务连接数显示为空 Created-by: yangzihao Author-id: 7119754 MR-id: 7223915 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-history" into "release" 修复历史数据诊断前端BUG #708867934 实例监控，会话监控，刷新页面重新进入会话监控，折线图显示异常。 #708899860 历史诊断_业务连接数显示为空 See merge request: openGaussythcs00001/openGauss-workbench!387 commit 775690b2acafb5705db3a1a4acdd03fe75b07760 Merge: 07e95950 a0d35dc2 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Tue Jul 4 16:34:45 2023 +0800 merge feature-yangzihao-instance into release merge "feature-yangzihao-instance" into "release" 修复实例监控前端问题 #708867934 实例监控，会话监控，刷新页面重新进入会话监控，折线图显示异常。 Created-by: yangzihao Author-id: 7119754 MR-id: 7223914 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "release" 修复实例监控前端问题 #708867934 实例监控，会话监控，刷新页面重新进入会话监控，折线图显示异常。 See merge request: openGaussythcs00001/openGauss-workbench!386 commit 07e959500e2770658c27095576831a030c70b099 Merge: b242ba0b c185eebd Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Tue Jul 4 16:33:21 2023 +0800 merge feature-yangzihao-history into release merge "feature-yangzihao-history" into "release" #708867934 实例监控，会话监控，刷新页面重新进入会话监控，折线图显示异常。 Created-by: yangzihao Author-id: 7119754 MR-id: 7223912 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-history" into "release" #708867934 实例监控，会话监控，刷新页面重新进入会话监控，折线图显示异常。 See merge request: openGaussythcs00001/openGauss-workbench!385 commit a0d35dc2e6fe4f0724a9378baaa152ab01d59e57 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue Jul 4 16:32:47 2023 +0800 修复实例监控前端问题 #708867934 实例监控，会话监控，刷新页面重新进入会话监控，折线图显示异常。 commit a0f6e7c6d37c7d2aa29f6cd6f88e31a962731aca Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue Jul 4 16:31:18 2023 +0800 修复历史数据诊断前端BUG #708867934 实例监控，会话监控，刷新页面重新进入会话监控，折线图显示异常。 #708899860 历史诊断_业务连接数显示为空 commit b242ba0b0460e1f905f1e224421e774803c6431f Merge: ef155df3 0202635c Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Tue Jul 4 14:09:02 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7223822 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!384 commit 0202635c08df2aeb80e158168287e594478788a2 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Jul 4 14:07:38 2023 +0800 codecheck commit ef155df3f542045dee1241d96e0aba199cbc8060 Merge: 4742dc56 0ac9eaa0 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Tue Jul 4 13:02:25 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 删除alert-center Created-by: wuyuebin Author-id: 7158405 MR-id: 7223813 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 删除alert-center See merge request: openGaussythcs00001/openGauss-workbench!383 commit 0ac9eaa0b2a0397474a580aace9d06baa0dfb6f7 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Jul 4 13:00:50 2023 +0800 删除alert-center commit 4742dc5628567470ee7a3d2261281ca6d762696d Merge: 664f9a09 879fe1aa Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Tue Jul 4 12:57:25 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 代码路径更换，名称更换 Created-by: wuyuebin Author-id: 7158405 MR-id: 7223812 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码路径更换，名称更换 See merge request: openGaussythcs00001/openGauss-workbench!382 commit 879fe1aa625a7484627edf8cdf0ced89ad72a0ee Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Jul 4 12:52:35 2023 +0800 代码路径更换，名称更换 commit ca9c294fc0c8af29dca377d81b55619e3e362402 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jul 4 10:46:17 2023 +0800 bug修改,多余文件移除 commit 664f9a09dec86c4b0b5ca72d5449ea0b9e580065 Merge: 14f3bd24 7d1d8fff Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Tue Jul 4 10:20:26 2023 +0800 merge feature-yangzihao-instance into release merge "feature-yangzihao-instance" into "release" #708867934 实例监控，会话监控，刷新页面重新进入会话监控，折线图显示异常。 Created-by: yangzihao Author-id: 7119754 MR-id: 7223756 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "release" #708867934 实例监控，会话监控，刷新页面重新进入会话监控，折线图显示异常。 See merge request: openGaussythcs00001/openGauss-workbench!381 commit c185eebdba30834c379c8cd7af681088c21e9404 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue Jul 4 10:19:19 2023 +0800 #708867934 实例监控，会话监控，刷新页面重新进入会话监控，折线图显示异常。 commit 7d1d8ffff0855c9ddbb12e6a0aa73a923df28346 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue Jul 4 10:18:15 2023 +0800 #708867934 实例监控，会话监控，刷新页面重新进入会话监控，折线图显示异常。 commit 9256aab59e5cb301a5488c746f94461736a08f29 Merge: b9fbc06c 14f3bd24 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Tue Jul 4 09:53:58 2023 +0800 Merge remote-tracking branch 'origin/release' into release commit 670ff612c7c766c446897d0cf486c3e8efd63211 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jul 4 08:47:56 2023 +0800 codecheck commit 14f3bd24670a7c2668a4cb903a080387a91775e2 Merge: d8091c22 b31d9543 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Mon Jul 3 18:39:40 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 告警插件添加logo, 代码路径更换，名称更换, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb Created-by: wuyuebin Author-id: 7158405 MR-id: 7223705 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 告警插件添加logo, 代码路径更换，名称更换, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb See merge request: openGaussythcs00001/openGauss-workbench!380 commit b31d95430401f210ccc0ecc5e701ed2322b26f85 Merge: cb9b8bd3 d8091c22 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Jul 3 18:33:52 2023 +0800 Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb commit cb9b8bd3badcac6c27521092e26e21f339299c7a Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Jul 3 18:32:22 2023 +0800 代码路径更换，名称更换 commit d8091c2289a0d417159742a1ed43a49fa93b7e43 Merge: a9238b93 1b5363c0 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Mon Jul 3 17:54:52 2023 +0800 merge feature-yangzihao-instance into release merge "feature-yangzihao-instance" into "release" 优化阻塞会话前端代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7223685 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "release" 优化阻塞会话前端代码 See merge request: openGaussythcs00001/openGauss-workbench!379 commit 1b5363c0f1bd653577a6544ffae61f990d2faa99 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Mon Jul 3 17:54:11 2023 +0800 优化阻塞会话前端代码 commit 96ce08722c6a8cbb63d12c2323fc7c56585a9ebe Merge: df6dd12d 8dfcab30 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon Jul 3 17:50:36 2023 +0800 Merge branch 'codecheck' into dev-zhy # Conflicts: # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/config/NodeConfig.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/controller/Command.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/controller/Config.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/opengauss/OpengaussExporter.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/server/HostMetric.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/util/DbUtil.java # plugins/observability-instance/README.md # plugins/observability-instance/pom.xml # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/handler/session/OpenGaussSessionHandler.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/handler/topsql/OpenGaussTopSQLHandler.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/ExporterInstallService.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/MetricsService.java # plugins/observability-instance/src/test/java/com/nctigba/observability/instance/ObservabilityPluginApplicationTests.java # plugins/observability-instance/src/test/java/com/nctigba/observability/instance/service/MonitoringServiceTest.java # plugins/observability-instance/src/test/java/com/nctigba/observability/instance/service/TopSQLServiceTest.java # plugins/observability-instance/web-ui/src/utils/websocket.ts commit df6dd12d7b2451690e7053b2fceb29a7836d1617 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon Jul 3 17:39:32 2023 +0800 test init commit 1122941be567c76447f9e41965bc521395ce1c40 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Thu Jun 29 16:43:51 2023 +0800 bug commit a9238b930196c28b1d736326c8e13b111ec4cfc7 Merge: d7a9f6c5 8191715b Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Mon Jul 3 17:23:18 2023 +0800 merge feature-yangzihao-instance into release merge "feature-yangzihao-instance" into "release" 优化读取树状结构代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7223668 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "release" 优化读取树状结构代码 See merge request: openGaussythcs00001/openGauss-workbench!378 commit 8191715b4c6f19992d9580a5c13782e5c1993cba Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Mon Jul 3 17:22:04 2023 +0800 优化读取树状结构代码 commit d7a9f6c5a31000293d0d28498b2798afe75908b9 Merge: 6eae6287 d25af633 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Mon Jul 3 17:01:45 2023 +0800 merge feature-yangzihao-instance into release merge "feature-yangzihao-instance" into "release" 修改实例监控BUG Created-by: yangzihao Author-id: 7119754 MR-id: 7223652 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "release" 修改实例监控BUG See merge request: openGaussythcs00001/openGauss-workbench!377 commit 6eae6287fd79d230ed7a95c4bd3448d76cc3f85c Merge: ba2a6e47 bd3f3d95 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Mon Jul 3 17:01:06 2023 +0800 merge feature-yangzihao-history into release merge "feature-yangzihao-history" into "release" 修改历史SQL诊断代码评审问题 修复BUG： #708899769 历史数据诊断，分析报告，点击诊断阈值，点击放大图标，页面放大后会默认显示诊断结果页面内容。 Created-by: yangzihao Author-id: 7119754 MR-id: 7223649 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-history" into "release" 修改历史SQL诊断代码评审问题 修复BUG： #708899769 历史数据诊断，分析报告，点击诊断阈值，点击放大图标，页面放大后会默认显示诊断结果页面内容。 See merge request: openGaussythcs00001/openGauss-workbench!376 commit bd3f3d957733ffa8c3c055cf19d5c1f5b18071d4 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Mon Jul 3 16:56:02 2023 +0800 修改历史SQL诊断代码评审问题 修复BUG： #708899769 历史数据诊断，分析报告，点击诊断阈值，点击放大图标，页面放大后会默认显示诊断结果页面内容。 commit d25af6330d642d16f4ddedc7aebce4c0e9833ca7 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Mon Jul 3 16:55:01 2023 +0800 修改实例监控BUG commit c876f1283527779cd99214915ad5a66304bcf622 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Jul 3 16:32:28 2023 +0800 告警插件添加logo commit b9fbc06c78846a3869679fa143a350efbca7298f Merge: 20586aca ba2a6e47 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Mon Jul 3 15:22:18 2023 +0800 Merge remote-tracking branch 'origin/release' into release commit ba2a6e4767db3349254815595b02fd7a1f1e89da Merge: 2384dcd7 d61f14d6 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Mon Jul 3 14:12:50 2023 +0800 merge feature-yangzihao-instance into release merge "feature-yangzihao-instance" into "release" 修复实例监控前端BUG Created-by: yangzihao Author-id: 7119754 MR-id: 7223532 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "release" 修复实例监控前端BUG See merge request: openGaussythcs00001/openGauss-workbench!375 commit d61f14d6dafb56365f8ff47bbc07a9c375da1842 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Mon Jul 3 12:53:31 2023 +0800 修复实例监控前端BUG commit 2384dcd792ac9d68c59b1b951af8df74f43ef766 Merge: 8c38d46a b02b1d0e Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Mon Jul 3 12:31:09 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 代码优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7223523 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码优化 See merge request: openGaussythcs00001/openGauss-workbench!374 commit b02b1d0e037567bb59ff1ff1bde0cebbe7b652ad Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Jul 3 12:29:30 2023 +0800 代码优化 commit 8c38d46a08bae2f6023a7e091df8a5f2d5d9b493 Merge: 220ec209 d4797f8e Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Mon Jul 3 11:49:24 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 代码优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7223518 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码优化 See merge request: openGaussythcs00001/openGauss-workbench!373 commit d4797f8e0d900ae52d0361d2c8d2cf72d86800f2 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Jul 3 11:48:17 2023 +0800 代码优化 commit 220ec2091750d299591e1f550d3cee74730d3d81 Merge: eed186d4 3cf4510c Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Mon Jul 3 11:21:06 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 修复bug,代码优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7223495 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修复bug,代码优化 See merge request: openGaussythcs00001/openGauss-workbench!372 commit 3cf4510cd5b12c338e8ed5487adf43c3530b2f8a Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Jul 3 11:19:27 2023 +0800 修复bug,代码优化 commit eed186d4560ed52c014d4cd50bfe202255c356ea Merge: d4391872 8c34d1b7 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Sun Jul 2 22:50:42 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 修复bug,代码优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7223414 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修复bug,代码优化 See merge request: openGaussythcs00001/openGauss-workbench!370 commit 8c34d1b7923d9918c0a4c9ea977431ce7b734fcd Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Sun Jul 2 22:34:01 2023 +0800 修复bug,代码优化 commit f28d5df2ae5f8e347006befd7c8a4e89bbd23664 Merge: 1663abe8 97f61eb0 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Fri Jun 30 17:23:09 2023 +0800 Merge branch 'JUnit' into develop commit 97f61eb0f0267f104a5f7524f1cb309ec24b1ab9 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Fri Jun 30 17:22:10 2023 +0800 补充会话监控单元测试 commit 20586aca8dd74a0c106dd70aaa0312e6eaadd8c4 Merge: 2e1c5ec5 d4391872 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Fri Jun 30 14:48:09 2023 +0800 Merge remote-tracking branch 'origin/release' into release commit d439187275695721ec3671bd61958ee10522139a Merge: 0d9d1067 1663abe8 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Fri Jun 30 14:33:14 2023 +0800 Merge branch 'bugfix-lpf' into release commit 1663abe8c1a0fddbe20238ccb6271072bdccac1a Author: liupengfei <liupengfei@ncti-gba.cn> Date: Fri Jun 30 14:29:27 2023 +0800 修复bug，会话详情--等待事件记录不显示 commit 0d9d1067e87627d1c39aa6cf26d66cff9404218c Merge: 8bee2a2a 2fb080c3 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Fri Jun 30 12:40:47 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 调整告警接口 Created-by: wuyuebin Author-id: 7158405 MR-id: 7223202 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 调整告警接口 See merge request: openGaussythcs00001/openGauss-workbench!369 commit 2fb080c3b5b67312216c19ae669b60ef87f8ed2f Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Fri Jun 30 12:39:03 2023 +0800 调整告警接口 commit 8bee2a2a0c6e8ca0ba3b0e997579b18f86c7b089 Merge: f7a7ff38 0c035bd8 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Fri Jun 30 11:32:16 2023 +0800 Merge remote-tracking branch 'origin/release' into release commit 0c035bd8b26244b57bc4fc295ada4f454714af05 Merge: d4923796 0a8ab47b Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Fri Jun 30 11:09:57 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 代码优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7223157 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码优化 See merge request: openGaussythcs00001/openGauss-workbench!368 commit 0a8ab47b4bf98d558068eeec00bd4acca45a4560 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Fri Jun 30 11:08:19 2023 +0800 代码优化 commit f7a7ff38bde3aaa1d710283d8775a19b00bc53db Merge: d4923796 691e726e Author: liupengfei <liupengfei@ncti-gba.cn> Date: Fri Jun 30 10:59:07 2023 +0800 Merge branch 'develop' into release commit d49237967b4374fb4181b7e1f5ff209727c5110c Merge: 336a7798 899d2307 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Fri Jun 30 10:56:22 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 代码优化,调整告警接口 Created-by: wuyuebin Author-id: 7158405 MR-id: 7223148 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码优化,调整告警接口 See merge request: openGaussythcs00001/openGauss-workbench!367 commit 899d2307158ccb80df9c840fa49854e852e172cd Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Fri Jun 30 10:54:07 2023 +0800 代码优化,调整告警接口 commit 336a77981d4bfc00504f8e1f4b9c9d556d67baf9 Merge: 3efdc833 2ff2549e Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Fri Jun 30 10:50:46 2023 +0800 merge feature-yangzihao-instance into release merge "feature-yangzihao-instance" into "release" 修改首页样式, 海量建议界面修改 Created-by: yangzihao Author-id: 7119754 MR-id: 7223145 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "release" 修改首页样式, 海量建议界面修改 See merge request: openGaussythcs00001/openGauss-workbench!366 commit 2ff2549ecf4bb08d970349ca9594a0d511905347 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Fri Jun 30 10:48:58 2023 +0800 海量建议界面修改 commit 3efdc8330cd92246d2987aa12902e579605429a2 Merge: 350e4298 1beaf62c Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Fri Jun 30 08:44:29 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 代码优化，样式调整, 代码优化，样式调整 Created-by: wuyuebin Author-id: 7158405 MR-id: 7223041 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码优化，样式调整, 代码优化，样式调整 See merge request: openGaussythcs00001/openGauss-workbench!365 commit 1beaf62c42b25ce0b89038966dbb921728d938f9 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Fri Jun 30 08:40:56 2023 +0800 代码优化，样式调整 commit b5a4ec9504db56ccfc503aa77a1ea3c2e7e7da64 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Fri Jun 30 08:40:13 2023 +0800 代码优化，样式调整 commit 350e4298a77a7450976855db654871eb61bb0043 Merge: c42c4c7f d1ca9ce3 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Thu Jun 29 19:53:02 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 代码优化, 代码优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7223003 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码优化, 代码优化 See merge request: openGaussythcs00001/openGauss-workbench!364 commit d1ca9ce352a76660b7bc120cc69347b0092a2f2e Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Thu Jun 29 19:50:37 2023 +0800 代码优化 commit f804eda0149e059fbe232dc33cd5008f5b01ae46 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Thu Jun 29 19:49:05 2023 +0800 代码优化 commit 691e726e472b48a05cb207a589fb5281542581d3 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Thu Jun 29 17:07:52 2023 +0800 修复bug commit 832afcd268dcbfad6404d6603b92c2a75fe957d6 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Thu Jun 29 16:44:27 2023 +0800 pom配置单测覆盖率报告 commit 35f65f69dc5f35703f1165c44c737bdc883482cd Author: liupengfei <liupengfei@ncti-gba.cn> Date: Thu Jun 29 16:42:39 2023 +0800 pom配置单测覆盖率报告 commit 19635bca173456cf61dcf78f866915841f2c8957 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Thu Jun 29 16:29:03 2023 +0800 修改首页样式 commit dcf3ce03160dd7bd4e3f99b6fe60698bc1d28e01 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Thu Jun 29 16:13:08 2023 +0800 pom配置单测覆盖率报告 commit 58296b27e03a4173260e2208a03c6ae04ffc0a04 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Thu Jun 29 16:08:43 2023 +0800 实例监控首页，增加返回数据 commit c42c4c7f749ad23cda57b39d937d9e51be672c5f Merge: 18cd0905 3a9fd2b2 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Thu Jun 29 15:17:39 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 代码优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7222810 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码优化 See merge request: openGaussythcs00001/openGauss-workbench!363 commit 3a9fd2b24d9d6fb393c2564adbd58764e4680dca Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Thu Jun 29 15:16:28 2023 +0800 代码优化 commit 18cd0905953de8ccc7157825a3f7021393783e42 Merge: 93f640b6 4b048762 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Thu Jun 29 14:44:16 2023 +0800 Merge branch 'bugfix-sessionWating-lpf' into release commit 4b048762aa0b384d28ed945edb65cebc2d1bc4e9 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Thu Jun 29 14:42:21 2023 +0800 修复会话监控bug commit 93f640b6680589b020e1d71009aebcb75c1f883d Merge: 96bbee4b 953525ec Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Thu Jun 29 12:46:40 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 代码优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7222738 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码优化 See merge request: openGaussythcs00001/openGauss-workbench!362 commit 953525ec9cf5cd944b1ec9c24d623baddbfe50d5 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Thu Jun 29 12:45:29 2023 +0800 代码优化 commit 96bbee4b6ec84f91ca53187f248623e80ca71faf Merge: 4acaa7e3 62d20f20 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Thu Jun 29 12:10:46 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 代码优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7222735 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码优化 See merge request: openGaussythcs00001/openGauss-workbench!361 commit 62d20f2078795a4e2f43e93e640484c6a421e21f Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Thu Jun 29 12:09:03 2023 +0800 代码优化 commit 4acaa7e3a91997207de404abee245118c2dc7ebc Merge: 8f47d3ef 260f5d09 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Wed Jun 28 17:34:21 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 修改样式 Created-by: wuyuebin Author-id: 7158405 MR-id: 7222537 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修改样式 See merge request: openGaussythcs00001/openGauss-workbench!360 commit 260f5d09c1865f28375b9c706495b32ffacd0701 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Jun 28 17:32:30 2023 +0800 修改样式 commit a07dc93523521c833c1a28ea5f8f004996275a0f Merge: 34886beb 8f47d3ef Author: liupengfei <liupengfei@ncti-gba.cn> Date: Wed Jun 28 16:43:02 2023 +0800 Merge branch 'release' into develop commit 8f47d3efe5be495c9ca6df8fb0df2ce541dc1c65 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Wed Jun 28 16:22:34 2023 +0800 修复会话详情--阻塞树bug commit 34886beb0fbffd6c1de517a5f3be4e345221a83c Merge: bfb7d453 da2e9625 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Wed Jun 28 15:08:47 2023 +0800 18 commit b5b29b95844cdc4f04d0cb4bcf3bef9281d801ad Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Jun 28 11:53:36 2023 +0800 添加报错日志 commit bfb7d4536f8c8a0c256dc19eed2c976f47884179 Merge: 7c91d279 53042a13 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Wed Jun 28 11:34:07 2023 +0800 merge release into develop merge "release" into "develop" 添加字段.移除无效文件,改名, Merge branch 'develop' into dev-zhy, Squashed commit of the following: commit ae724aec71fed5b5351ed9f1d05b73be72d5d292 Merge: 84970cb9 78c32bbd Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:47:30 2023 +0800 Merge branch 'develop' into dev-zhy commit 84970cb9a70db7560fac4ac6e402f6279d99e0cf Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:44:39 2023 +0800 添加字段.移除无效文件,改名, Merge branch 'develop' into dev-zhy, 文档更新, 配置, 打包, Merge branch 'release' into dev-zhy, agent获取数据修改, 文档.图片, Merge branch 'develop' into dev-zhy, Merge branch 'develop' into dev-zhy, 采集器连接数据库, 增加小数位,更改topsql逻辑, 增加小数位,更改topsql逻辑, bug修复, 配置, Merge branch 'release' into dev-zhy # Conflicts: # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/controller/Config.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/server/HostMetric.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/util/DbUtil.java, bug修复 Created-by: luomeng Author-id: 7119743 MR-id: 7222296 Commit-by: 张昊宇 Merged-by: luomeng Description: merge "release" into "develop" 添加字段.移除无效文件,改名, Merge branch 'develop' into dev-zhy, Squashed commit of the following: commit ae724aec71fed5b5351ed9f1d05b73be72d5d292 Merge: 84970cb9 78c32bbd Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:47:30 2023 +0800 Merge branch 'develop' into dev-zhy commit 84970cb9a70db7560fac4ac6e402f6279d99e0cf Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:44:39 2023 +0800 添加字段.移除无效文件,改名, Merge branch 'develop' into dev-zhy, 文档更新, 配置, 打包, Merge branch 'release' into dev-zhy, agent获取数据修改, 文档.图片, Merge branch 'develop' into dev-zhy, Merge branch 'develop' into dev-zhy, 采集器连接数据库, 增加小数位,更改topsql逻辑, 增加小数位,更改topsql逻辑, bug修复, 配置, Merge branch 'release' into dev-zhy # Conflicts: # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/controller/Config.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/server/HostMetric.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/util/DbUtil.java, bug修复 See merge request: openGaussythcs00001/openGauss-workbench!357 commit 53042a13679ff6689f4280dc6b07ac296721ffb0 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Jun 28 10:46:52 2023 +0800 bug修复 commit da2e962547eb37bbaeb63990ed17b29f73d3740c Merge: a7789ace 9d3f4564 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Wed Jun 28 10:38:10 2023 +0800 Merge remote-tracking branch 'origin/feature-codecheck' into feature-codecheck commit 9cedc97f44a6144545520cf720527c887a219a75 Merge: bf661eda 3daf6417 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Jun 28 10:37:29 2023 +0800 Merge branch 'release' into dev-zhy # Conflicts: # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/controller/Config.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/server/HostMetric.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/util/DbUtil.java commit a7789ace4070c55e305fce700cc2ba348b9fbee3 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Wed Jun 28 10:37:11 2023 +0800 优化导出接口 commit 3daf6417ae6fd16f9a8288df16b318f14dfe020a Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Jun 28 10:34:13 2023 +0800 配置 commit 1da495625fd7b4c2f71c537ea7b1d48eea2672cc Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Jun 28 10:29:33 2023 +0800 bug修复 commit ee48c8c65399a1e6f6bef8ff03e1856de5ce36fe Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Sun Jun 25 15:22:02 2023 +0800 增加小数位,更改topsql逻辑 commit 7c91d279eb553821ea57f18f3249cefd96446146 Merge: 41251b5d 4be2381a Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Wed Jun 28 10:22:54 2023 +0800 merge release into develop merge "release" into "develop" #708879791 历史数据诊断，诊断结果时间不完整。, merge feature-yangzihao-history into release merge "feature-yangzihao-history" into "release" #708879791 历史数据诊断，诊断结果时间不完整。 Created-by: yangzihao Author-id: 7119754 MR-id: 7221813 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-history" into "release" #708879791 历史数据诊断，诊断结果时间不完整。 See merge request: openGaussythcs00001/openGauss-workbench!345, #708877939 历史数据诊断详情，数据库进程当前使用CPU过高，优化显示样式。, Merge branch 'feature-yangzihao-instance' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-yangzihao-instance, merge feature-yangzihao-instance into release merge "feature-yangzihao-instance" into "release" #708877939 历史数据诊断详情，数据库进程当前使用CPU过高，优化显示样式。, Merge branch 'feature-yangzihao-instance' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-yangzihao-instance Created-by: yangzihao Author-id: 7119754 MR-id: 7221821 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "release" #708877939 历史数据诊断详情，数据库进程当前使用CPU过高，优化显示样式。, Merge branch 'feature-yangzihao-instance' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-yangzihao-instance See merge request: openGaussythcs00001/openGauss-workbench!346, 修复创建同义词的对象名称, merge bugfix-zhangcheng-0630-3 into release merge "bugfix-zhangcheng-0630-3" into "release" 修复创建同义词的对象名称 Created-by: zhangcheng Author-id: 7119759 MR-id: 7221892 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-3" into "release" 修复创建同义词的对象名称 See merge request: openGaussythcs00001/openGauss-workbench!347, 平台过滤路径, 修复创建表中英文, 平台过滤路径, merge bugfix-zhangcheng-0630-3 into release merge "bugfix-zhangcheng-0630-3" into "release" 修复创建表中英文 Created-by: zhangcheng Author-id: 7119759 MR-id: 7221905 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-3" into "release" 修复创建表中英文 See merge request: openGaussythcs00001/openGauss-workbench!348, #708877939 历史数据诊断详情，数据库进程当前使用CPU过高，优化显示样式。, merge feature-yangzihao-history into release merge "feature-yangzihao-history" into "release" #708877939 历史数据诊断详情，数据库进程当前使用CPU过高，优化显示样式。 Created-by: yangzihao Author-id: 7119754 MR-id: 7222043 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-history" into "release" #708877939 历史数据诊断详情，数据库进程当前使用CPU过高，优化显示样式。 See merge request: openGaussythcs00001/openGauss-workbench!350, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 样式调整, merge feature-wyb into release merge "feature-wyb" into "release" 平台过滤路径, 平台过滤路径, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 样式调整 Created-by: wuyuebin Author-id: 7158405 MR-id: 7222084 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 平台过滤路径, 平台过滤路径, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 样式调整 See merge request: openGaussythcs00001/openGauss-workbench!351, 优化导出接口, merge release-zwr into release merge "release-zwr" into "release" 优化导出接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7222192 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 优化导出接口 See merge request: openGaussythcs00001/openGauss-workbench!352, 修改前端IP问题, merge feature-yangzihao-instance into release merge "feature-yangzihao-instance" into "release" 修改前端IP问题 Created-by: yangzihao Author-id: 7119754 MR-id: 7222222 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "release" 修改前端IP问题 See merge request: openGaussythcs00001/openGauss-workbench!353, 优化导出接口, merge release-zwr into release merge "release-zwr" into "release" 优化导出接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7222225 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 优化导出接口 See merge request: openGaussythcs00001/openGauss-workbench!354 Created-by: wuyulin Author-id: 7119753 MR-id: 7222230 Commit-by: zhouwenruo;yangzihao;Zihao Yang;wuyuebin;zhangcheng Merged-by: wuyulin Description: merge "release" into "develop" #708879791 历史数据诊断，诊断结果时间不完整。, merge feature-yangzihao-history into release merge "feature-yangzihao-history" into "release" #708879791 历史数据诊断，诊断结果时间不完整。 Created-by: yangzihao Author-id: 7119754 MR-id: 7221813 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-history" into "release" #708879791 历史数据诊断，诊断结果时间不完整。 See merge request: openGaussythcs00001/openGauss-workbench!345, #708877939 历史数据诊断详情，数据库进程当前使用CPU过高，优化显示样式。, Merge branch 'feature-yangzihao-instance' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-yangzihao-instance, merge feature-yangzihao-instance into release merge "feature-yangzihao-instance" into "release" #708877939 历史数据诊断详情，数据库进程当前使用CPU过高，优化显示样式。, Merge branch 'feature-yangzihao-instance' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-yangzihao-instance Created-by: yangzihao Author-id: 7119754 MR-id: 7221821 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "release" #708877939 历史数据诊断详情，数据库进程当前使用CPU过高，优化显示样式。, Merge branch 'feature-yangzihao-instance' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-yangzihao-instance See merge request: openGaussythcs00001/openGauss-workbench!346, 修复创建同义词的对象名称, merge bugfix-zhangcheng-0630-3 into release merge "bugfix-zhangcheng-0630-3" into "release" 修复创建同义词的对象名称 Created-by: zhangcheng Author-id: 7119759 MR-id: 7221892 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-3" into "release" 修复创建同义词的对象名称 See merge request: openGaussythcs00001/openGauss-workbench!347, 平台过滤路径, 修复创建表中英文, 平台过滤路径, merge bugfix-zhangcheng-0630-3 into release merge "bugfix-zhangcheng-0630-3" into "release" 修复创建表中英文 Created-by: zhangcheng Author-id: 7119759 MR-id: 7221905 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-3" into "release" 修复创建表中英文 See merge request: openGaussythcs00001/openGauss-workbench!348, #708877939 历史数据诊断详情，数据库进程当前使用CPU过高，优化显示样式。, merge feature-yangzihao-history into release merge "feature-yangzihao-history" into "release" #708877939 历史数据诊断详情，数据库进程当前使用CPU过高，优化显示样式。 Created-by: yangzihao Author-id: 7119754 MR-id: 7222043 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-history" into "release" #708877939 历史数据诊断详情，数据库进程当前使用CPU过高，优化显示样式。 See merge request: openGaussythcs00001/openGauss-workbench!350, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 样式调整, merge feature-wyb into release merge "feature-wyb" into "release" 平台过滤路径, 平台过滤路径, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 样式调整 Created-by: wuyuebin Author-id: 7158405 MR-id: 7222084 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 平台过滤路径, 平台过滤路径, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 样式调整 See merge request: openGaussythcs00001/openGauss-workbench!351, 优化导出接口, merge release-zwr into release merge "release-zwr" into "release" 优化导出接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7222192 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 优化导出接口 See merge request: openGaussythcs00001/openGauss-workbench!352, 修改前端IP问题, merge feature-yangzihao-instance into release merge "feature-yangzihao-instance" into "release" 修改前端IP问题 Created-by: yangzihao Author-id: 7119754 MR-id: 7222222 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "release" 修改前端IP问题 See merge request: openGaussythcs00001/openGauss-workbench!353, 优化导出接口, merge release-zwr into release merge "release-zwr" into "release" 优化导出接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7222225 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 优化导出接口 See merge request: openGaussythcs00001/openGauss-workbench!354 See merge request: openGaussythcs00001/openGauss-workbench!355 commit 9d3f45645f2620a7d078e6dca982c220148d3e5f Author: wuyulin <wuyulin@ncti-gba.cn> Date: Wed Jun 28 10:21:01 2023 +0800 bug同步 commit 41251b5d5fbab72e260c6e073f7549f30d2e9513 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Wed Jun 28 10:14:31 2023 +0800 优化导出接口 cherry-pick merge request: 优化导出接口 69ed7c7c48d9cfb71932b06e3a7422a6d1fe1fcb This cherry-pick merge request !354 commit 4be2381ac007a12b304475ccb8893e4d0fa44433 Merge: be3965dc 69ed7c7c Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Wed Jun 28 10:14:31 2023 +0800 merge release-zwr into release merge "release-zwr" into "release" 优化导出接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7222225 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 优化导出接口 See merge request: openGaussythcs00001/openGauss-workbench!354 commit 69ed7c7c48d9cfb71932b06e3a7422a6d1fe1fcb Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Wed Jun 28 10:13:38 2023 +0800 优化导出接口 commit 2e1c5ec51f73dc3ea0529f3c9ca53d6080e65f17 Merge: 6f45ae69 be3965dc Author: 罗梦 <luomeng@ncti-gba.cn> Date: Wed Jun 28 10:11:31 2023 +0800 Merge remote-tracking branch 'origin/release' into release commit be3965dcca00dfcf544d02103c7ba9e83b29d374 Merge: c85e7060 665a71a9 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Wed Jun 28 10:10:16 2023 +0800 merge feature-yangzihao-instance into release merge "feature-yangzihao-instance" into "release" 修改前端IP问题 Created-by: yangzihao Author-id: 7119754 MR-id: 7222222 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "release" 修改前端IP问题 See merge request: openGaussythcs00001/openGauss-workbench!353 commit 665a71a9a3ef179fa96f18311e7018e37232132b Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Wed Jun 28 10:08:37 2023 +0800 修改前端IP问题 commit 34f796f10306e829812eb02e24e47ef53f171324 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Wed Jun 28 10:07:56 2023 +0800 会话详情单元测试 commit 6f45ae69b811745aad7984b90c62d95cdaa83d41 Merge: 1888aba6 c85e7060 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Wed Jun 28 10:00:44 2023 +0800 Merge remote-tracking branch 'origin/release' into release commit a99ddcf0069b65ff33be35149e46e994919aad9b Merge: a5465159 87929935 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Wed Jun 28 10:00:18 2023 +0800 Merge branch 'JUnit' into develop commit 879299357758851b79326a4b2666461b6ac40f36 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Wed Jun 28 09:54:50 2023 +0800 会话详情单元测试 commit a546515927ca76c4156fc138e8a399355deeff0e Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Wed Jun 28 09:23:24 2023 +0800 优化导出接口 cherry-pick merge request: 优化导出接口 0078b406511874a9d7e058761a7ca9af8ac60c9f This cherry-pick merge request !352 commit c85e706092c7ed57e02eef564e8fc681acb2b15b Merge: 42480778 0078b406 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Wed Jun 28 09:23:24 2023 +0800 merge release-zwr into release merge "release-zwr" into "release" 优化导出接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7222192 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 优化导出接口 See merge request: openGaussythcs00001/openGauss-workbench!352 commit 0078b406511874a9d7e058761a7ca9af8ac60c9f Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Wed Jun 28 09:22:26 2023 +0800 优化导出接口 commit 4248077805cd762fdbe6ded3001ea796d150021f Merge: d638e5da b2870bd0 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Tue Jun 27 18:49:27 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 平台过滤路径, 平台过滤路径, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 样式调整 Created-by: wuyuebin Author-id: 7158405 MR-id: 7222084 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 平台过滤路径, 平台过滤路径, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 样式调整 See merge request: openGaussythcs00001/openGauss-workbench!351 commit b2870bd0d441d512e898aa2f9d453b9c0e1d11f4 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Jun 27 18:46:42 2023 +0800 样式调整 commit 976d709bc2a0c5c34781cb499e21b68aceb1d210 Merge: edbe9dee d638e5da Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Jun 27 18:43:17 2023 +0800 Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb commit 1888aba6c9854515db6ce729d5b92cdaec57c8ea Merge: 339161ab d638e5da Author: 罗梦 <luomeng@ncti-gba.cn> Date: Tue Jun 27 18:40:02 2023 +0800 Merge remote-tracking branch 'origin/release' into release # Conflicts: # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/constants/historyDiagnosis/OptionCommon.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/model/history/point/CurrentCpuDTO.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/model/history/point/CurrentCpuUsageDTO.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/history/point/AvgCpuUsageRate.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/history/point/HistoryWaitEvent.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/history/point/WdrAnalysis.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/collection/agent/CurrentCpuUsageItem.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/collection/agent/DbProcessCurrentCpuItem.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/collection/agent/OtherProcessCurrentCpuItem.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/collection/agent/TopDbProcessItem.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/AspAnalysis.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/CurrentCpuUsage.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/CurrentSlowSql.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/CurrentWaitEvent.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/DatabaseHostLowPressure.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/DatabaseHostPressure.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/DbProcessAvgCpuUsage.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/DbProcessCurrentCpuUsage.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/DeadlockAnalysis.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/HistorySlowSql.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/LockAnalysis.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/LockTimeout.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/OtherProcessAvgCpuUsage.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/OtherProcessCurrentCpuUsage.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/TopDbProcess.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/util/AgentUtil.java # plugins/observability-sql-diagnosis/src/main/resources/messages.properties # plugins/observability-sql-diagnosis/src/main/resources/messages_zh_CN.properties commit d638e5daca9d7e487d193462b011611c6d0967cd Merge: d1e38da1 d5d60bce Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Tue Jun 27 17:59:14 2023 +0800 merge feature-yangzihao-history into release merge "feature-yangzihao-history" into "release" #708877939 历史数据诊断详情，数据库进程当前使用CPU过高，优化显示样式。 Created-by: yangzihao Author-id: 7119754 MR-id: 7222043 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-history" into "release" #708877939 历史数据诊断详情，数据库进程当前使用CPU过高，优化显示样式。 See merge request: openGaussythcs00001/openGauss-workbench!350 commit d5d60bce2418e67815afac3619b8040414174cdc Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue Jun 27 17:58:06 2023 +0800 #708877939 历史数据诊断详情，数据库进程当前使用CPU过高，优化显示样式。 commit bd7d972b8326f1db6c42c254dd85e8fce0830eff Merge: 329c8aa9 526d5e4d Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Tue Jun 27 15:42:44 2023 +0800 merge bugfix-zhangcheng-0630-2 into feature-codecheck merge "bugfix-zhangcheng-0630-2" into "feature-codecheck" 代码审查 Created-by: zhangcheng Author-id: 7119759 MR-id: 7221911 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "feature-codecheck" 代码审查 See merge request: openGaussythcs00001/openGauss-workbench!349 commit d1e38da1340701a588c176523fef6f2f0417912b Merge: 886a2eda 23ee8c0a Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Tue Jun 27 15:42:01 2023 +0800 merge bugfix-zhangcheng-0630-3 into release merge "bugfix-zhangcheng-0630-3" into "release" 修复创建表中英文 Created-by: zhangcheng Author-id: 7119759 MR-id: 7221905 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-3" into "release" 修复创建表中英文 See merge request: openGaussythcs00001/openGauss-workbench!348 commit edbe9dee8361298f910ccd3cc5370f69e2739b54 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Jun 27 15:37:24 2023 +0800 平台过滤路径 commit 23ee8c0ad986ae0ac48c872f1a74f676f798b464 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Tue Jun 27 15:34:52 2023 +0800 修复创建表中英文 commit bd4141320f63e29ba8a0b1e0aeac3c73dcac74e0 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Jun 27 15:32:18 2023 +0800 平台过滤路径 commit 526d5e4d12c778070f20aed932c90b760e4ffbeb Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Tue Jun 27 15:29:13 2023 +0800 代码审查 commit 886a2eda08810da22e9aaae57321555f67dbf6f7 Merge: 865cbbdf 8a7106af Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Tue Jun 27 15:14:59 2023 +0800 merge bugfix-zhangcheng-0630-3 into release merge "bugfix-zhangcheng-0630-3" into "release" 修复创建同义词的对象名称 Created-by: zhangcheng Author-id: 7119759 MR-id: 7221892 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-3" into "release" 修复创建同义词的对象名称 See merge request: openGaussythcs00001/openGauss-workbench!347 commit 8a7106afa9683867bb88d442350fd3476bb6eca1 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Tue Jun 27 15:14:11 2023 +0800 修复创建同义词的对象名称 commit 865cbbdf111369fa59978f19cc0247629e229915 Merge: 0283f180 ce6522d9 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Tue Jun 27 12:05:17 2023 +0800 merge feature-yangzihao-instance into release merge "feature-yangzihao-instance" into "release" #708877939 历史数据诊断详情，数据库进程当前使用CPU过高，优化显示样式。, Merge branch 'feature-yangzihao-instance' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-yangzihao-instance Created-by: yangzihao Author-id: 7119754 MR-id: 7221821 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "release" #708877939 历史数据诊断详情，数据库进程当前使用CPU过高，优化显示样式。, Merge branch 'feature-yangzihao-instance' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-yangzihao-instance See merge request: openGaussythcs00001/openGauss-workbench!346 commit ce6522d96f05efe88685c7a68ebb9b852f17d005 Merge: 36910afd 71ea052e Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue Jun 27 12:02:42 2023 +0800 Merge branch 'feature-yangzihao-instance' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-yangzihao-instance commit 36910afdd97613ae2090751e887ef0439bb08d8b Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue Jun 27 12:00:58 2023 +0800 #708877939 历史数据诊断详情，数据库进程当前使用CPU过高，优化显示样式。 commit 0283f180c940e86ac48d83064d528c835ab23fcd Merge: b8e200cb c8e96c31 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Tue Jun 27 11:43:38 2023 +0800 merge feature-yangzihao-history into release merge "feature-yangzihao-history" into "release" #708879791 历史数据诊断，诊断结果时间不完整。 Created-by: yangzihao Author-id: 7119754 MR-id: 7221813 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-history" into "release" #708879791 历史数据诊断，诊断结果时间不完整。 See merge request: openGaussythcs00001/openGauss-workbench!345 commit c8e96c31b6d02bb4b67fec9fc3ddb58aa6a94023 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue Jun 27 11:42:17 2023 +0800 #708879791 历史数据诊断，诊断结果时间不完整。 commit 823a4624aa0c4d1fa5d89de7ce17ff4a970d483b Merge: 5805bca3 b8e200cb Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Tue Jun 27 10:54:46 2023 +0800 merge release into develop merge "release" into "develop" codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7221190 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!336, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7221248 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!337, 连接信息ip限制，删除连接增加提示, merge bugfix-zhangcheng-0630-3 into release merge "bugfix-zhangcheng-0630-3" into "release" 连接信息ip限制，删除连接增加提示 Created-by: zhangcheng Author-id: 7119759 MR-id: 7221433 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-3" into "release" 连接信息ip限制，删除连接增加提示 See merge request: openGaussythcs00001/openGauss-workbench!338, 更新文档, Merge branch 'bugfix-zhangcheng-0630-3' into release, merge develop into release merge "develop" into "release" merge release into develop merge "release" into "develop" 连接信息名字限制长度, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 连接信息名字限制长度 Created-by: zhangcheng Author-id: 7119759 MR-id: 7219748 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 连接信息名字限制长度 See merge request: openGaussythcs00001/openGauss-workbench!300, 更新ds的readme和预览图, 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge feature-wyb into release merge "feature-wyb" into "release" 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb Created-by: wuyuebin Author-id: 7158405 MR-id: 7219754 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb See merge request: openGaussythcs00001/openGauss-workbench!301, 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, 调整创建模式未更新描述, merge release-zwr into release merge "release-zwr" into "release" 调整创建模式未更新描述 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7219868 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 调整创建模式未更新描述 See merge request: openGaussythcs00001/openGauss-workbench!302, 修复导出文件bug、删除多余代码, merge release-zwr into release merge "release-zwr" into "release" 修复导出文件bug、删除多余代码 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7219925 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 修复导出文件bug、删除多余代码 See merge request: openGaussythcs00001/openGauss-workbench!303, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。, merge feature-wyb into release merge "feature-wyb" into "release" 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。 Created-by: wuyuebin Author-id: 7158405 MR-id: 7219983 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。 See merge request: openGaussythcs00001/openGauss-workbench!304, checkcode, merge feature-wyb into release merge "feature-wyb" into "release" checkcode Created-by: wuyuebin Author-id: 7158405 MR-id: 7220196 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" checkcode See merge request: openGaussythcs00001/openGauss-workbench!306, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220240 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!307, 更新操作手册, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220293 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!308, 修复连接信息重置的问题, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 修复连接信息重置的问题 Created-by: zhangcheng Author-i Created-by: wuyulin Author-id: 7119753 MR-id: 7221794 Commit-by: wuyulin;zhouwenruo;luomeng;zhangcheng;wuyuebin Merged-by: wuyulin Description: merge "release" into "develop" codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7221190 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!336, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7221248 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!337, 连接信息ip限制，删除连接增加提示, merge bugfix-zhangcheng-0630-3 into release merge "bugfix-zhangcheng-0630-3" into "release" 连接信息ip限制，删除连接增加提示 Created-by: zhangcheng Author-id: 7119759 MR-id: 7221433 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-3" into "release" 连接信息ip限制，删除连接增加提示 See merge request: openGaussythcs00001/openGauss-workbench!338, 更新文档, Merge branch 'bugfix-zhangcheng-0630-3' into release, merge develop into release merge "develop" into "release" merge release into develop merge "release" into "develop" 连接信息名字限制长度, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 连接信息名字限制长度 Created-by: zhangcheng Author-id: 7119759 MR-id: 7219748 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 连接信息名字限制长度 See merge request: openGaussythcs00001/openGauss-workbench!300, 更新ds的readme和预览图, 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge feature-wyb into release merge "feature-wyb" into "release" 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb Created-by: wuyuebin Author-id: 7158405 MR-id: 7219754 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb See merge request: openGaussythcs00001/openGauss-workbench!301, 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, 调整创建模式未更新描述, merge release-zwr into release merge "release-zwr" into "release" 调整创建模式未更新描述 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7219868 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 调整创建模式未更新描述 See merge request: openGaussythcs00001/openGauss-workbench!302, 修复导出文件bug、删除多余代码, merge release-zwr into release merge "release-zwr" into "release" 修复导出文件bug、删除多余代码 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7219925 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 修复导出文件bug、删除多余代码 See merge request: openGaussythcs00001/openGauss-workbench!303, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。, merge feature-wyb into release merge "feature-wyb" into "release" 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。 Created-by: wuyuebin Author-id: 7158405 MR-id: 7219983 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。 See merge request: openGaussythcs00001/openGauss-workbench!304, checkcode, merge feature-wyb into release merge "feature-wyb" into "release" checkcode Created-by: wuyuebin Author-id: 7158405 MR-id: 7220196 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" checkcode See merge request: openGaussythcs00001/openGauss-workbench!306, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220240 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!307, 更新操作手册, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220293 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!308, 修复连接信息重置的问题, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 修复连接信息重置的问题 Created-by: zhangcheng Author-i See merge request: openGaussythcs00001/openGauss-workbench!344 commit b8e200cbb49d52f01eac6410835ecdabf6578dad Merge: d8713db2 5c638fb1 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Tue Jun 27 10:54:19 2023 +0800 merge release-wyl into release merge "release-wyl" into "release" bug, bug Created-by: wuyulin Author-id: 7119753 MR-id: 7221791 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" bug, bug See merge request: openGaussythcs00001/openGauss-workbench!343 commit 34acc9d740b3e28caaf729ab098b3af0321605a1 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Tue Jun 27 10:31:52 2023 +0800 maven配置单元测试及覆盖率 commit 5c638fb15ae07617df58a3346a7fb00ff59d361c Author: wuyulin <wuyulin@ncti-gba.cn> Date: Tue Jun 27 10:07:21 2023 +0800 bug commit 4bf2ed1082486f86de314fe8348bd3fcb7af224f Author: wuyulin <wuyulin@ncti-gba.cn> Date: Tue Jun 27 10:00:02 2023 +0800 bug commit 5805bca30de6925daa1f00aa1027c22fc02f7c04 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Tue Jun 27 09:42:17 2023 +0800 修改导出模式DDL没有分号问题 cherry-pick merge request: 修改导出模式DDL没有分号问题 654ee33c712f68d02a380071881bc7ab1d73b68d This cherry-pick merge request !342 commit d8713db243f7fe7df41b988f8607fe6f06626d1b Merge: a484233e 654ee33c Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Tue Jun 27 09:42:17 2023 +0800 merge release-zwr into release merge "release-zwr" into "release" 修改导出模式DDL没有分号问题 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7221739 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 修改导出模式DDL没有分号问题 See merge request: openGaussythcs00001/openGauss-workbench!342 commit 654ee33c712f68d02a380071881bc7ab1d73b68d Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Tue Jun 27 09:41:07 2023 +0800 修改导出模式DDL没有分号问题 commit 329c8aa9bc31a553441726b6152dce3216407922 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Mon Jun 26 16:49:30 2023 +0800 codecheck修改 commit a484233e2dd4079ce5d3b7820bc90560790f2367 Merge: 5555cfb1 960ffe02 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Mon Jun 26 14:58:14 2023 +0800 merge develop into release merge "develop" into "release" merge release into develop merge "release" into "develop" 连接信息名字限制长度, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 连接信息名字限制长度 Created-by: zhangcheng Author-id: 7119759 MR-id: 7219748 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 连接信息名字限制长度 See merge request: openGaussythcs00001/openGauss-workbench!300, 更新ds的readme和预览图, 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge feature-wyb into release merge "feature-wyb" into "release" 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb Created-by: wuyuebin Author-id: 7158405 MR-id: 7219754 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb See merge request: openGaussythcs00001/openGauss-workbench!301, 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, 调整创建模式未更新描述, merge release-zwr into release merge "release-zwr" into "release" 调整创建模式未更新描述 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7219868 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 调整创建模式未更新描述 See merge request: openGaussythcs00001/openGauss-workbench!302, 修复导出文件bug、删除多余代码, merge release-zwr into release merge "release-zwr" into "release" 修复导出文件bug、删除多余代码 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7219925 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 修复导出文件bug、删除多余代码 See merge request: openGaussythcs00001/openGauss-workbench!303, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。, merge feature-wyb into release merge "feature-wyb" into "release" 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。 Created-by: wuyuebin Author-id: 7158405 MR-id: 7219983 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。 See merge request: openGaussythcs00001/openGauss-workbench!304, checkcode, merge feature-wyb into release merge "feature-wyb" into "release" checkcode Created-by: wuyuebin Author-id: 7158405 MR-id: 7220196 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" checkcode See merge request: openGaussythcs00001/openGauss-workbench!306, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220240 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!307, 更新操作手册, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220293 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!308, 修复连接信息重置的问题, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 修复连接信息重置的问题 Created-by: zhangcheng Author-id: 7119759 MR-id: 7220370 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 修复连接信息重置的问题 See merge request: openGaussythcs00001/openGauss-workbench!309, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220375 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!310, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220425 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!311, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220435 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openG Created-by: luomeng Author-id: 7119743 MR-id: 7221500 Commit-by: luomeng;罗梦 Merged-by: luomeng Description: merge "develop" into "release" merge release into develop merge "release" into "develop" 连接信息名字限制长度, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 连接信息名字限制长度 Created-by: zhangcheng Author-id: 7119759 MR-id: 7219748 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 连接信息名字限制长度 See merge request: openGaussythcs00001/openGauss-workbench!300, 更新ds的readme和预览图, 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge feature-wyb into release merge "feature-wyb" into "release" 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb Created-by: wuyuebin Author-id: 7158405 MR-id: 7219754 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb See merge request: openGaussythcs00001/openGauss-workbench!301, 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, 调整创建模式未更新描述, merge release-zwr into release merge "release-zwr" into "release" 调整创建模式未更新描述 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7219868 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 调整创建模式未更新描述 See merge request: openGaussythcs00001/openGauss-workbench!302, 修复导出文件bug、删除多余代码, merge release-zwr into release merge "release-zwr" into "release" 修复导出文件bug、删除多余代码 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7219925 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 修复导出文件bug、删除多余代码 See merge request: openGaussythcs00001/openGauss-workbench!303, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。, merge feature-wyb into release merge "feature-wyb" into "release" 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。 Created-by: wuyuebin Author-id: 7158405 MR-id: 7219983 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。 See merge request: openGaussythcs00001/openGauss-workbench!304, checkcode, merge feature-wyb into release merge "feature-wyb" into "release" checkcode Created-by: wuyuebin Author-id: 7158405 MR-id: 7220196 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" checkcode See merge request: openGaussythcs00001/openGauss-workbench!306, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220240 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!307, 更新操作手册, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220293 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!308, 修复连接信息重置的问题, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 修复连接信息重置的问题 Created-by: zhangcheng Author-id: 7119759 MR-id: 7220370 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 修复连接信息重置的问题 See merge request: openGaussythcs00001/openGauss-workbench!309, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220375 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!310, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220425 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!311, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220435 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openG See merge request: openGaussythcs00001/openGauss-workbench!341 commit 960ffe02abafa04dfbc31da2354940430f0f715c Merge: 0bc8583c d3905325 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Mon Jun 26 14:57:45 2023 +0800 merge feature-lm into develop merge "feature-lm" into "develop" merge develop into feature-lm merge "develop" into "feature-lm" 连接信息名字限制长度, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 连接信息名字限制长度 Created-by: zhangcheng Author-id: 7119759 MR-id: 7219748 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 连接信息名字限制长度 See merge request: openGaussythcs00001/openGauss-workbench!300, 更新ds的readme和预览图, 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge feature-wyb into release merge "feature-wyb" into "release" 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb Created-by: wuyuebin Author-id: 7158405 MR-id: 7219754 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb See merge request: openGaussythcs00001/openGauss-workbench!301, 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, 调整创建模式未更新描述, merge release-zwr into release merge "release-zwr" into "release" 调整创建模式未更新描述 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7219868 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 调整创建模式未更新描述 See merge request: openGaussythcs00001/openGauss-workbench!302, 修复导出文件bug、删除多余代码, merge release-zwr into release merge "release-zwr" into "release" 修复导出文件bug、删除多余代码 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7219925 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 修复导出文件bug、删除多余代码 See merge request: openGaussythcs00001/openGauss-workbench!303, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。, merge feature-wyb into release merge "feature-wyb" into "release" 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。 Created-by: wuyuebin Author-id: 7158405 MR-id: 7219983 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。 See merge request: openGaussythcs00001/openGauss-workbench!304, checkcode, merge feature-wyb into release merge "feature-wyb" into "release" checkcode Created-by: wuyuebin Author-id: 7158405 MR-id: 7220196 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" checkcode See merge request: openGaussythcs00001/openGauss-workbench!306, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220240 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!307, 更新操作手册, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220293 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!308, 修复连接信息重置的问题, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 修复连接信息重置的问题 Created-by: zhangcheng Author-id: 7119759 MR-id: 7220370 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 修复连接信息重置的问题 See merge request: openGaussythcs00001/openGauss-workbench!309, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220375 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!310, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220425 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!311, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220435 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00 Created-by: luomeng Author-id: 7119743 MR-id: 7221499 Commit-by: 罗梦;luomeng Merged-by: luomeng Description: merge "feature-lm" into "develop" merge develop into feature-lm merge "develop" into "feature-lm" 连接信息名字限制长度, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 连接信息名字限制长度 Created-by: zhangcheng Author-id: 7119759 MR-id: 7219748 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 连接信息名字限制长度 See merge request: openGaussythcs00001/openGauss-workbench!300, 更新ds的readme和预览图, 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge feature-wyb into release merge "feature-wyb" into "release" 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb Created-by: wuyuebin Author-id: 7158405 MR-id: 7219754 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb See merge request: openGaussythcs00001/openGauss-workbench!301, 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, 调整创建模式未更新描述, merge release-zwr into release merge "release-zwr" into "release" 调整创建模式未更新描述 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7219868 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 调整创建模式未更新描述 See merge request: openGaussythcs00001/openGauss-workbench!302, 修复导出文件bug、删除多余代码, merge release-zwr into release merge "release-zwr" into "release" 修复导出文件bug、删除多余代码 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7219925 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 修复导出文件bug、删除多余代码 See merge request: openGaussythcs00001/openGauss-workbench!303, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。, merge feature-wyb into release merge "feature-wyb" into "release" 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。 Created-by: wuyuebin Author-id: 7158405 MR-id: 7219983 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。 See merge request: openGaussythcs00001/openGauss-workbench!304, checkcode, merge feature-wyb into release merge "feature-wyb" into "release" checkcode Created-by: wuyuebin Author-id: 7158405 MR-id: 7220196 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" checkcode See merge request: openGaussythcs00001/openGauss-workbench!306, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220240 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!307, 更新操作手册, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220293 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!308, 修复连接信息重置的问题, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 修复连接信息重置的问题 Created-by: zhangcheng Author-id: 7119759 MR-id: 7220370 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 修复连接信息重置的问题 See merge request: openGaussythcs00001/openGauss-workbench!309, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220375 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!310, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220425 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!311, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220435 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00 See merge request: openGaussythcs00001/openGauss-workbench!340 commit d3905325287dd6302cb542acc14604382f2753ab Author: 罗梦 <luomeng@ncti-gba.cn> Date: Mon Jun 26 14:56:46 2023 +0800 更新智能诊断插件readme commit aeab1a64b061192f139d62d4761c1dfe9cb81b6f Author: 罗梦 <luomeng@ncti-gba.cn> Date: Mon Jun 26 14:53:52 2023 +0800 历史数据诊断-修复一些codeCheck修改导致的bug commit 5555cfb1285f843c3739f7b8776201048053938a Merge: e25c3d3f ad0acde6 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Mon Jun 26 12:02:28 2023 +0800 Merge branch 'bugfix-zhangcheng-0630-3' into release commit ad0acde6752dd10832ce7552bb8a218150c7182a Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Mon Jun 26 11:57:41 2023 +0800 更新文档 commit e25c3d3ff35a0f15b9ad35ca361d49e5d0ee5b6d Merge: 4c3001d4 95da9f13 Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Mon Jun 26 11:48:45 2023 +0800 merge bugfix-zhangcheng-0630-3 into release merge "bugfix-zhangcheng-0630-3" into "release" 连接信息ip限制，删除连接增加提示 Created-by: zhangcheng Author-id: 7119759 MR-id: 7221433 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-3" into "release" 连接信息ip限制，删除连接增加提示 See merge request: openGaussythcs00001/openGauss-workbench!338 commit 95da9f13e20e2ec1cdc46bf5c63514dd7b38f495 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Mon Jun 26 11:46:42 2023 +0800 连接信息ip限制，删除连接增加提示 commit 56ece996203d791631037671581dccf11245d15a Author: wuyulin <wuyulin@ncti-gba.cn> Date: Mon Jun 26 10:11:19 2023 +0800 换行修改 commit 4c3001d4308b9d9114cd12e8953ba1a05ea5dbf7 Merge: a45ebf8d 6e082a75 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Sun Jun 25 18:39:57 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7221248 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!337 commit 6e082a75f9c4744a6dfcd4e639518633af1c44b5 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Sun Jun 25 18:38:43 2023 +0800 codecheck commit 264098e6c9a0cb240f7639772717dbd3dcc73f33 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Sun Jun 25 17:27:54 2023 +0800 CodeCheck修改 commit a45ebf8d0bbcffcfad74ccb5163e4df53de950df Merge: f72a64d1 5c071607 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Sun Jun 25 16:56:54 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7221190 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!336 commit 5c071607a60d11de38126f331a35a5aa7cc28a2a Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Sun Jun 25 16:54:43 2023 +0800 codecheck commit ecd60c85556a17d174cd51c3895c4284598e7fe4 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Sun Jun 25 16:53:21 2023 +0800 codecheck修改 commit c861b5730ae4add9f59655cf1563c12e40204452 Merge: 1a9a99a3 1f9dff0c Author: wuyulin <wuyulin@ncti-gba.cn> Date: Sun Jun 25 16:43:07 2023 +0800 Merge branch 'feature-codecheck' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-codecheck commit 1a9a99a316a704bd81a64c86e00e2577bfb5cd12 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Sun Jun 25 16:20:15 2023 +0800 CodeCheck异常全部修改 commit aa61ad399e9f5b931a4a24ea87fe084b8684e1fd Merge: b3c97972 0bc8583c Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Sun Jun 25 15:39:53 2023 +0800 merge develop into feature-lm merge "develop" into "feature-lm" 连接信息名字限制长度, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 连接信息名字限制长度 Created-by: zhangcheng Author-id: 7119759 MR-id: 7219748 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 连接信息名字限制长度 See merge request: openGaussythcs00001/openGauss-workbench!300, 更新ds的readme和预览图, 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge feature-wyb into release merge "feature-wyb" into "release" 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb Created-by: wuyuebin Author-id: 7158405 MR-id: 7219754 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb See merge request: openGaussythcs00001/openGauss-workbench!301, 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, 调整创建模式未更新描述, merge release-zwr into release merge "release-zwr" into "release" 调整创建模式未更新描述 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7219868 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 调整创建模式未更新描述 See merge request: openGaussythcs00001/openGauss-workbench!302, 修复导出文件bug、删除多余代码, merge release-zwr into release merge "release-zwr" into "release" 修复导出文件bug、删除多余代码 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7219925 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 修复导出文件bug、删除多余代码 See merge request: openGaussythcs00001/openGauss-workbench!303, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。, merge feature-wyb into release merge "feature-wyb" into "release" 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。 Created-by: wuyuebin Author-id: 7158405 MR-id: 7219983 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。 See merge request: openGaussythcs00001/openGauss-workbench!304, checkcode, merge feature-wyb into release merge "feature-wyb" into "release" checkcode Created-by: wuyuebin Author-id: 7158405 MR-id: 7220196 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" checkcode See merge request: openGaussythcs00001/openGauss-workbench!306, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220240 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!307, 更新操作手册, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220293 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!308, 修复连接信息重置的问题, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 修复连接信息重置的问题 Created-by: zhangcheng Author-id: 7119759 MR-id: 7220370 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 修复连接信息重置的问题 See merge request: openGaussythcs00001/openGauss-workbench!309, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220375 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!310, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220425 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!311, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220435 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!312, 删除无用代码, merge bugfix-zhangcheng-0630 Created-by: luomeng Author-id: 7119743 MR-id: 7221134 Commit-by: luomeng;yangzihao;Zihao Yang;张昊宇;wuyuebin;liupengfei;zhangcheng;zengseliang;zhouwenruo Merged-by: luomeng Description: merge "develop" into "feature-lm" 连接信息名字限制长度, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 连接信息名字限制长度 Created-by: zhangcheng Author-id: 7119759 MR-id: 7219748 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 连接信息名字限制长度 See merge request: openGaussythcs00001/openGauss-workbench!300, 更新ds的readme和预览图, 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge feature-wyb into release merge "feature-wyb" into "release" 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb Created-by: wuyuebin Author-id: 7158405 MR-id: 7219754 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb See merge request: openGaussythcs00001/openGauss-workbench!301, 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, 调整创建模式未更新描述, merge release-zwr into release merge "release-zwr" into "release" 调整创建模式未更新描述 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7219868 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 调整创建模式未更新描述 See merge request: openGaussythcs00001/openGauss-workbench!302, 修复导出文件bug、删除多余代码, merge release-zwr into release merge "release-zwr" into "release" 修复导出文件bug、删除多余代码 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7219925 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 修复导出文件bug、删除多余代码 See merge request: openGaussythcs00001/openGauss-workbench!303, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。, merge feature-wyb into release merge "feature-wyb" into "release" 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。 Created-by: wuyuebin Author-id: 7158405 MR-id: 7219983 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。 See merge request: openGaussythcs00001/openGauss-workbench!304, checkcode, merge feature-wyb into release merge "feature-wyb" into "release" checkcode Created-by: wuyuebin Author-id: 7158405 MR-id: 7220196 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" checkcode See merge request: openGaussythcs00001/openGauss-workbench!306, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220240 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!307, 更新操作手册, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220293 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!308, 修复连接信息重置的问题, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 修复连接信息重置的问题 Created-by: zhangcheng Author-id: 7119759 MR-id: 7220370 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 修复连接信息重置的问题 See merge request: openGaussythcs00001/openGauss-workbench!309, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220375 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!310, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220425 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!311, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220435 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!312, 删除无用代码, merge bugfix-zhangcheng-0630 See merge request: openGaussythcs00001/openGauss-workbench!335 commit 0bc8583c03ac9c611f8ac0af7985111c716b346f Merge: af541796 f72a64d1 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Sun Jun 25 15:39:22 2023 +0800 merge release into develop merge "release" into "develop" 连接信息名字限制长度, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 连接信息名字限制长度 Created-by: zhangcheng Author-id: 7119759 MR-id: 7219748 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 连接信息名字限制长度 See merge request: openGaussythcs00001/openGauss-workbench!300, 更新ds的readme和预览图, 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge feature-wyb into release merge "feature-wyb" into "release" 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb Created-by: wuyuebin Author-id: 7158405 MR-id: 7219754 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb See merge request: openGaussythcs00001/openGauss-workbench!301, 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, 调整创建模式未更新描述, merge release-zwr into release merge "release-zwr" into "release" 调整创建模式未更新描述 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7219868 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 调整创建模式未更新描述 See merge request: openGaussythcs00001/openGauss-workbench!302, 修复导出文件bug、删除多余代码, merge release-zwr into release merge "release-zwr" into "release" 修复导出文件bug、删除多余代码 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7219925 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 修复导出文件bug、删除多余代码 See merge request: openGaussythcs00001/openGauss-workbench!303, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。, merge feature-wyb into release merge "feature-wyb" into "release" 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。 Created-by: wuyuebin Author-id: 7158405 MR-id: 7219983 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。 See merge request: openGaussythcs00001/openGauss-workbench!304, checkcode, merge feature-wyb into release merge "feature-wyb" into "release" checkcode Created-by: wuyuebin Author-id: 7158405 MR-id: 7220196 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" checkcode See merge request: openGaussythcs00001/openGauss-workbench!306, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220240 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!307, 更新操作手册, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220293 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!308, 修复连接信息重置的问题, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 修复连接信息重置的问题 Created-by: zhangcheng Author-id: 7119759 MR-id: 7220370 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 修复连接信息重置的问题 See merge request: openGaussythcs00001/openGauss-workbench!309, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220375 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!310, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220425 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!311, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220435 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!312, 删除无用代码, merge bugfix-zhangcheng-0630-2 Created-by: luomeng Author-id: 7119743 MR-id: 7221133 Commit-by: yangzihao;Zihao Yang;张昊宇;luomeng;wuyuebin;liupengfei;zhangcheng;zengseliang;zhouwenruo Merged-by: luomeng Description: merge "release" into "develop" 连接信息名字限制长度, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 连接信息名字限制长度 Created-by: zhangcheng Author-id: 7119759 MR-id: 7219748 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 连接信息名字限制长度 See merge request: openGaussythcs00001/openGauss-workbench!300, 更新ds的readme和预览图, 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge feature-wyb into release merge "feature-wyb" into "release" 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb Created-by: wuyuebin Author-id: 7158405 MR-id: 7219754 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb See merge request: openGaussythcs00001/openGauss-workbench!301, 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, 调整创建模式未更新描述, merge release-zwr into release merge "release-zwr" into "release" 调整创建模式未更新描述 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7219868 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 调整创建模式未更新描述 See merge request: openGaussythcs00001/openGauss-workbench!302, 修复导出文件bug、删除多余代码, merge release-zwr into release merge "release-zwr" into "release" 修复导出文件bug、删除多余代码 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7219925 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 修复导出文件bug、删除多余代码 See merge request: openGaussythcs00001/openGauss-workbench!303, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。, merge feature-wyb into release merge "feature-wyb" into "release" 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。 Created-by: wuyuebin Author-id: 7158405 MR-id: 7219983 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。 See merge request: openGaussythcs00001/openGauss-workbench!304, checkcode, merge feature-wyb into release merge "feature-wyb" into "release" checkcode Created-by: wuyuebin Author-id: 7158405 MR-id: 7220196 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" checkcode See merge request: openGaussythcs00001/openGauss-workbench!306, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220240 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!307, 更新操作手册, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220293 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!308, 修复连接信息重置的问题, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 修复连接信息重置的问题 Created-by: zhangcheng Author-id: 7119759 MR-id: 7220370 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 修复连接信息重置的问题 See merge request: openGaussythcs00001/openGauss-workbench!309, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220375 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!310, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220425 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!311, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220435 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!312, 删除无用代码, merge bugfix-zhangcheng-0630-2 See merge request: openGaussythcs00001/openGauss-workbench!334 commit bf661eda3ff76a4ffd7b4fa518db0ec394fb9d5d Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Sun Jun 25 15:22:02 2023 +0800 增加小数位,更改topsql逻辑 commit 1f9dff0c7412d2d8a956894f6c9109cfb052dc3f Merge: af541796 5bbaaee1 Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Sun Jun 25 15:21:12 2023 +0800 merge bugfix-zhangcheng-0630-2 into feature-codecheck merge "bugfix-zhangcheng-0630-2" into "feature-codecheck" 连接信息名字限制长度, 修复连接信息重置的问题, 删除无用代码, 改变量名 Created-by: zhangcheng Author-id: 7119759 MR-id: 7221116 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "feature-codecheck" 连接信息名字限制长度, 修复连接信息重置的问题, 删除无用代码, 改变量名 See merge request: openGaussythcs00001/openGauss-workbench!333 commit 5bbaaee1883399cb73f58dbdc8b25fa7a3eadccc Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Sun Jun 25 15:19:55 2023 +0800 改变量名 commit f72a64d1eca685695b82738f7c1ca4944fdb258e Merge: 1dd249b9 8eb30b64 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Sun Jun 25 10:35:02 2023 +0800 merge feature-yangzihao-history into release merge "feature-yangzihao-history" into "release" 修复历史数据诊断前端代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7220971 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-history" into "release" 修复历史数据诊断前端代码 See merge request: openGaussythcs00001/openGauss-workbench!332 commit 8eb30b642931d1481ce0678056a8fd7e8d6a4398 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Sun Jun 25 10:33:53 2023 +0800 修复历史数据诊断前端代码 commit 1dd249b99e5985ed8370c4ce5e772788e2e20efb Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Sun Jun 25 10:03:26 2023 +0800 采集器连接数据库 commit 6d12fa1cfacb8fe68d03868f723ae90a732de009 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 20 08:47:39 2023 +0800 文档.图片 commit 04efac02327684af18c120147db631a9ce0d0a0d Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 14:21:40 2023 +0800 配置 commit 7fc3dda5e5c769c27aa7365e5d5b63b2c145b8d7 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:50:46 2023 +0800 Squashed commit of the following: commit ae724aec71fed5b5351ed9f1d05b73be72d5d292 Merge: 84970cb9 78c32bbd Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:47:30 2023 +0800 Merge branch 'develop' into dev-zhy commit 84970cb9a70db7560fac4ac6e402f6279d99e0cf Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:44:39 2023 +0800 添加字段.移除无效文件,改名 commit 8dfcab30fcf7b303be606b978e331115259454bd Merge: 5ab1258e 933581fe Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Sun Jun 25 10:16:53 2023 +0800 Merge branch 'master' of https://gitee.com/banlijam/openGauss-workbench into codecheck # Conflicts: # plugins/data-studio/web-ui/src/layout/Sidebar/index.vue # plugins/data-studio/web-ui/src/views/createTable/components/IndexesTab.vue # plugins/observability-instance/InstanceExporter/.gitignore # plugins/observability-instance/InstanceExporter/pom.xml # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/Application.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/DBmetric.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/OSmetric.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/system/cpu/LoadAvg.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/system/memory/ProcMeminfo.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/system/network/SockStat.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/util/StringUtil.java # plugins/observability-instance/InstanceExporter/src/main/resources/application.yml # plugins/observability-instance/InstanceExporter/src/main/resources/logbak-spring.xml # plugins/observability-instance/InstanceExporter/src/main/resources/og_exporter.yml # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/dto/session/DetailStatisticDto.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/dto/topsql/TopSQLNowReq.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/handler/session/SessionHandler.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/mapper/DbConfigMapper.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/mapper/TopSqlMapper.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/SessionService.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/provider/ClusterOpsProviderManager.java # plugins/observability-instance/web-ui/src/api/observability.ts # plugins/observability-instance/web-ui/src/api/session.ts # plugins/observability-instance/web-ui/src/api/sqlDetail.ts # plugins/observability-instance/web-ui/src/api/sqlDiagnosis.ts # plugins/observability-instance/web-ui/src/assets/style/color.module.scss # plugins/observability-instance/web-ui/src/assets/svg/detail.svg # plugins/observability-instance/web-ui/src/assets/svg/info-hollow.svg # plugins/observability-instance/web-ui/src/assets/svg/tips.svg # plugins/observability-instance/web-ui/src/components/IndexBar.vue # plugins/observability-instance/web-ui/src/components/MyCard2.vue # plugins/observability-instance/web-ui/src/components/echarts/IndexLine.vue # plugins/observability-instance/web-ui/src/components/echarts/LazyLine.vue # plugins/observability-instance/web-ui/src/hooks/global.ts # plugins/observability-instance/web-ui/src/pages/dashboardV2/Index.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/common.ts # plugins/observability-instance/web-ui/src/pages/dashboardV2/instanceMonitor/Index.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/instanceMonitor/instanceMetrics/Index.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/instanceMonitor/sessionMonitor/Detail.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/instanceMonitor/sessionMonitor/Index.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/instanceMonitor/topSQL/Index.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/performanceLoad/Index.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/resourceMonitor/CPU/Index.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/resourceMonitor/IO/Index.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/resourceMonitor/Index.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/resourceMonitor/memory/Index.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/resourceMonitor/network/Index.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/systemConfiguration/Index.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/systemConfiguration/password.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/wdr/Index.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/wdr/buildWdr.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/wdr/snapshotManage.vue # plugins/observability-instance/web-ui/src/pages/sql_detail/waitEvent/Index.vue # plugins/observability-instance/web-ui/src/utils/date.ts # plugins/observability-log-search/src/main/java/com/nctigba/observability/log/controller/EnvironmentController.java # plugins/observability-sql-diagnosis/pom.xml # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/config/DataSourceIniter.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/controller/EnvironmentController.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/mapper/DiagnosisTaskResultMapper.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/model/NctigbaEnv.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/AgentService.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/diagnosis/TaskCreator.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/diagnosis/caller/BccCaller.java # plugins/observability-sql-diagnosis/src/main/resources/messages.properties # plugins/observability-sql-diagnosis/src/main/resources/messages_en_US.properties # plugins/observability-sql-diagnosis/src/main/resources/messages_zh_CN.properties # plugins/observability-sql-diagnosis/src/main/resources/opengauss-ebpf-1.0.0-SNAPSHOT.jar # plugins/observability-sql-diagnosis/web-ui/src/components/ClusterCascader.vue # plugins/observability-sql-diagnosis/web-ui/src/components/MyCard.vue # plugins/observability-sql-diagnosis/web-ui/src/pages/datasource/task_detail/Index.vue # plugins/observability-sql-diagnosis/web-ui/src/pages/datasource/task_detail/task_info.vue commit 5ab1258e5062170e8e40918982d4b311f1d8fb61 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Sun Jun 25 10:11:38 2023 +0800 codecheck commit f28501f1b5f06b54f47500598a0de397ac9120fb Merge: db6dc7c6 44cdbdc4 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Sun Jun 25 10:09:55 2023 +0800 merge feature-yangzihao-history into release merge "feature-yangzihao-history" into "release" 修复历史数据诊断前端BUG Created-by: yangzihao Author-id: 7119754 MR-id: 7220958 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-history" into "release" 修复历史数据诊断前端BUG See merge request: openGaussythcs00001/openGauss-workbench!331 commit 44cdbdc402c19f1f5025ec1041ba037ac37cd5fd Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Sun Jun 25 10:08:34 2023 +0800 修复历史数据诊断前端BUG commit 0a415874480338971f9611ed042ebcd733c6daab Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Sun Jun 25 10:03:26 2023 +0800 采集器连接数据库 commit db6dc7c6a8d47f9682d213845904132f2d5f8bac Merge: d2ff934a d8e500b3 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Sun Jun 25 09:48:08 2023 +0800 merge feature-yangzihao-history into release merge "feature-yangzihao-history" into "release" 历史数据诊断前端修改 Created-by: yangzihao Author-id: 7119754 MR-id: 7220926 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-history" into "release" 历史数据诊断前端修改 See merge request: openGaussythcs00001/openGauss-workbench!330 commit d8e500b3e55a5b81157e87bc4ed0595c680863b1 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Sun Jun 25 09:47:32 2023 +0800 历史数据诊断前端修改 commit dfe91892963254259a7baf4d226be97aeb0dd0dc Merge: 283d4746 af541796 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Sun Jun 25 09:43:46 2023 +0800 Merge branch 'develop' into dev-zhy commit 933581fe37a77dfe35925a313f785c7e330549c6 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Sun Jun 25 09:36:36 2023 +0800 codecheck commit df2644c7884cc3e78a4d73e6aa6af400b3a39c6e Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Sun Jun 25 09:03:51 2023 +0800 codecheck commit d2ff934a3f973d9bff4b27a7bab3a5f0da61613f Merge: 7a6db4f6 af541796 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Sat Jun 24 16:55:21 2023 +0800 merge develop into release merge "develop" into "release" 历史数据诊断-CodeCheck修改, merge feature-lm into develop merge "feature-lm" into "develop" 历史数据诊断-CodeCheck修改 Created-by: luomeng Author-id: 7119743 MR-id: 7220884 Commit-by: 罗梦 Merged-by: luomeng Description: merge "feature-lm" into "develop" 历史数据诊断-CodeCheck修改 See merge request: openGaussythcs00001/openGauss-workbench!328 Created-by: luomeng Author-id: 7119743 MR-id: 7220885 Commit-by: luomeng;罗梦 Merged-by: luomeng Description: merge "develop" into "release" 历史数据诊断-CodeCheck修改, merge feature-lm into develop merge "feature-lm" into "develop" 历史数据诊断-CodeCheck修改 Created-by: luomeng Author-id: 7119743 MR-id: 7220884 Commit-by: 罗梦 Merged-by: luomeng Description: merge "feature-lm" into "develop" 历史数据诊断-CodeCheck修改 See merge request: openGaussythcs00001/openGauss-workbench!328 See merge request: openGaussythcs00001/openGauss-workbench!329 commit af541796d853d559b2b769b64e9639e15a4ae7c4 Merge: 2b584d58 b3c97972 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Sat Jun 24 16:54:57 2023 +0800 merge feature-lm into develop merge "feature-lm" into "develop" 历史数据诊断-CodeCheck修改 Created-by: luomeng Author-id: 7119743 MR-id: 7220884 Commit-by: 罗梦 Merged-by: luomeng Description: merge "feature-lm" into "develop" 历史数据诊断-CodeCheck修改 See merge request: openGaussythcs00001/openGauss-workbench!328 commit b3c979729259f44203678af8d2d49a79d9185569 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Sat Jun 24 16:53:39 2023 +0800 历史数据诊断-CodeCheck修改 commit 7a6db4f60fd32b7e6960a14aec7c2abb2073bb16 Merge: e54c1d24 2b584d58 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Fri Jun 23 20:35:41 2023 +0800 merge develop into release merge "develop" into "release" merge develop into feature-lm merge "develop" into "feature-lm" 提交等待事件统计代码, 修改样式, Squashed commit of the following: commit ae724aec71fed5b5351ed9f1d05b73be72d5d292 Merge: 84970cb9 78c32bbd Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:47:30 2023 +0800 Merge branch 'develop' into dev-zhy commit 84970cb9a70db7560fac4ac6e402f6279d99e0cf Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:44:39 2023 +0800 添加字段.移除无效文件,改名, 配置, 打包, 更新用户操作手册, merge release-zwr into release merge "release-zwr" into "release" 更新用户操作手册 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7218971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 更新用户操作手册 See merge request: openGaussythcs00001/openGauss-workbench!285, 修复编辑表的关闭winId、默认列类型，新建表索引访问方式, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 修复编辑表的关闭winId、默认列类型，新建表索引访问方式 Created-by: zhangcheng Author-id: 7119759 MR-id: 7218984 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 修复编辑表的关闭winId、默认列类型，新建表索引访问方式 See merge request: openGaussythcs00001/openGauss-workbench!286, merge develop into release merge "develop" into "release" merge release into develop merge "release" into "develop" merge develop into release merge "develop" into "release" merge develop into feature-lm merge "develop" into "feature-lm" 修改sqlite初始化方式, Revert "提交代码" This reverts commit e103ff955ec521cc063adca87b25257b28405b0f, sqliteinit, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 告警中心前端代码, 告警中心后端代码, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge develop into release merge "develop" into "release" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 调整部分编辑表的功能, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 Created-by: zhangcheng Author-id: 7119759 MR-id: 7209563 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 See merge request: openGaussythcs00001/openGauss-workbench!126, 数据更新联调问题修复, merge feature-wyl into develop merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7209762 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 See merge request: openGaussythcs00001/openGauss-workbench!127, 生成函数覆盖率报告, Merge remote-tracking branch 'origin/develop' into feature-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/util/DebugUtils.java # plugins/data-studio/src/main/resources/messages_en_US.properties # plugins/data-studio/src/main/resources/messages_zh_CN.properties, 生成函数覆盖率报告, merge feature-zwr into develop merge "feature-zwr" into "develop" 生成函数覆盖率报告 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7209971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 生成函数覆盖率报告 See merge request: openGaussythcs00001/openGauss-workbench!128, 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 Created-by: zhangcheng Author-id: 7119759 MR-id: 7210033 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 See merge request: openGaussythcs00001/openGauss-workbench!130, 调整文件, 生成函数覆盖率报告, 导出视图、序列DDL功能, 导出DDL页面, 创建表, resultSet添加try去捕获, 添加导出函数，模式DDL接口, merge feature-zwr into develop merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7210854 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 See merge request: openGaussythcs00001/openGauss-workbench!131, 1, merge feature-wyl into develop merge "feature-wyl" into "develop" 创建表, 1 Created-by: wuyulin Author-id: 7119753 MR-id: 7210950 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 创建表, 1 See merge request: openGaussythcs00001/openGauss-workbench!132, Merge remote-tracking branch 'origin/develop' into feature-wyl, 导出DDL接口联调, 添加导出表数据接口, merge feature-zwr into develop merge "feature-zwr" into "develop" 添加导出表数据接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7211802 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" Created-by: luomeng Author-id: 7119743 MR-id: 7220853 Commit-by: luomeng;罗梦 Merged-by: luomeng Description: merge "develop" into "release" merge develop into feature-lm merge "develop" into "feature-lm" 提交等待事件统计代码, 修改样式, Squashed commit of the following: commit ae724aec71fed5b5351ed9f1d05b73be72d5d292 Merge: 84970cb9 78c32bbd Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:47:30 2023 +0800 Merge branch 'develop' into dev-zhy commit 84970cb9a70db7560fac4ac6e402f6279d99e0cf Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:44:39 2023 +0800 添加字段.移除无效文件,改名, 配置, 打包, 更新用户操作手册, merge release-zwr into release merge "release-zwr" into "release" 更新用户操作手册 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7218971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 更新用户操作手册 See merge request: openGaussythcs00001/openGauss-workbench!285, 修复编辑表的关闭winId、默认列类型，新建表索引访问方式, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 修复编辑表的关闭winId、默认列类型，新建表索引访问方式 Created-by: zhangcheng Author-id: 7119759 MR-id: 7218984 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 修复编辑表的关闭winId、默认列类型，新建表索引访问方式 See merge request: openGaussythcs00001/openGauss-workbench!286, merge develop into release merge "develop" into "release" merge release into develop merge "release" into "develop" merge develop into release merge "develop" into "release" merge develop into feature-lm merge "develop" into "feature-lm" 修改sqlite初始化方式, Revert "提交代码" This reverts commit e103ff955ec521cc063adca87b25257b28405b0f, sqliteinit, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 告警中心前端代码, 告警中心后端代码, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge develop into release merge "develop" into "release" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 调整部分编辑表的功能, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 Created-by: zhangcheng Author-id: 7119759 MR-id: 7209563 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 See merge request: openGaussythcs00001/openGauss-workbench!126, 数据更新联调问题修复, merge feature-wyl into develop merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7209762 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 See merge request: openGaussythcs00001/openGauss-workbench!127, 生成函数覆盖率报告, Merge remote-tracking branch 'origin/develop' into feature-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/util/DebugUtils.java # plugins/data-studio/src/main/resources/messages_en_US.properties # plugins/data-studio/src/main/resources/messages_zh_CN.properties, 生成函数覆盖率报告, merge feature-zwr into develop merge "feature-zwr" into "develop" 生成函数覆盖率报告 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7209971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 生成函数覆盖率报告 See merge request: openGaussythcs00001/openGauss-workbench!128, 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 Created-by: zhangcheng Author-id: 7119759 MR-id: 7210033 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 See merge request: openGaussythcs00001/openGauss-workbench!130, 调整文件, 生成函数覆盖率报告, 导出视图、序列DDL功能, 导出DDL页面, 创建表, resultSet添加try去捕获, 添加导出函数，模式DDL接口, merge feature-zwr into develop merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7210854 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 See merge request: openGaussythcs00001/openGauss-workbench!131, 1, merge feature-wyl into develop merge "feature-wyl" into "develop" 创建表, 1 Created-by: wuyulin Author-id: 7119753 MR-id: 7210950 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 创建表, 1 See merge request: openGaussythcs00001/openGauss-workbench!132, Merge remote-tracking branch 'origin/develop' into feature-wyl, 导出DDL接口联调, 添加导出表数据接口, merge feature-zwr into develop merge "feature-zwr" into "develop" 添加导出表数据接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7211802 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" See merge request: openGaussythcs00001/openGauss-workbench!327 commit 2b584d587145201df70548d9ed64eb01eb7d8a67 Merge: 91c0b01f 12eb27f0 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Fri Jun 23 20:35:03 2023 +0800 merge feature-lm into develop merge "feature-lm" into "develop" merge develop into feature-lm merge "develop" into "feature-lm" 提交等待事件统计代码, 修改样式, Squashed commit of the following: commit ae724aec71fed5b5351ed9f1d05b73be72d5d292 Merge: 84970cb9 78c32bbd Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:47:30 2023 +0800 Merge branch 'develop' into dev-zhy commit 84970cb9a70db7560fac4ac6e402f6279d99e0cf Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:44:39 2023 +0800 添加字段.移除无效文件,改名, 配置, 打包, 更新用户操作手册, merge release-zwr into release merge "release-zwr" into "release" 更新用户操作手册 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7218971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 更新用户操作手册 See merge request: openGaussythcs00001/openGauss-workbench!285, 修复编辑表的关闭winId、默认列类型，新建表索引访问方式, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 修复编辑表的关闭winId、默认列类型，新建表索引访问方式 Created-by: zhangcheng Author-id: 7119759 MR-id: 7218984 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 修复编辑表的关闭winId、默认列类型，新建表索引访问方式 See merge request: openGaussythcs00001/openGauss-workbench!286, merge develop into release merge "develop" into "release" merge release into develop merge "release" into "develop" merge develop into release merge "develop" into "release" merge develop into feature-lm merge "develop" into "feature-lm" 修改sqlite初始化方式, Revert "提交代码" This reverts commit e103ff955ec521cc063adca87b25257b28405b0f, sqliteinit, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 告警中心前端代码, 告警中心后端代码, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge develop into release merge "develop" into "release" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 调整部分编辑表的功能, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 Created-by: zhangcheng Author-id: 7119759 MR-id: 7209563 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 See merge request: openGaussythcs00001/openGauss-workbench!126, 数据更新联调问题修复, merge feature-wyl into develop merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7209762 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 See merge request: openGaussythcs00001/openGauss-workbench!127, 生成函数覆盖率报告, Merge remote-tracking branch 'origin/develop' into feature-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/util/DebugUtils.java # plugins/data-studio/src/main/resources/messages_en_US.properties # plugins/data-studio/src/main/resources/messages_zh_CN.properties, 生成函数覆盖率报告, merge feature-zwr into develop merge "feature-zwr" into "develop" 生成函数覆盖率报告 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7209971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 生成函数覆盖率报告 See merge request: openGaussythcs00001/openGauss-workbench!128, 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 Created-by: zhangcheng Author-id: 7119759 MR-id: 7210033 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 See merge request: openGaussythcs00001/openGauss-workbench!130, 调整文件, 生成函数覆盖率报告, 导出视图、序列DDL功能, 导出DDL页面, 创建表, resultSet添加try去捕获, 添加导出函数，模式DDL接口, merge feature-zwr into develop merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7210854 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 See merge request: openGaussythcs00001/openGauss-workbench!131, 1, merge feature-wyl into develop merge "feature-wyl" into "develop" 创建表, 1 Created-by: wuyulin Author-id: 7119753 MR-id: 7210950 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 创建表, 1 See merge request: openGaussythcs00001/openGauss-workbench!132, Merge remote-tracking branch 'origin/develop' into feature-wyl, 导出DDL接口联调, 添加导出表数据接口, merge feature-zwr into develop merge "feature-zwr" into "develop" 添加导出表数据接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7211802 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "devel Created-by: luomeng Author-id: 7119743 MR-id: 7220852 Commit-by: 罗梦;luomeng Merged-by: luomeng Description: merge "feature-lm" into "develop" merge develop into feature-lm merge "develop" into "feature-lm" 提交等待事件统计代码, 修改样式, Squashed commit of the following: commit ae724aec71fed5b5351ed9f1d05b73be72d5d292 Merge: 84970cb9 78c32bbd Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:47:30 2023 +0800 Merge branch 'develop' into dev-zhy commit 84970cb9a70db7560fac4ac6e402f6279d99e0cf Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:44:39 2023 +0800 添加字段.移除无效文件,改名, 配置, 打包, 更新用户操作手册, merge release-zwr into release merge "release-zwr" into "release" 更新用户操作手册 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7218971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 更新用户操作手册 See merge request: openGaussythcs00001/openGauss-workbench!285, 修复编辑表的关闭winId、默认列类型，新建表索引访问方式, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 修复编辑表的关闭winId、默认列类型，新建表索引访问方式 Created-by: zhangcheng Author-id: 7119759 MR-id: 7218984 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 修复编辑表的关闭winId、默认列类型，新建表索引访问方式 See merge request: openGaussythcs00001/openGauss-workbench!286, merge develop into release merge "develop" into "release" merge release into develop merge "release" into "develop" merge develop into release merge "develop" into "release" merge develop into feature-lm merge "develop" into "feature-lm" 修改sqlite初始化方式, Revert "提交代码" This reverts commit e103ff955ec521cc063adca87b25257b28405b0f, sqliteinit, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 告警中心前端代码, 告警中心后端代码, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge develop into release merge "develop" into "release" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 调整部分编辑表的功能, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 Created-by: zhangcheng Author-id: 7119759 MR-id: 7209563 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 See merge request: openGaussythcs00001/openGauss-workbench!126, 数据更新联调问题修复, merge feature-wyl into develop merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7209762 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 See merge request: openGaussythcs00001/openGauss-workbench!127, 生成函数覆盖率报告, Merge remote-tracking branch 'origin/develop' into feature-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/util/DebugUtils.java # plugins/data-studio/src/main/resources/messages_en_US.properties # plugins/data-studio/src/main/resources/messages_zh_CN.properties, 生成函数覆盖率报告, merge feature-zwr into develop merge "feature-zwr" into "develop" 生成函数覆盖率报告 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7209971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 生成函数覆盖率报告 See merge request: openGaussythcs00001/openGauss-workbench!128, 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 Created-by: zhangcheng Author-id: 7119759 MR-id: 7210033 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 See merge request: openGaussythcs00001/openGauss-workbench!130, 调整文件, 生成函数覆盖率报告, 导出视图、序列DDL功能, 导出DDL页面, 创建表, resultSet添加try去捕获, 添加导出函数，模式DDL接口, merge feature-zwr into develop merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7210854 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 See merge request: openGaussythcs00001/openGauss-workbench!131, 1, merge feature-wyl into develop merge "feature-wyl" into "develop" 创建表, 1 Created-by: wuyulin Author-id: 7119753 MR-id: 7210950 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 创建表, 1 See merge request: openGaussythcs00001/openGauss-workbench!132, Merge remote-tracking branch 'origin/develop' into feature-wyl, 导出DDL接口联调, 添加导出表数据接口, merge feature-zwr into develop merge "feature-zwr" into "develop" 添加导出表数据接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7211802 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "devel See merge request: openGaussythcs00001/openGauss-workbench!326 commit e54c1d241747e5d09be80fc05ea80dd8b969e3e7 Merge: fe977123 71ea052e Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Fri Jun 23 15:27:47 2023 +0800 merge feature-yangzihao-instance into release merge "feature-yangzihao-instance" into "release" 修复实例监控前端代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7220844 Commit-by: yangzihao;Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "release" 修复实例监控前端代码 See merge request: openGaussythcs00001/openGauss-workbench!325 commit 71ea052e429f54c6b56b10b4409a5adc3867ebdc Merge: c21df64e fe977123 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Fri Jun 23 15:27:35 2023 +0800 解决冲突 commit c21df64ed0429603a8be196f2e5a69d75f5d2aa1 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Fri Jun 23 15:25:11 2023 +0800 修复实例监控前端代码 commit fe977123bb6e5b5181d83e9116b5334e42bf1d05 Merge: d0435d9e f862443b Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Thu Jun 22 00:00:35 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220820 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!324 commit f862443bf9f32dfbf3657ad5651373c2f89745a3 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Jun 21 23:57:09 2023 +0800 codecheck commit d0435d9e67ed071014b0d7d6dcba0c9d8ae35100 Merge: c9c273ea 5062fc0c Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Wed Jun 21 19:23:51 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" codecheck, codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220812 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck, codecheck See merge request: openGaussythcs00001/openGauss-workbench!323 commit 5062fc0cd545e92fb276ef290518ee7120bb7235 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Jun 21 19:22:48 2023 +0800 codecheck commit d06af9ee823e20f69bc2bf348ccea2a022924281 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Jun 21 19:20:40 2023 +0800 codecheck commit 12eb27f0775f0ed98f27219bac6810452f5c1a44 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Wed Jun 21 17:56:05 2023 +0800 历史数据诊断-CodeCheck修改 commit 7a3a19fbb9e8e7e6b0f7a35ddbe892a5de780719 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Jun 21 17:52:37 2023 +0800 codecheck commit b6177439ab94bae2392058791474dfd68424770d Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Jun 21 17:44:40 2023 +0800 codecheck commit c9c273eaccb0a5e5b0499fb5ee2d00a3e13a6516 Merge: 63c9acd5 c683416f Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Wed Jun 21 17:39:18 2023 +0800 merge feature-yangzihao-instance into release merge "feature-yangzihao-instance" into "release" 修复实例监控前端BUG Created-by: yangzihao Author-id: 7119754 MR-id: 7220779 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "release" 修复实例监控前端BUG See merge request: openGaussythcs00001/openGauss-workbench!322 commit c683416f10e918e2542e761e96fd0420066f9083 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Wed Jun 21 17:32:02 2023 +0800 修复实例监控前端BUG commit a1530284835e98111f28864c843efcbd9b3d3aa5 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Jun 21 17:29:38 2023 +0800 codecheck commit 63c9acd5a20af45034acbc51bbafa4b378725121 Merge: 019cbc6a add3b1f4 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Wed Jun 21 17:29:06 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220774 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!321 commit add3b1f41a54da7b25afba29b38e7c394c1cb792 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Jun 21 17:28:24 2023 +0800 codecheck commit 27dd8794445d525bb4290af6e75e5ada62de03db Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Jun 21 17:19:16 2023 +0800 codecheck commit 6f5373dd0f8828cf1a8b5d90fef8db705dc54cbf Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Jun 21 17:09:46 2023 +0800 codecheck commit 019cbc6a42ca462339743ff13f3cb8a63927e41e Merge: ccb9dd2e ba2c7c6d Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Wed Jun 21 17:08:11 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220760 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!320 commit ba2c7c6d4b6b0d2abe98cb513cff4aadc72119e0 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Jun 21 17:07:13 2023 +0800 codecheck commit ccb9dd2e293ff95f8baadae4f09062e4e5b0e95c Merge: c299321d e23eedee Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Wed Jun 21 16:05:16 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220722 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!319 commit e23eedee8ebba4513188e4c96e9658b648b26745 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Jun 21 16:02:49 2023 +0800 codecheck commit 53e04f4c639f22a24db60f0aa7e4401cf8ff3ae7 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Jun 21 11:29:37 2023 +0800 codecheck commit c299321d4b4719cb45b4e89a2ac2c38bc5a92ce7 Merge: 664a2e32 7a12949c Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Wed Jun 21 10:59:48 2023 +0800 merge feature-yangzihao-instance into release merge "feature-yangzihao-instance" into "release" 修改图表表笑，内存数据不正确的问题, 修复实例监控前端问题 Created-by: yangzihao Author-id: 7119754 MR-id: 7220592 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "release" 修改图表表笑，内存数据不正确的问题, 修复实例监控前端问题 See merge request: openGaussythcs00001/openGauss-workbench!318 commit 7a12949c9171df0227703594a5c2b1f5190adfc3 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Wed Jun 21 10:51:34 2023 +0800 修复实例监控前端问题 commit 554a4a3a9f4c2f682babaf284d83a23c5dc90f2c Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Jun 21 10:30:36 2023 +0800 codecheck commit 7895be77e18d8ed025331a71688bb3a6c74ddc63 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Jun 21 10:23:21 2023 +0800 codecheck commit 664a2e328c36ec2538fe62e0ce0cb9f626f607e5 Merge: ae37e887 ffcdf254 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Wed Jun 21 10:09:27 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220559 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!317 commit ffcdf2543eadd076399cd232bd2dccbdd0c50b4a Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Jun 21 10:08:16 2023 +0800 codecheck commit ad7e15e235facc747733b16327e1b77d6373e15c Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Jun 21 09:34:44 2023 +0800 codecheck commit b1240a46cf95c6ffd72d56908a00131fe4fc74bb Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Jun 21 09:29:55 2023 +0800 codecheck commit ae37e8879d5ada9eed79199f3454bd64bdd6cd5a Merge: 88ac8c44 91c0b01f Author: liupengfei <liupengfei@ncti-gba.cn> Date: Wed Jun 21 09:19:11 2023 +0800 Merge branch 'develop' into release commit 91c0b01f7509b0f773072e643c17c54a01e32777 Merge: d594473f 84be1f6e Author: liupengfei <liupengfei@ncti-gba.cn> Date: Wed Jun 21 09:17:58 2023 +0800 Merge branch 'international' into develop commit 84be1f6e07ccff1da344543c56ba9a9c42b23553 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Wed Jun 21 09:15:43 2023 +0800 添加实例监控国际化异常 commit 88ac8c44a751dfc68b0d9f67211a6470af492266 Merge: 6ad52942 0ac032a1 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Wed Jun 21 02:14:19 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220537 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!316 commit 0ac032a14e9fd493867e1b7028a76fcaaf7c6341 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Jun 21 02:12:43 2023 +0800 codecheck commit 6ad52942e867274fadd12a0c79abf4efbafd5597 Merge: e17e1cf4 7f37af16 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Wed Jun 21 01:49:59 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220536 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!315 commit 7f37af16c401b94f561b8e166e54a26e68e7d7d8 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Jun 21 01:47:01 2023 +0800 codecheck commit a054865f638fdc45f1a342b7066d2371c6eddfcb Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue Jun 20 20:44:51 2023 +0800 修改图表表笑，内存数据不正确的问题 commit e17e1cf42bea769bd00164eeeeca1cc1e1db3d40 Merge: c2b0c20e 13754b1d Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Tue Jun 20 19:18:08 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220498 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!314 commit 13754b1d0a0fdd0aa2394ecf57ecc43bc65b78d3 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Jun 20 19:16:44 2023 +0800 codecheck commit c2b0c20ee92f3a197b82ff67618c0488e97d651f Merge: 2f321f10 8e0a22a0 Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Tue Jun 20 18:24:50 2023 +0800 merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 删除无用代码 Created-by: zhangcheng Author-id: 7119759 MR-id: 7220477 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 删除无用代码 See merge request: openGaussythcs00001/openGauss-workbench!313 commit 8e0a22a01506b8e5a01451b6985d185e7ab7a2d4 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Tue Jun 20 18:23:47 2023 +0800 删除无用代码 commit 2f321f10ccce910f999040904fe9c0a8cf3457ab Merge: 83367e31 ff721b38 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Tue Jun 20 17:27:51 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220435 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!312 commit ff721b3830c6f1a9e2d1a707d56a782ff341ca33 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Jun 20 17:26:38 2023 +0800 codecheck commit 83367e31d772d9f7f9ddd75ef85095341f55ade6 Merge: 17df5490 5a051d9b Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Tue Jun 20 17:07:41 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220425 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!311 commit 5a051d9b0e00fe36d9ff9a67d535413b9ed39d00 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Jun 20 17:05:52 2023 +0800 codecheck commit 17df549029ff8e125822099cc833b04dfc04341e Merge: a8c6d9eb 18046332 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Tue Jun 20 15:57:40 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220375 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!310 commit 180463324bcaf7e14725562744cb6277ffdf0ed4 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Jun 20 15:56:19 2023 +0800 codecheck commit a8c6d9eb17f2812782225c1302591374ef0e316c Merge: 40a7d06c 1240d2ff Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Tue Jun 20 15:39:06 2023 +0800 merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 修复连接信息重置的问题 Created-by: zhangcheng Author-id: 7119759 MR-id: 7220370 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 修复连接信息重置的问题 See merge request: openGaussythcs00001/openGauss-workbench!309 commit 1240d2ffea1a56f7a49c7674330de6d63a609b4a Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Tue Jun 20 15:36:32 2023 +0800 修复连接信息重置的问题 commit 40a7d06c58221ed9e322008508397a1b930d1d43 Merge: 6d588477 920a3bca Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Tue Jun 20 12:08:32 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220293 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!308 commit 920a3bca0492ddccc7c9c78d8c9e10fbbdffa16f Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Jun 20 12:06:56 2023 +0800 codecheck commit 6d5884770776a99455b759ac96033aece8e1b6e0 Author: zengseliang <zengseliang@ncti-gba.cn> Date: Tue Jun 20 11:35:53 2023 +0800 更新操作手册 commit 14360758f39259a79da081aee259afe9b197fc68 Merge: 279978fc b2328927 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Tue Jun 20 10:29:30 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220240 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!307 commit b23289272d2e2d7573fd582442192d7aa2242369 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Jun 20 10:27:05 2023 +0800 codecheck commit 279978fcc53fd555873698566e09b0bea49bb6be Merge: a633cb73 ee2a26fa Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Tue Jun 20 09:42:38 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" checkcode Created-by: wuyuebin Author-id: 7158405 MR-id: 7220196 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" checkcode See merge request: openGaussythcs00001/openGauss-workbench!306 commit ee2a26fa09d607d8de2aedfbf899f9c51ea565a2 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Jun 20 09:40:30 2023 +0800 checkcode commit 0be59d845ac93fa9bf8511c1250acc1857c74537 Merge: 03ce68cc d594473f Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Tue Jun 20 08:56:52 2023 +0800 merge develop into feature-lm merge "develop" into "feature-lm" 修改异常处理, Merge remote-tracking branch 'origin/release' into release, merge develop into release merge "develop" into "release" merge develop into feature-lm merge "develop" into "feature-lm" 修改pg_default问题, 编辑表刷新和关闭更新winId，导出接口做500的错误判断, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 编辑表刷新和关闭更新winId，导出接口做500的错误判断 Created-by: zhangcheng Author-id: 7119759 MR-id: 7217451 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 编辑表刷新和关闭更新winId，导出接口做500的错误判断 See merge request: openGaussythcs00001/openGauss-workbench!247, Merge remote-tracking branch 'origin/release' into release-wyl, Merge remote-tracking branch 'origin/release' into release-wyl, merge develop into release merge "develop" into "release" 版权信息, merge release into develop merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 Created-by: wuyulin Author-id: 7119753 MR-id: 7217325 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 See merge request: openGaussythcs00001/openGauss-workbench!236, merge release into develop merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 Created-by: wuyulin Author-id: 7119753 MR-id: 7217342 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 See merge request: openGaussythcs00001/openGauss-workbench!238, merge release into develop merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 Created-by: wuyulin Author-id: 7119753 MR-id: 7217355 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 See merge request: openGaussythcs00001/openGauss-workbench!240, 缩进和版权, 配置, 仅添加java文件版权, merge release into develop merge "release" into "develop" 分区表问题修改, merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 Created-by: wuyulin Author-id: 7119753 MR-id: 7217395 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 分区表问题修改, merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 See merge request: openGaussythcs00001/openGauss-workbench!242, merge release into develop merge "release" into "develop" 代码格式化, merge feature-wyb into release merge "feature-wyb" into "release" 代码格式化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7217417 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!243, 代码格式化, merge feature-zwr into release merge "feature-zwr" into "release" 代码格式化 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217433 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!244 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217436 Commit-by: zhouwenruo;wuyue Created-by: luomeng Author-id: 7119743 MR-id: 7220155 Commit-by: zhouwenruo;wuyulin;hw73730920/wuguobiao;luomeng Merged-by: luomeng Description: merge "develop" into "feature-lm" 修改异常处理, Merge remote-tracking branch 'origin/release' into release, merge develop into release merge "develop" into "release" merge develop into feature-lm merge "develop" into "feature-lm" 修改pg_default问题, 编辑表刷新和关闭更新winId，导出接口做500的错误判断, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 编辑表刷新和关闭更新winId，导出接口做500的错误判断 Created-by: zhangcheng Author-id: 7119759 MR-id: 7217451 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 编辑表刷新和关闭更新winId，导出接口做500的错误判断 See merge request: openGaussythcs00001/openGauss-workbench!247, Merge remote-tracking branch 'origin/release' into release-wyl, Merge remote-tracking branch 'origin/release' into release-wyl, merge develop into release merge "develop" into "release" 版权信息, merge release into develop merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 Created-by: wuyulin Author-id: 7119753 MR-id: 7217325 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 See merge request: openGaussythcs00001/openGauss-workbench!236, merge release into develop merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 Created-by: wuyulin Author-id: 7119753 MR-id: 7217342 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 See merge request: openGaussythcs00001/openGauss-workbench!238, merge release into develop merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 Created-by: wuyulin Author-id: 7119753 MR-id: 7217355 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 See merge request: openGaussythcs00001/openGauss-workbench!240, 缩进和版权, 配置, 仅添加java文件版权, merge release into develop merge "release" into "develop" 分区表问题修改, merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 Created-by: wuyulin Author-id: 7119753 MR-id: 7217395 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 分区表问题修改, merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 See merge request: openGaussythcs00001/openGauss-workbench!242, merge release into develop merge "release" into "develop" 代码格式化, merge feature-wyb into release merge "feature-wyb" into "release" 代码格式化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7217417 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!243, 代码格式化, merge feature-zwr into release merge "feature-zwr" into "release" 代码格式化 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217433 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!244 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217436 Commit-by: zhouwenruo;wuyue See merge request: openGaussythcs00001/openGauss-workbench!305 commit 283d47463008b9c42df92327af559f1458503f9b Merge: d6855cbc d594473f Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 20 08:52:09 2023 +0800 Merge branch 'develop' into dev-zhy commit d6855cbc2ea26cc573f5a9deb6dfd7244c048b5c Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 20 08:47:39 2023 +0800 文档.图片 commit a633cb73ab75f9f4997579d91fbb29f963618bd2 Merge: b2ac55e3 b1a12189 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Mon Jun 19 16:26:42 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。 Created-by: wuyuebin Author-id: 7158405 MR-id: 7219983 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。 See merge request: openGaussythcs00001/openGauss-workbench!304 commit b1a12189fb4bb0293aae96557c078ae6075aa6d3 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Jun 19 16:25:18 2023 +0800 选择告警时间范围，告警记录列表没刷新。 commit 452fd921f53696927d3d50a7c428e80baf55db5f Merge: 0be3321b b2ac55e3 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Jun 19 16:23:29 2023 +0800 Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb commit d594473f8d5759cd13dbe3bd08836792a1554e9a Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Mon Jun 19 14:53:05 2023 +0800 修复导出文件bug、删除多余代码 cherry-pick merge request: 修复导出文件bug、删除多余代码 53684947b76b5f92df48e7abedbc22b66ea1e686 This cherry-pick merge request !303 commit b2ac55e3043e5723d2184cd503170b791ee2777d Merge: 202c7837 53684947 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Mon Jun 19 14:53:05 2023 +0800 merge release-zwr into release merge "release-zwr" into "release" 修复导出文件bug、删除多余代码 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7219925 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 修复导出文件bug、删除多余代码 See merge request: openGaussythcs00001/openGauss-workbench!303 commit 53684947b76b5f92df48e7abedbc22b66ea1e686 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Mon Jun 19 14:51:12 2023 +0800 修复导出文件bug、删除多余代码 commit f3403570ddbb894ac87b179240cf7466860c97e4 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Mon Jun 19 11:50:18 2023 +0800 调整创建模式未更新描述 cherry-pick merge request: 调整创建模式未更新描述 53cb0acee1ca5b2996a1a7f02d24376d9e0cbc93 This cherry-pick merge request !302 commit 202c78370d3227ae471132593e0b8cdde3ce558d Merge: 81a8eb5c 53cb0ace Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Mon Jun 19 11:50:18 2023 +0800 merge release-zwr into release merge "release-zwr" into "release" 调整创建模式未更新描述 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7219868 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 调整创建模式未更新描述 See merge request: openGaussythcs00001/openGauss-workbench!302 commit 53cb0acee1ca5b2996a1a7f02d24376d9e0cbc93 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Mon Jun 19 11:49:15 2023 +0800 调整创建模式未更新描述 commit 0be3321bf05ce4eafefe7f29d562bffe87a9c4ff Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Jun 19 11:44:30 2023 +0800 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。 commit 81a8eb5cbfae5fbbf96c9d4b8d45f80393833d58 Merge: af7168e7 47f08c16 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Mon Jun 19 09:16:39 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb Created-by: wuyuebin Author-id: 7158405 MR-id: 7219754 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb See merge request: openGaussythcs00001/openGauss-workbench!301 commit 47f08c1600799fbc5c1afc711d263e08ccb96f0a Merge: b83027b3 af7168e7 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Jun 19 09:14:59 2023 +0800 Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb commit b83027b344a7996743b256d4c1ffc6164b2b1ebd Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Jun 19 09:13:59 2023 +0800 修改操作手册； 修复相关bug commit af7168e75be0483eae30d5fee1c26ff0c1bd8b01 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Mon Jun 19 09:09:14 2023 +0800 更新ds的readme和预览图 commit 7b2e238d135f7fb56366ef81e22aa9acd04bdf08 Merge: 59682143 f7c86af2 Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Mon Jun 19 09:02:44 2023 +0800 merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 连接信息名字限制长度 Created-by: zhangcheng Author-id: 7119759 MR-id: 7219748 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 连接信息名字限制长度 See merge request: openGaussythcs00001/openGauss-workbench!300 commit f7c86af26df821968550a82934cc2af48b62fb95 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Mon Jun 19 09:01:37 2023 +0800 连接信息名字限制长度 commit c8507823eed2f3cbf22d46791ed575e8e46d7a16 Merge: c6dcfdf3 59682143 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Fri Jun 16 17:38:20 2023 +0800 merge release into develop merge "release" into "develop" 修改异常处理, Merge remote-tracking branch 'origin/release' into release, merge develop into release merge "develop" into "release" merge develop into feature-lm merge "develop" into "feature-lm" 修改pg_default问题, 编辑表刷新和关闭更新winId，导出接口做500的错误判断, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 编辑表刷新和关闭更新winId，导出接口做500的错误判断 Created-by: zhangcheng Author-id: 7119759 MR-id: 7217451 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 编辑表刷新和关闭更新winId，导出接口做500的错误判断 See merge request: openGaussythcs00001/openGauss-workbench!247, Merge remote-tracking branch 'origin/release' into release-wyl, Merge remote-tracking branch 'origin/release' into release-wyl, merge develop into release merge "develop" into "release" 版权信息, merge release into develop merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 Created-by: wuyulin Author-id: 7119753 MR-id: 7217325 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 See merge request: openGaussythcs00001/openGauss-workbench!236, merge release into develop merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 Created-by: wuyulin Author-id: 7119753 MR-id: 7217342 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 See merge request: openGaussythcs00001/openGauss-workbench!238, merge release into develop merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 Created-by: wuyulin Author-id: 7119753 MR-id: 7217355 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 See merge request: openGaussythcs00001/openGauss-workbench!240, 缩进和版权, 配置, 仅添加java文件版权, merge release into develop merge "release" into "develop" 分区表问题修改, merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 Created-by: wuyulin Author-id: 7119753 MR-id: 7217395 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 分区表问题修改, merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 See merge request: openGaussythcs00001/openGauss-workbench!242, merge release into develop merge "release" into "develop" 代码格式化, merge feature-wyb into release merge "feature-wyb" into "release" 代码格式化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7217417 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!243, 代码格式化, merge feature-zwr into release merge "feature-zwr" into "release" 代码格式化 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217433 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!244 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217436 Commit-by: zhouwenruo;wuyuebin Created-by: wuyulin Author-id: 7119753 MR-id: 7219562 Commit-by: wuyulin;hw73730920/wuguobiao;luomeng Merged-by: wuyulin Description: merge "release" into "develop" 修改异常处理, Merge remote-tracking branch 'origin/release' into release, merge develop into release merge "develop" into "release" merge develop into feature-lm merge "develop" into "feature-lm" 修改pg_default问题, 编辑表刷新和关闭更新winId，导出接口做500的错误判断, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 编辑表刷新和关闭更新winId，导出接口做500的错误判断 Created-by: zhangcheng Author-id: 7119759 MR-id: 7217451 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 编辑表刷新和关闭更新winId，导出接口做500的错误判断 See merge request: openGaussythcs00001/openGauss-workbench!247, Merge remote-tracking branch 'origin/release' into release-wyl, Merge remote-tracking branch 'origin/release' into release-wyl, merge develop into release merge "develop" into "release" 版权信息, merge release into develop merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 Created-by: wuyulin Author-id: 7119753 MR-id: 7217325 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 See merge request: openGaussythcs00001/openGauss-workbench!236, merge release into develop merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 Created-by: wuyulin Author-id: 7119753 MR-id: 7217342 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 See merge request: openGaussythcs00001/openGauss-workbench!238, merge release into develop merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 Created-by: wuyulin Author-id: 7119753 MR-id: 7217355 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 See merge request: openGaussythcs00001/openGauss-workbench!240, 缩进和版权, 配置, 仅添加java文件版权, merge release into develop merge "release" into "develop" 分区表问题修改, merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 Created-by: wuyulin Author-id: 7119753 MR-id: 7217395 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 分区表问题修改, merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 See merge request: openGaussythcs00001/openGauss-workbench!242, merge release into develop merge "release" into "develop" 代码格式化, merge feature-wyb into release merge "feature-wyb" into "release" 代码格式化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7217417 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!243, 代码格式化, merge feature-zwr into release merge "feature-zwr" into "release" 代码格式化 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217433 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!244 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217436 Commit-by: zhouwenruo;wuyuebin See merge request: openGaussythcs00001/openGauss-workbench!299 commit 596821434a16b203e97d2b1ef631a1ae0a05fe09 Merge: d9b37b08 f07e0561 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Fri Jun 16 17:36:33 2023 +0800 merge release-wyl into release merge "release-wyl" into "release" 修改列问题修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7219559 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改列问题修复 See merge request: openGaussythcs00001/openGauss-workbench!298 commit f07e0561fd5ad2c53318f72bfa7374f805b2a4cf Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri Jun 16 17:35:13 2023 +0800 修改列问题修复 commit d9b37b0899a4c533e750098e6767544b4d70ff53 Merge: 0ab08bc0 4920e038 Author: hw73730920/wuguobiao <4027thg32*Wug126> Date: Fri Jun 16 15:54:44 2023 +0800 Merge remote-tracking branch 'origin/release' into release commit 0ab08bc05f2ceff96c2ec6942ad2230fc7b30342 Author: hw73730920/wuguobiao <4027thg32*Wug126> Date: Fri Jun 16 15:54:17 2023 +0800 修改异常处理 commit 4920e03852b79fcf8b129c86811a61cfe069a683 Merge: f0b453d9 c6dcfdf3 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Fri Jun 16 15:17:36 2023 +0800 merge develop into release merge "develop" into "release" merge develop into feature-lm merge "develop" into "feature-lm" 修改pg_default问题, 编辑表刷新和关闭更新winId，导出接口做500的错误判断, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 编辑表刷新和关闭更新winId，导出接口做500的错误判断 Created-by: zhangcheng Author-id: 7119759 MR-id: 7217451 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 编辑表刷新和关闭更新winId，导出接口做500的错误判断 See merge request: openGaussythcs00001/openGauss-workbench!247, Merge remote-tracking branch 'origin/release' into release-wyl, Merge remote-tracking branch 'origin/release' into release-wyl, merge develop into release merge "develop" into "release" 版权信息, merge release into develop merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 Created-by: wuyulin Author-id: 7119753 MR-id: 7217325 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 See merge request: openGaussythcs00001/openGauss-workbench!236, merge release into develop merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 Created-by: wuyulin Author-id: 7119753 MR-id: 7217342 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 See merge request: openGaussythcs00001/openGauss-workbench!238, merge release into develop merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 Created-by: wuyulin Author-id: 7119753 MR-id: 7217355 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 See merge request: openGaussythcs00001/openGauss-workbench!240, 缩进和版权, 配置, 仅添加java文件版权, merge release into develop merge "release" into "develop" 分区表问题修改, merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 Created-by: wuyulin Author-id: 7119753 MR-id: 7217395 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 分区表问题修改, merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 See merge request: openGaussythcs00001/openGauss-workbench!242, merge release into develop merge "release" into "develop" 代码格式化, merge feature-wyb into release merge "feature-wyb" into "release" 代码格式化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7217417 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!243, 代码格式化, merge feature-zwr into release merge "feature-zwr" into "release" 代码格式化 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217433 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!244 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217436 Commit-by: zhouwenruo;wuyuebin Merged-by: zhouwenruo Description: merge "release" into "develop" 代码格式化, merge feature-wyb into release merge "feature-wyb" i Created-by: luomeng Author-id: 7119743 MR-id: 7219460 Commit-by: luomeng;罗梦;wuyulin Merged-by: luomeng Description: merge "develop" into "release" merge develop into feature-lm merge "develop" into "feature-lm" 修改pg_default问题, 编辑表刷新和关闭更新winId，导出接口做500的错误判断, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 编辑表刷新和关闭更新winId，导出接口做500的错误判断 Created-by: zhangcheng Author-id: 7119759 MR-id: 7217451 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 编辑表刷新和关闭更新winId，导出接口做500的错误判断 See merge request: openGaussythcs00001/openGauss-workbench!247, Merge remote-tracking branch 'origin/release' into release-wyl, Merge remote-tracking branch 'origin/release' into release-wyl, merge develop into release merge "develop" into "release" 版权信息, merge release into develop merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 Created-by: wuyulin Author-id: 7119753 MR-id: 7217325 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 See merge request: openGaussythcs00001/openGauss-workbench!236, merge release into develop merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 Created-by: wuyulin Author-id: 7119753 MR-id: 7217342 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 See merge request: openGaussythcs00001/openGauss-workbench!238, merge release into develop merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 Created-by: wuyulin Author-id: 7119753 MR-id: 7217355 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 See merge request: openGaussythcs00001/openGauss-workbench!240, 缩进和版权, 配置, 仅添加java文件版权, merge release into develop merge "release" into "develop" 分区表问题修改, merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 Created-by: wuyulin Author-id: 7119753 MR-id: 7217395 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 分区表问题修改, merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 See merge request: openGaussythcs00001/openGauss-workbench!242, merge release into develop merge "release" into "develop" 代码格式化, merge feature-wyb into release merge "feature-wyb" into "release" 代码格式化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7217417 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!243, 代码格式化, merge feature-zwr into release merge "feature-zwr" into "release" 代码格式化 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217433 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!244 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217436 Commit-by: zhouwenruo;wuyuebin Merged-by: zhouwenruo Description: merge "release" into "develop" 代码格式化, merge feature-wyb into release merge "feature-wyb" i See merge request: openGaussythcs00001/openGauss-workbench!297 commit 03ce68cc20bd42fc602b6723d44bf0bc8c338e67 Merge: 999bb462 c6dcfdf3 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Fri Jun 16 15:17:02 2023 +0800 merge develop into feature-lm merge "develop" into "feature-lm" 提交等待事件统计代码, 修改样式, Squashed commit of the following: commit ae724aec71fed5b5351ed9f1d05b73be72d5d292 Merge: 84970cb9 78c32bbd Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:47:30 2023 +0800 Merge branch 'develop' into dev-zhy commit 84970cb9a70db7560fac4ac6e402f6279d99e0cf Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:44:39 2023 +0800 添加字段.移除无效文件,改名, 配置, 打包, 更新用户操作手册, merge release-zwr into release merge "release-zwr" into "release" 更新用户操作手册 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7218971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 更新用户操作手册 See merge request: openGaussythcs00001/openGauss-workbench!285, 修复编辑表的关闭winId、默认列类型，新建表索引访问方式, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 修复编辑表的关闭winId、默认列类型，新建表索引访问方式 Created-by: zhangcheng Author-id: 7119759 MR-id: 7218984 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 修复编辑表的关闭winId、默认列类型，新建表索引访问方式 See merge request: openGaussythcs00001/openGauss-workbench!286, merge develop into release merge "develop" into "release" merge release into develop merge "release" into "develop" merge develop into release merge "develop" into "release" merge develop into feature-lm merge "develop" into "feature-lm" 修改sqlite初始化方式, Revert "提交代码" This reverts commit e103ff955ec521cc063adca87b25257b28405b0f, sqliteinit, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 告警中心前端代码, 告警中心后端代码, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge develop into release merge "develop" into "release" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 调整部分编辑表的功能, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 Created-by: zhangcheng Author-id: 7119759 MR-id: 7209563 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 See merge request: openGaussythcs00001/openGauss-workbench!126, 数据更新联调问题修复, merge feature-wyl into develop merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7209762 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 See merge request: openGaussythcs00001/openGauss-workbench!127, 生成函数覆盖率报告, Merge remote-tracking branch 'origin/develop' into feature-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/util/DebugUtils.java # plugins/data-studio/src/main/resources/messages_en_US.properties # plugins/data-studio/src/main/resources/messages_zh_CN.properties, 生成函数覆盖率报告, merge feature-zwr into develop merge "feature-zwr" into "develop" 生成函数覆盖率报告 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7209971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 生成函数覆盖率报告 See merge request: openGaussythcs00001/openGauss-workbench!128, 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 Created-by: zhangcheng Author-id: 7119759 MR-id: 7210033 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 See merge request: openGaussythcs00001/openGauss-workbench!130, 调整文件, 生成函数覆盖率报告, 导出视图、序列DDL功能, 导出DDL页面, 创建表, resultSet添加try去捕获, 添加导出函数，模式DDL接口, merge feature-zwr into develop merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7210854 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 See merge request: openGaussythcs00001/openGauss-workbench!131, 1, merge feature-wyl into develop merge "feature-wyl" into "develop" 创建表, 1 Created-by: wuyulin Author-id: 7119753 MR-id: 7210950 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 创建表, 1 See merge request: openGaussythcs00001/openGauss-workbench!132, Merge remote-tracking branch 'origin/develop' into feature-wyl, 导出DDL接口联调, 添加导出表数据接口, merge feature-zwr into develop merge "feature-zwr" into "develop" 添加导出表数据接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7211802 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 添加导出表数据接口 See merge request: openGaussythcs00001/openGauss-w Created-by: luomeng Author-id: 7119743 MR-id: 7219459 Commit-by: luomeng;wuyulin;liupengfei;张昊宇;zhangcheng;yangzihao;zhouwenruo;Zihao Yang Merged-by: luomeng Description: merge "develop" into "feature-lm" 提交等待事件统计代码, 修改样式, Squashed commit of the following: commit ae724aec71fed5b5351ed9f1d05b73be72d5d292 Merge: 84970cb9 78c32bbd Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:47:30 2023 +0800 Merge branch 'develop' into dev-zhy commit 84970cb9a70db7560fac4ac6e402f6279d99e0cf Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:44:39 2023 +0800 添加字段.移除无效文件,改名, 配置, 打包, 更新用户操作手册, merge release-zwr into release merge "release-zwr" into "release" 更新用户操作手册 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7218971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 更新用户操作手册 See merge request: openGaussythcs00001/openGauss-workbench!285, 修复编辑表的关闭winId、默认列类型，新建表索引访问方式, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 修复编辑表的关闭winId、默认列类型，新建表索引访问方式 Created-by: zhangcheng Author-id: 7119759 MR-id: 7218984 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 修复编辑表的关闭winId、默认列类型，新建表索引访问方式 See merge request: openGaussythcs00001/openGauss-workbench!286, merge develop into release merge "develop" into "release" merge release into develop merge "release" into "develop" merge develop into release merge "develop" into "release" merge develop into feature-lm merge "develop" into "feature-lm" 修改sqlite初始化方式, Revert "提交代码" This reverts commit e103ff955ec521cc063adca87b25257b28405b0f, sqliteinit, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 告警中心前端代码, 告警中心后端代码, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge develop into release merge "develop" into "release" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 调整部分编辑表的功能, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 Created-by: zhangcheng Author-id: 7119759 MR-id: 7209563 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 See merge request: openGaussythcs00001/openGauss-workbench!126, 数据更新联调问题修复, merge feature-wyl into develop merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7209762 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 See merge request: openGaussythcs00001/openGauss-workbench!127, 生成函数覆盖率报告, Merge remote-tracking branch 'origin/develop' into feature-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/util/DebugUtils.java # plugins/data-studio/src/main/resources/messages_en_US.properties # plugins/data-studio/src/main/resources/messages_zh_CN.properties, 生成函数覆盖率报告, merge feature-zwr into develop merge "feature-zwr" into "develop" 生成函数覆盖率报告 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7209971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 生成函数覆盖率报告 See merge request: openGaussythcs00001/openGauss-workbench!128, 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 Created-by: zhangcheng Author-id: 7119759 MR-id: 7210033 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 See merge request: openGaussythcs00001/openGauss-workbench!130, 调整文件, 生成函数覆盖率报告, 导出视图、序列DDL功能, 导出DDL页面, 创建表, resultSet添加try去捕获, 添加导出函数，模式DDL接口, merge feature-zwr into develop merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7210854 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 See merge request: openGaussythcs00001/openGauss-workbench!131, 1, merge feature-wyl into develop merge "feature-wyl" into "develop" 创建表, 1 Created-by: wuyulin Author-id: 7119753 MR-id: 7210950 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 创建表, 1 See merge request: openGaussythcs00001/openGauss-workbench!132, Merge remote-tracking branch 'origin/develop' into feature-wyl, 导出DDL接口联调, 添加导出表数据接口, merge feature-zwr into develop merge "feature-zwr" into "develop" 添加导出表数据接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7211802 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 添加导出表数据接口 See merge request: openGaussythcs00001/openGauss-w See merge request: openGaussythcs00001/openGauss-workbench!296 commit c6dcfdf3dc43c04551490dea840b21f040bc1eb0 Merge: 4dd2a41e 999bb462 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Fri Jun 16 15:16:35 2023 +0800 merge feature-lm into develop merge "feature-lm" into "develop" merge develop into feature-lm merge "develop" into "feature-lm" 修改pg_default问题, 编辑表刷新和关闭更新winId，导出接口做500的错误判断, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 编辑表刷新和关闭更新winId，导出接口做500的错误判断 Created-by: zhangcheng Author-id: 7119759 MR-id: 7217451 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 编辑表刷新和关闭更新winId，导出接口做500的错误判断 See merge request: openGaussythcs00001/openGauss-workbench!247, Merge remote-tracking branch 'origin/release' into release-wyl, Merge remote-tracking branch 'origin/release' into release-wyl, merge develop into release merge "develop" into "release" 版权信息, merge release into develop merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 Created-by: wuyulin Author-id: 7119753 MR-id: 7217325 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 See merge request: openGaussythcs00001/openGauss-workbench!236, merge release into develop merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 Created-by: wuyulin Author-id: 7119753 MR-id: 7217342 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 See merge request: openGaussythcs00001/openGauss-workbench!238, merge release into develop merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 Created-by: wuyulin Author-id: 7119753 MR-id: 7217355 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 See merge request: openGaussythcs00001/openGauss-workbench!240, 缩进和版权, 配置, 仅添加java文件版权, merge release into develop merge "release" into "develop" 分区表问题修改, merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 Created-by: wuyulin Author-id: 7119753 MR-id: 7217395 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 分区表问题修改, merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 See merge request: openGaussythcs00001/openGauss-workbench!242, merge release into develop merge "release" into "develop" 代码格式化, merge feature-wyb into release merge "feature-wyb" into "release" 代码格式化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7217417 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!243, 代码格式化, merge feature-zwr into release merge "feature-zwr" into "release" 代码格式化 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217433 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!244 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217436 Commit-by: zhouwenruo;wuyuebin Merged-by: zhouwenruo Description: merge "release" into "develop" 代码格式化, merge feature-wyb into release merge "feature-wyb Created-by: luomeng Author-id: 7119743 MR-id: 7219458 Commit-by: 罗梦;luomeng Merged-by: luomeng Description: merge "feature-lm" into "develop" merge develop into feature-lm merge "develop" into "feature-lm" 修改pg_default问题, 编辑表刷新和关闭更新winId，导出接口做500的错误判断, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 编辑表刷新和关闭更新winId，导出接口做500的错误判断 Created-by: zhangcheng Author-id: 7119759 MR-id: 7217451 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 编辑表刷新和关闭更新winId，导出接口做500的错误判断 See merge request: openGaussythcs00001/openGauss-workbench!247, Merge remote-tracking branch 'origin/release' into release-wyl, Merge remote-tracking branch 'origin/release' into release-wyl, merge develop into release merge "develop" into "release" 版权信息, merge release into develop merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 Created-by: wuyulin Author-id: 7119753 MR-id: 7217325 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 See merge request: openGaussythcs00001/openGauss-workbench!236, merge release into develop merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 Created-by: wuyulin Author-id: 7119753 MR-id: 7217342 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 See merge request: openGaussythcs00001/openGauss-workbench!238, merge release into develop merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 Created-by: wuyulin Author-id: 7119753 MR-id: 7217355 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 See merge request: openGaussythcs00001/openGauss-workbench!240, 缩进和版权, 配置, 仅添加java文件版权, merge release into develop merge "release" into "develop" 分区表问题修改, merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 Created-by: wuyulin Author-id: 7119753 MR-id: 7217395 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 分区表问题修改, merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 See merge request: openGaussythcs00001/openGauss-workbench!242, merge release into develop merge "release" into "develop" 代码格式化, merge feature-wyb into release merge "feature-wyb" into "release" 代码格式化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7217417 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!243, 代码格式化, merge feature-zwr into release merge "feature-zwr" into "release" 代码格式化 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217433 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!244 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217436 Commit-by: zhouwenruo;wuyuebin Merged-by: zhouwenruo Description: merge "release" into "develop" 代码格式化, merge feature-wyb into release merge "feature-wyb See merge request: openGaussythcs00001/openGauss-workbench!295 commit f0b453d9495406ccd373a5ce38064ba45ff7a800 Merge: ea00f0ab e570f93c Author: hw73730920/wuguobiao <4027thg32*Wug126> Date: Fri Jun 16 15:16:20 2023 +0800 Merge remote-tracking branch 'origin/release' into release commit ea00f0ab1760864d2e1454fdb175a0defcdcbee7 Author: hw73730920/wuguobiao <4027thg32*Wug126> Date: Fri Jun 16 15:15:49 2023 +0800 修改异常处理 commit 999bb462b959b1542415271ad698a6e674d71a70 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Fri Jun 16 15:15:11 2023 +0800 历史数据诊断-修复BUG、修复CodeCheck，剩余功能开发 commit 4dd2a41ee68d1b70975c2e3e79a1237b8325df3c Merge: 313f3767 e570f93c Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Fri Jun 16 15:07:50 2023 +0800 merge release into develop merge "release" into "develop" 配置, agent获取数据修改, 创建表问题修复, Merge branch 'develop' into release, 修改列问题, bug, merge release-wyl into release merge "release-wyl" into "release" 创建表问题修复, 修改列问题, bug Created-by: wuyulin Author-id: 7119753 MR-id: 7219450 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 创建表问题修复, 修改列问题, bug See merge request: openGaussythcs00001/openGauss-workbench!293 Created-by: wuyulin Author-id: 7119753 MR-id: 7219452 Commit-by: wuyulin;liupengfei;张昊宇 Merged-by: wuyulin Description: merge "release" into "develop" 配置, agent获取数据修改, 创建表问题修复, Merge branch 'develop' into release, 修改列问题, bug, merge release-wyl into release merge "release-wyl" into "release" 创建表问题修复, 修改列问题, bug Created-by: wuyulin Author-id: 7119753 MR-id: 7219450 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 创建表问题修复, 修改列问题, bug See merge request: openGaussythcs00001/openGauss-workbench!293 See merge request: openGaussythcs00001/openGauss-workbench!294 commit e570f93c17d6518d62037c18d53939acbadaea05 Merge: 2a70f627 2a7ed1b0 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Fri Jun 16 15:07:29 2023 +0800 merge release-wyl into release merge "release-wyl" into "release" 创建表问题修复, 修改列问题, bug Created-by: wuyulin Author-id: 7119753 MR-id: 7219450 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 创建表问题修复, 修改列问题, bug See merge request: openGaussythcs00001/openGauss-workbench!293 commit 2a7ed1b09a369d51fb16010f4e2f4e8b6c4fe005 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri Jun 16 15:06:43 2023 +0800 bug commit e4b21251c6098c56f5e64d9c909580054fb04cba Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri Jun 16 14:39:16 2023 +0800 修改列问题 commit 2a70f627232edbfa25f68768da99fa55b5ad4f7a Merge: c54a6137 313f3767 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Fri Jun 16 14:34:12 2023 +0800 Merge branch 'develop' into release commit 313f3767ba8c0e95c411a9edf60c318995b0f07e Merge: c4fddc88 ee7a9cce Author: liupengfei <liupengfei@ncti-gba.cn> Date: Fri Jun 16 14:33:08 2023 +0800 Merge remote-tracking branch 'origin/develop' into develop commit c4fddc88a5666da864d6c73fbe436182516f15a7 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Fri Jun 16 14:32:20 2023 +0800 添加会话详情路由 commit 727e72f320e1d0c2017284a031f7c47b5a8fec8f Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri Jun 16 11:11:59 2023 +0800 创建表问题修复 commit c54a613753c91ce7524e4c1fd098cf84e5d8a61e Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Jun 16 10:01:49 2023 +0800 agent获取数据修改 commit 400713c8c02d92825e8288a024ef117003f54e84 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 14:21:40 2023 +0800 配置 commit ee7a9cce7f0d151d2ada7251f117652d51a9149f Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Jun 16 10:01:49 2023 +0800 agent获取数据修改 commit c66df603b64ad44ee9c8d658670eb3d0ba14eb71 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 14:21:40 2023 +0800 配置 commit 43ac0ec817a5f8bce722fb9750e610921a0bd1fb Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Jun 16 10:01:49 2023 +0800 agent获取数据修改 commit 6c06a7beeb0b49dd33a8f2211a04ea7c3ebefa5c Merge: c0a179bf 52d7ac2a Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Thu Jun 15 17:39:56 2023 +0800 merge release into develop merge "release" into "develop" 提交等待事件统计代码, 修改样式, Squashed commit of the following: commit ae724aec71fed5b5351ed9f1d05b73be72d5d292 Merge: 84970cb9 78c32bbd Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:47:30 2023 +0800 Merge branch 'develop' into dev-zhy commit 84970cb9a70db7560fac4ac6e402f6279d99e0cf Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:44:39 2023 +0800 添加字段.移除无效文件,改名, 配置, 打包, 更新用户操作手册, merge release-zwr into release merge "release-zwr" into "release" 更新用户操作手册 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7218971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 更新用户操作手册 See merge request: openGaussythcs00001/openGauss-workbench!285, 修复编辑表的关闭winId、默认列类型，新建表索引访问方式, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 修复编辑表的关闭winId、默认列类型，新建表索引访问方式 Created-by: zhangcheng Author-id: 7119759 MR-id: 7218984 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 修复编辑表的关闭winId、默认列类型，新建表索引访问方式 See merge request: openGaussythcs00001/openGauss-workbench!286, merge develop into release merge "develop" into "release" merge release into develop merge "release" into "develop" merge develop into release merge "develop" into "release" merge develop into feature-lm merge "develop" into "feature-lm" 修改sqlite初始化方式, Revert "提交代码" This reverts commit e103ff955ec521cc063adca87b25257b28405b0f, sqliteinit, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 告警中心前端代码, 告警中心后端代码, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge develop into release merge "develop" into "release" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 调整部分编辑表的功能, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 Created-by: zhangcheng Author-id: 7119759 MR-id: 7209563 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 See merge request: openGaussythcs00001/openGauss-workbench!126, 数据更新联调问题修复, merge feature-wyl into develop merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7209762 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 See merge request: openGaussythcs00001/openGauss-workbench!127, 生成函数覆盖率报告, Merge remote-tracking branch 'origin/develop' into feature-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/util/DebugUtils.java # plugins/data-studio/src/main/resources/messages_en_US.properties # plugins/data-studio/src/main/resources/messages_zh_CN.properties, 生成函数覆盖率报告, merge feature-zwr into develop merge "feature-zwr" into "develop" 生成函数覆盖率报告 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7209971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 生成函数覆盖率报告 See merge request: openGaussythcs00001/openGauss-workbench!128, 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 Created-by: zhangcheng Author-id: 7119759 MR-id: 7210033 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 See merge request: openGaussythcs00001/openGauss-workbench!130, 调整文件, 生成函数覆盖率报告, 导出视图、序列DDL功能, 导出DDL页面, 创建表, resultSet添加try去捕获, 添加导出函数，模式DDL接口, merge feature-zwr into develop merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7210854 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 See merge request: openGaussythcs00001/openGauss-workbench!131, 1, merge feature-wyl into develop merge "feature-wyl" into "develop" 创建表, 1 Created-by: wuyulin Author-id: 7119753 MR-id: 7210950 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 创建表, 1 See merge request: openGaussythcs00001/openGauss-workbench!132, Merge remote-tracking branch 'origin/develop' into feature-wyl, 导出DDL接口联调, 添加导出表数据接口, merge feature-zwr into develop merge "feature-zwr" into "develop" 添加导出表数据接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7211802 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 添加导出表数据接口 See merge request: openGaussythcs00001/openGauss-work Created-by: wuyulin Author-id: 7119753 MR-id: 7219189 Commit-by: wuyulin;zhangcheng;yangzihao;zhouwenruo;张昊宇;Zihao Yang Merged-by: wuyulin Description: merge "release" into "develop" 提交等待事件统计代码, 修改样式, Squashed commit of the following: commit ae724aec71fed5b5351ed9f1d05b73be72d5d292 Merge: 84970cb9 78c32bbd Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:47:30 2023 +0800 Merge branch 'develop' into dev-zhy commit 84970cb9a70db7560fac4ac6e402f6279d99e0cf Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:44:39 2023 +0800 添加字段.移除无效文件,改名, 配置, 打包, 更新用户操作手册, merge release-zwr into release merge "release-zwr" into "release" 更新用户操作手册 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7218971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 更新用户操作手册 See merge request: openGaussythcs00001/openGauss-workbench!285, 修复编辑表的关闭winId、默认列类型，新建表索引访问方式, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 修复编辑表的关闭winId、默认列类型，新建表索引访问方式 Created-by: zhangcheng Author-id: 7119759 MR-id: 7218984 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 修复编辑表的关闭winId、默认列类型，新建表索引访问方式 See merge request: openGaussythcs00001/openGauss-workbench!286, merge develop into release merge "develop" into "release" merge release into develop merge "release" into "develop" merge develop into release merge "develop" into "release" merge develop into feature-lm merge "develop" into "feature-lm" 修改sqlite初始化方式, Revert "提交代码" This reverts commit e103ff955ec521cc063adca87b25257b28405b0f, sqliteinit, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 告警中心前端代码, 告警中心后端代码, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge develop into release merge "develop" into "release" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 调整部分编辑表的功能, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 Created-by: zhangcheng Author-id: 7119759 MR-id: 7209563 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 See merge request: openGaussythcs00001/openGauss-workbench!126, 数据更新联调问题修复, merge feature-wyl into develop merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7209762 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 See merge request: openGaussythcs00001/openGauss-workbench!127, 生成函数覆盖率报告, Merge remote-tracking branch 'origin/develop' into feature-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/util/DebugUtils.java # plugins/data-studio/src/main/resources/messages_en_US.properties # plugins/data-studio/src/main/resources/messages_zh_CN.properties, 生成函数覆盖率报告, merge feature-zwr into develop merge "feature-zwr" into "develop" 生成函数覆盖率报告 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7209971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 生成函数覆盖率报告 See merge request: openGaussythcs00001/openGauss-workbench!128, 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 Created-by: zhangcheng Author-id: 7119759 MR-id: 7210033 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 See merge request: openGaussythcs00001/openGauss-workbench!130, 调整文件, 生成函数覆盖率报告, 导出视图、序列DDL功能, 导出DDL页面, 创建表, resultSet添加try去捕获, 添加导出函数，模式DDL接口, merge feature-zwr into develop merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7210854 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 See merge request: openGaussythcs00001/openGauss-workbench!131, 1, merge feature-wyl into develop merge "feature-wyl" into "develop" 创建表, 1 Created-by: wuyulin Author-id: 7119753 MR-id: 7210950 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 创建表, 1 See merge request: openGaussythcs00001/openGauss-workbench!132, Merge remote-tracking branch 'origin/develop' into feature-wyl, 导出DDL接口联调, 添加导出表数据接口, merge feature-zwr into develop merge "feature-zwr" into "develop" 添加导出表数据接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7211802 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 添加导出表数据接口 See merge request: openGaussythcs00001/openGauss-work See merge request: openGaussythcs00001/openGauss-workbench!292 commit 52d7ac2a1a352c1a05eab6e1df1098cc6c0f6b5e Merge: db14b63e 5ee15892 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Thu Jun 15 17:39:32 2023 +0800 merge release-wyl into release merge "release-wyl" into "release" 创建表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7219188 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 创建表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!291 commit 5ee15892bdb57898ceb4f4d38fb9acc873f57153 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Thu Jun 15 17:38:37 2023 +0800 创建表问题修改 commit c0a179bfaa5226b062b4774d652342f89f8dc4e1 Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Thu Jun 15 17:32:44 2023 +0800 修复编辑表索引的默认值 cherry-pick merge request: 修复编辑表索引的默认值 aa697891240246d7da36886b5d53d852fb5fc3e8 This cherry-pick merge request !290 commit db14b63eeb34ada68a0ba83884a549268fa22490 Merge: e0c52368 aa697891 Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Thu Jun 15 17:32:44 2023 +0800 merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 修复编辑表索引的默认值 Created-by: zhangcheng Author-id: 7119759 MR-id: 7219185 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 修复编辑表索引的默认值 See merge request: openGaussythcs00001/openGauss-workbench!290 commit aa697891240246d7da36886b5d53d852fb5fc3e8 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Thu Jun 15 17:31:06 2023 +0800 修复编辑表索引的默认值 commit 1822305bd197f84b1e7da946e9d554fc69aa288e Merge: 30a9ce0d aa838d5b Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Thu Jun 15 14:18:44 2023 +0800 merge develop into feature-lm merge "develop" into "feature-lm" 用户操作手册, merge feature-wyb into release merge "feature-wyb" into "release" 用户操作手册 Created-by: wuyuebin Author-id: 7158405 MR-id: 7218132 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 用户操作手册 See merge request: openGaussythcs00001/openGauss-workbench!273, 兼容性修改, 兼容性修改, 添加字段.移除无效文件,改名, 提交等待事件统计代码, 增加锁分析诊断点, 修改样式, Squashed commit of the following: commit ae724aec71fed5b5351ed9f1d05b73be72d5d292 Merge: 84970cb9 78c32bbd Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:47:30 2023 +0800 Merge branch 'develop' into dev-zhy commit 84970cb9a70db7560fac4ac6e402f6279d99e0cf Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:44:39 2023 +0800 添加字段.移除无效文件,改名, 文档更新, 配置, 修复bug, merge release-wyl into release merge "release-wyl" into "release" 兼容性修改, 兼容性修改, 修复bug Created-by: zhouwenruo Author-id: 7119763 MR-id: 7218349 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-wyl" into "release" 兼容性修改, 兼容性修改, 修复bug See merge request: openGaussythcs00001/openGauss-workbench!277, 修复bug cherry-pick merge request: 兼容性修改, 兼容性修改, 修复bug 7849335d48367908dc8dd855db5ecf76382df963 This cherry-pick merge request !277, 修复bug, merge release-wyl into release merge "release-wyl" into "release" 修复bug Created-by: zhouwenruo Author-id: 7119763 MR-id: 7218440 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-wyl" into "release" 修复bug See merge request: openGaussythcs00001/openGauss-workbench!278, 修复bug cherry-pick merge request: 修复bug b2723921fabcd238ac68ebaed01cbd38702986bf This cherry-pick merge request !278, 调整没有参数名的函数/过程解析, terminal-editor修改参数弹窗格式, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" terminal-editor修改参数弹窗格式 Created-by: zhangcheng Author-id: 7119759 MR-id: 7218563 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" terminal-editor修改参数弹窗格式 See merge request: openGaussythcs00001/openGauss-workbench!279, merge release-wyl into release merge "release-wyl" into "release" 调整没有参数名的函数/过程解析 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7218564 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-wyl" into "release" 调整没有参数名的函数/过程解析 See merge request: openGaussythcs00001/openGauss-workbench!280, 调整没有参数名的函数/过程解析 cherry-pick merge request: 调整没有参数名的函数/过程解析 7b69abead79ac7b845dcfd1ff5e00f1eab59e6c9 This cherry-pick merge request !280, 添加字段.移除无效文件,改名, Squashed commit of the following: commit ae724aec71fed5b5351ed9f1d05b73be72d5d292 Merge: 84970cb9 78c32bbd Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:47:30 2023 +0800 Merge branch 'develop' into dev-zhy commit 84970cb9a70db7560fac4ac6e402f6279d99e0cf Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:44:39 2023 +0800 添加字段.移除无效文件,改名, 文档更新, 修复查看已被删除的函数/过程没有提示的问题, Merge remote-tracking branch 'origin/release' into release-wyl, 修复查看已被删除的函数/过程没有提示的问题, merge release-wyl into release merge "release-wyl" into "release" 修复查看已被删除的函数/过程没有提示的问题, Merge remote-tracking branch 'origin/release' into release-wyl, 修复查看已被删除的函数/过程没有提示的问题 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7218682 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-wyl" into "release" 修复查看已被删除的函数/过程没有提示的问题, Merge remote-tracking branch 'origin/release' into release-wyl, 修复查看已被删除的函数/过程没有提示的问题 See merge request: openGaussythcs00001/openGauss-workbench!281, 修复查看已被删除的函数/过程没有提示的问题 cherry-pick merge request: 修复查看已被删除的函数/过程没有提示的问题 ca765a18d90a0e464a151b9bf4e88a3c5a881aa8 This cherry-pick merge request !281, 1、修改告警记录、告警配置、告警模板相关样式 2、修复bug: 告警记录，统计图中没有显示数量。 告警记录，列表记录告警等级和告警状态，没有显示对应的图标。 告警记录，列表记录的持续时间格式应为：hh:mm:ss。 告警配置，搜索输入框提示应为“请输入集群/实例名称” 告警模板，搜索输入框输入内容，规则搜索输入框会同步显示。 告警模板，页数选择20条/页，模板列表记录显示不全，没有下拉进度条。, merge feature-wyb into release merge "feature-wyb" into "release" 1、修改告警记录、告警配置、告警模板相关样式 2、修复bug: 告警记录，统计图中没有显示数量。 告警记录，列表记录告警等级和告警状态，没有显示对应的图标。 告警记录，列表记录的持续时间格式应为：hh:mm:ss。 告警配置，搜索输入框提示应为“请输入集群/实例名称” 告警模板，搜索输入框输入内容，规则搜索输入框会同步显示。 告警模板，页数选择20条/页，模板列表记录显示不全，没有下拉进度条。 Created-by: wuyuebin Author-id: 7158405 MR-id: 7218851 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 1、修改告警记录、告警配置、告警模板相关样式 2、修复bug: 告警记录，统计图中没有显示数量。 告警记录，列表记录告警等级和告警状态，没有显示对应的图标。 告警记录，列表记录的持续时间格式应为：hh:mm:ss。 告警配置，搜索输入框提示应为“请输入集群/实例名称” 告警模板，搜索输入框输入内容，规则搜索输入框会同步显示。 告警模板，页数选择20条/页，模板列表记录显示不全，没有下拉进度条。 See merge request: openGaussythcs00001/openGauss-workbench!282, PR修改, Merge branch 'release-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into release-wyl, merge release-wyl into release merge "release-wyl" into "release" PR修改, Merge branch 'release-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into release-wyl Created-by: wuyulin Author-id: 7119753 MR-id: 7218935 Commit-by: wuyulin Merged-by: wu Created-by: luomeng Author-id: 7119743 MR-id: 7219035 Commit-by: yangzihao;Zihao Yang;zhangcheng;zhouwenruo;张昊宇;wuyulin;wuyuebin Merged-by: luomeng Description: merge "develop" into "feature-lm" 用户操作手册, merge feature-wyb into release merge "feature-wyb" into "release" 用户操作手册 Created-by: wuyuebin Author-id: 7158405 MR-id: 7218132 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 用户操作手册 See merge request: openGaussythcs00001/openGauss-workbench!273, 兼容性修改, 兼容性修改, 添加字段.移除无效文件,改名, 提交等待事件统计代码, 增加锁分析诊断点, 修改样式, Squashed commit of the following: commit ae724aec71fed5b5351ed9f1d05b73be72d5d292 Merge: 84970cb9 78c32bbd Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:47:30 2023 +0800 Merge branch 'develop' into dev-zhy commit 84970cb9a70db7560fac4ac6e402f6279d99e0cf Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:44:39 2023 +0800 添加字段.移除无效文件,改名, 文档更新, 配置, 修复bug, merge release-wyl into release merge "release-wyl" into "release" 兼容性修改, 兼容性修改, 修复bug Created-by: zhouwenruo Author-id: 7119763 MR-id: 7218349 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-wyl" into "release" 兼容性修改, 兼容性修改, 修复bug See merge request: openGaussythcs00001/openGauss-workbench!277, 修复bug cherry-pick merge request: 兼容性修改, 兼容性修改, 修复bug 7849335d48367908dc8dd855db5ecf76382df963 This cherry-pick merge request !277, 修复bug, merge release-wyl into release merge "release-wyl" into "release" 修复bug Created-by: zhouwenruo Author-id: 7119763 MR-id: 7218440 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-wyl" into "release" 修复bug See merge request: openGaussythcs00001/openGauss-workbench!278, 修复bug cherry-pick merge request: 修复bug b2723921fabcd238ac68ebaed01cbd38702986bf This cherry-pick merge request !278, 调整没有参数名的函数/过程解析, terminal-editor修改参数弹窗格式, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" terminal-editor修改参数弹窗格式 Created-by: zhangcheng Author-id: 7119759 MR-id: 7218563 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" terminal-editor修改参数弹窗格式 See merge request: openGaussythcs00001/openGauss-workbench!279, merge release-wyl into release merge "release-wyl" into "release" 调整没有参数名的函数/过程解析 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7218564 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-wyl" into "release" 调整没有参数名的函数/过程解析 See merge request: openGaussythcs00001/openGauss-workbench!280, 调整没有参数名的函数/过程解析 cherry-pick merge request: 调整没有参数名的函数/过程解析 7b69abead79ac7b845dcfd1ff5e00f1eab59e6c9 This cherry-pick merge request !280, 添加字段.移除无效文件,改名, Squashed commit of the following: commit ae724aec71fed5b5351ed9f1d05b73be72d5d292 Merge: 84970cb9 78c32bbd Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:47:30 2023 +0800 Merge branch 'develop' into dev-zhy commit 84970cb9a70db7560fac4ac6e402f6279d99e0cf Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:44:39 2023 +0800 添加字段.移除无效文件,改名, 文档更新, 修复查看已被删除的函数/过程没有提示的问题, Merge remote-tracking branch 'origin/release' into release-wyl, 修复查看已被删除的函数/过程没有提示的问题, merge release-wyl into release merge "release-wyl" into "release" 修复查看已被删除的函数/过程没有提示的问题, Merge remote-tracking branch 'origin/release' into release-wyl, 修复查看已被删除的函数/过程没有提示的问题 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7218682 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-wyl" into "release" 修复查看已被删除的函数/过程没有提示的问题, Merge remote-tracking branch 'origin/release' into release-wyl, 修复查看已被删除的函数/过程没有提示的问题 See merge request: openGaussythcs00001/openGauss-workbench!281, 修复查看已被删除的函数/过程没有提示的问题 cherry-pick merge request: 修复查看已被删除的函数/过程没有提示的问题 ca765a18d90a0e464a151b9bf4e88a3c5a881aa8 This cherry-pick merge request !281, 1、修改告警记录、告警配置、告警模板相关样式 2、修复bug: 告警记录，统计图中没有显示数量。 告警记录，列表记录告警等级和告警状态，没有显示对应的图标。 告警记录，列表记录的持续时间格式应为：hh:mm:ss。 告警配置，搜索输入框提示应为“请输入集群/实例名称” 告警模板，搜索输入框输入内容，规则搜索输入框会同步显示。 告警模板，页数选择20条/页，模板列表记录显示不全，没有下拉进度条。, merge feature-wyb into release merge "feature-wyb" into "release" 1、修改告警记录、告警配置、告警模板相关样式 2、修复bug: 告警记录，统计图中没有显示数量。 告警记录，列表记录告警等级和告警状态，没有显示对应的图标。 告警记录，列表记录的持续时间格式应为：hh:mm:ss。 告警配置，搜索输入框提示应为“请输入集群/实例名称” 告警模板，搜索输入框输入内容，规则搜索输入框会同步显示。 告警模板，页数选择20条/页，模板列表记录显示不全，没有下拉进度条。 Created-by: wuyuebin Author-id: 7158405 MR-id: 7218851 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 1、修改告警记录、告警配置、告警模板相关样式 2、修复bug: 告警记录，统计图中没有显示数量。 告警记录，列表记录告警等级和告警状态，没有显示对应的图标。 告警记录，列表记录的持续时间格式应为：hh:mm:ss。 告警配置，搜索输入框提示应为“请输入集群/实例名称” 告警模板，搜索输入框输入内容，规则搜索输入框会同步显示。 告警模板，页数选择20条/页，模板列表记录显示不全，没有下拉进度条。 See merge request: openGaussythcs00001/openGauss-workbench!282, PR修改, Merge branch 'release-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into release-wyl, merge release-wyl into release merge "release-wyl" into "release" PR修改, Merge branch 'release-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into release-wyl Created-by: wuyulin Author-id: 7119753 MR-id: 7218935 Commit-by: wuyulin Merged-by: wu See merge request: openGaussythcs00001/openGauss-workbench!289 commit e0c52368c3f250a1ea52666bc5d11d0385fe12cb Merge: 3055e555 aa838d5b Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Thu Jun 15 11:37:21 2023 +0800 merge develop into release merge "develop" into "release" merge release into develop merge "release" into "develop" merge develop into release merge "develop" into "release" merge develop into feature-lm merge "develop" into "feature-lm" 修改sqlite初始化方式, Revert "提交代码" This reverts commit e103ff955ec521cc063adca87b25257b28405b0f, sqliteinit, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 告警中心前端代码, 告警中心后端代码, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge develop into release merge "develop" into "release" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 调整部分编辑表的功能, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 Created-by: zhangcheng Author-id: 7119759 MR-id: 7209563 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 See merge request: openGaussythcs00001/openGauss-workbench!126, 数据更新联调问题修复, merge feature-wyl into develop merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7209762 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 See merge request: openGaussythcs00001/openGauss-workbench!127, 生成函数覆盖率报告, Merge remote-tracking branch 'origin/develop' into feature-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/util/DebugUtils.java # plugins/data-studio/src/main/resources/messages_en_US.properties # plugins/data-studio/src/main/resources/messages_zh_CN.properties, 生成函数覆盖率报告, merge feature-zwr into develop merge "feature-zwr" into "develop" 生成函数覆盖率报告 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7209971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 生成函数覆盖率报告 See merge request: openGaussythcs00001/openGauss-workbench!128, 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 Created-by: zhangcheng Author-id: 7119759 MR-id: 7210033 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 See merge request: openGaussythcs00001/openGauss-workbench!130, 调整文件, 生成函数覆盖率报告, 导出视图、序列DDL功能, 导出DDL页面, 创建表, resultSet添加try去捕获, 添加导出函数，模式DDL接口, merge feature-zwr into develop merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7210854 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 See merge request: openGaussythcs00001/openGauss-workbench!131, 1, merge feature-wyl into develop merge "feature-wyl" into "develop" 创建表, 1 Created-by: wuyulin Author-id: 7119753 MR-id: 7210950 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 创建表, 1 See merge request: openGaussythcs00001/openGauss-workbench!132, Merge remote-tracking branch 'origin/develop' into feature-wyl, 导出DDL接口联调, 添加导出表数据接口, merge feature-zwr into develop merge "feature-zwr" into "develop" 添加导出表数据接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7211802 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 添加导出表数据接口 See merge request: openGaussythcs00001/openGauss-workbench!133, 表属性修改于查看新增, 导出表数据, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整文件, 导出DDL页面, 导出DDL接口联调, 导出表数据 Created-by: zhangcheng Author-id: 7119759 MR-id: 7212093 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整文件, 导出DDL页面, 导出DDL接口联调, 导出表数据 See merge request: openGaussythcs00001/openGauss-workbench!134, 接口方法调整, merge feature-wyl into develop merge "feature-wyl" into "develop" Merge remote-tracking branch 'origin/develop' into feature-wyl, 表属性修改于查看新增, 接口方法调整 Created-by: wuyulin Author-id: 7119753 MR-id: 7212264 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" Merge remote-tracking branch 'origin/develop' into feature-wyl, 表属性修改于查看新增, 接口方法调整 See merge request: openGaussythcs00001/openGauss-workbench!135, 表属性实体类修改, 前端补充两个导出, merge feature-wyl into develop merge "feature-wyl" into "develop" 表属性实体类修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7212877 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 表属性实体类修改 See merge request: openGaussythcs00001/openGauss-workbench!137, 导出数据接口调整, 导出数据接口调整, mer Created-by: yangzihao Author-id: 7119754 MR-id: 7218996 Commit-by: yangzihao;Zihao Yang;zhangcheng;zhouwenruo;张昊宇;wuyulin Merged-by: yangzihao Description: merge "develop" into "release" merge release into develop merge "release" into "develop" merge develop into release merge "develop" into "release" merge develop into feature-lm merge "develop" into "feature-lm" 修改sqlite初始化方式, Revert "提交代码" This reverts commit e103ff955ec521cc063adca87b25257b28405b0f, sqliteinit, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 告警中心前端代码, 告警中心后端代码, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge develop into release merge "develop" into "release" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 调整部分编辑表的功能, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 Created-by: zhangcheng Author-id: 7119759 MR-id: 7209563 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 See merge request: openGaussythcs00001/openGauss-workbench!126, 数据更新联调问题修复, merge feature-wyl into develop merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7209762 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 See merge request: openGaussythcs00001/openGauss-workbench!127, 生成函数覆盖率报告, Merge remote-tracking branch 'origin/develop' into feature-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/util/DebugUtils.java # plugins/data-studio/src/main/resources/messages_en_US.properties # plugins/data-studio/src/main/resources/messages_zh_CN.properties, 生成函数覆盖率报告, merge feature-zwr into develop merge "feature-zwr" into "develop" 生成函数覆盖率报告 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7209971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 生成函数覆盖率报告 See merge request: openGaussythcs00001/openGauss-workbench!128, 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 Created-by: zhangcheng Author-id: 7119759 MR-id: 7210033 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 See merge request: openGaussythcs00001/openGauss-workbench!130, 调整文件, 生成函数覆盖率报告, 导出视图、序列DDL功能, 导出DDL页面, 创建表, resultSet添加try去捕获, 添加导出函数，模式DDL接口, merge feature-zwr into develop merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7210854 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 See merge request: openGaussythcs00001/openGauss-workbench!131, 1, merge feature-wyl into develop merge "feature-wyl" into "develop" 创建表, 1 Created-by: wuyulin Author-id: 7119753 MR-id: 7210950 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 创建表, 1 See merge request: openGaussythcs00001/openGauss-workbench!132, Merge remote-tracking branch 'origin/develop' into feature-wyl, 导出DDL接口联调, 添加导出表数据接口, merge feature-zwr into develop merge "feature-zwr" into "develop" 添加导出表数据接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7211802 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 添加导出表数据接口 See merge request: openGaussythcs00001/openGauss-workbench!133, 表属性修改于查看新增, 导出表数据, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整文件, 导出DDL页面, 导出DDL接口联调, 导出表数据 Created-by: zhangcheng Author-id: 7119759 MR-id: 7212093 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整文件, 导出DDL页面, 导出DDL接口联调, 导出表数据 See merge request: openGaussythcs00001/openGauss-workbench!134, 接口方法调整, merge feature-wyl into develop merge "feature-wyl" into "develop" Merge remote-tracking branch 'origin/develop' into feature-wyl, 表属性修改于查看新增, 接口方法调整 Created-by: wuyulin Author-id: 7119753 MR-id: 7212264 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" Merge remote-tracking branch 'origin/develop' into feature-wyl, 表属性修改于查看新增, 接口方法调整 See merge request: openGaussythcs00001/openGauss-workbench!135, 表属性实体类修改, 前端补充两个导出, merge feature-wyl into develop merge "feature-wyl" into "develop" 表属性实体类修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7212877 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 表属性实体类修改 See merge request: openGaussythcs00001/openGauss-workbench!137, 导出数据接口调整, 导出数据接口调整, mer See merge request: openGaussythcs00001/openGauss-workbench!288 commit aa838d5b01ef5d9391e860f839bd9fb118d5283c Merge: f1a00ac6 38c4f90c Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Thu Jun 15 11:35:14 2023 +0800 merge feature-yangzihao-history into develop merge "feature-yangzihao-history" into "develop" 历史数据诊断，勾选锁分析进行诊断，诊断结果可选项没勾选锁分析。 Created-by: yangzihao Author-id: 7119754 MR-id: 7218995 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-history" into "develop" 历史数据诊断，勾选锁分析进行诊断，诊断结果可选项没勾选锁分析。 See merge request: openGaussythcs00001/openGauss-workbench!287 commit 38c4f90cd4e849d74591959b12d2b4849e3c9a77 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Thu Jun 15 11:33:01 2023 +0800 历史数据诊断，勾选锁分析进行诊断，诊断结果可选项没勾选锁分析。 commit f1a00ac686c2bbcfbdef5c746f371eaa831b9baa Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Thu Jun 15 11:13:10 2023 +0800 修复编辑表的关闭winId、默认列类型，新建表索引访问方式 cherry-pick merge request: 修复编辑表的关闭winId、默认列类型，新建表索引访问方式 811f755fba3099d17cb3b834d5b66cc8536da271 This cherry-pick merge request !286 commit 3055e555525dbc01ed1a53ebf012e13a0d32306d Merge: 6a1c8b17 811f755f Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Thu Jun 15 11:13:10 2023 +0800 merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 修复编辑表的关闭winId、默认列类型，新建表索引访问方式 Created-by: zhangcheng Author-id: 7119759 MR-id: 7218984 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 修复编辑表的关闭winId、默认列类型，新建表索引访问方式 See merge request: openGaussythcs00001/openGauss-workbench!286 commit 811f755fba3099d17cb3b834d5b66cc8536da271 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Thu Jun 15 11:12:35 2023 +0800 修复编辑表的关闭winId、默认列类型，新建表索引访问方式 commit 7a482b1a987113cf3410273719cf42f0cc34e8f1 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Thu Jun 15 10:57:44 2023 +0800 更新用户操作手册 cherry-pick merge request: 更新用户操作手册 f83117e0162397c42880fb2523f9473294656eb8 This cherry-pick merge request !285 commit 6a1c8b17c3d65084286c03bbb1d02118bb0a50d0 Merge: e1123bba f83117e0 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Thu Jun 15 10:57:44 2023 +0800 merge release-zwr into release merge "release-zwr" into "release" 更新用户操作手册 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7218971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 更新用户操作手册 See merge request: openGaussythcs00001/openGauss-workbench!285 commit f83117e0162397c42880fb2523f9473294656eb8 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu Jun 15 10:56:49 2023 +0800 更新用户操作手册 commit e653c00dfa703ff4effe278647b3780584b751d6 Merge: 1e988fdb e1123bba Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Thu Jun 15 10:14:35 2023 +0800 Merge branch 'release' into dev-zhy commit e1123bba7466b14627c8f4c68a5f0913a628d1da Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Thu Jun 15 10:06:55 2023 +0800 打包 commit 2693471d2afb4b02922454d8c3bd51583a1eb072 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 14:21:40 2023 +0800 配置 commit b18047081f47c10369f99fcb1f684d82dce17a68 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:50:46 2023 +0800 Squashed commit of the following: commit ae724aec71fed5b5351ed9f1d05b73be72d5d292 Merge: 84970cb9 78c32bbd Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:47:30 2023 +0800 Merge branch 'develop' into dev-zhy commit 84970cb9a70db7560fac4ac6e402f6279d99e0cf Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:44:39 2023 +0800 添加字段.移除无效文件,改名 commit 57dea887ea087896e7a00816f7590017aa0527fd Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue Jun 13 11:01:26 2023 +0800 修改样式 commit 11d5da4a801326d41f0c2d97e598448495365d63 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Mon Jun 12 18:00:42 2023 +0800 提交等待事件统计代码 commit 706bc7bd24b0403783727fc083792df7a16bc902 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Thu Jun 15 10:06:55 2023 +0800 打包 commit 1e988fdb4e2847acc50ecd2994688342404f7ad1 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Thu Jun 15 10:06:55 2023 +0800 打包 commit 2e4df8050ba13568ca18eb7b6f0518fffd39e1ca Merge: a3604ba0 654104a8 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Thu Jun 15 09:42:19 2023 +0800 merge release into develop merge "release" into "develop" 用户操作手册, merge feature-wyb into release merge "feature-wyb" into "release" 用户操作手册 Created-by: wuyuebin Author-id: 7158405 MR-id: 7218132 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 用户操作手册 See merge request: openGaussythcs00001/openGauss-workbench!273, 兼容性修改, 兼容性修改, 添加字段.移除无效文件,改名, 提交等待事件统计代码, 增加锁分析诊断点, 修改样式, Squashed commit of the following: commit ae724aec71fed5b5351ed9f1d05b73be72d5d292 Merge: 84970cb9 78c32bbd Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:47:30 2023 +0800 Merge branch 'develop' into dev-zhy commit 84970cb9a70db7560fac4ac6e402f6279d99e0cf Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:44:39 2023 +0800 添加字段.移除无效文件,改名, 文档更新, 配置, 修复bug, merge release-wyl into release merge "release-wyl" into "release" 兼容性修改, 兼容性修改, 修复bug Created-by: zhouwenruo Author-id: 7119763 MR-id: 7218349 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-wyl" into "release" 兼容性修改, 兼容性修改, 修复bug See merge request: openGaussythcs00001/openGauss-workbench!277, 修复bug, merge release-wyl into release merge "release-wyl" into "release" 修复bug Created-by: zhouwenruo Author-id: 7119763 MR-id: 7218440 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-wyl" into "release" 修复bug See merge request: openGaussythcs00001/openGauss-workbench!278, 调整没有参数名的函数/过程解析, terminal-editor修改参数弹窗格式, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" terminal-editor修改参数弹窗格式 Created-by: zhangcheng Author-id: 7119759 MR-id: 7218563 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" terminal-editor修改参数弹窗格式 See merge request: openGaussythcs00001/openGauss-workbench!279, merge release-wyl into release merge "release-wyl" into "release" 调整没有参数名的函数/过程解析 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7218564 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-wyl" into "release" 调整没有参数名的函数/过程解析 See merge request: openGaussythcs00001/openGauss-workbench!280, 修复查看已被删除的函数/过程没有提示的问题, Merge remote-tracking branch 'origin/release' into release-wyl, 修复查看已被删除的函数/过程没有提示的问题, merge release-wyl into release merge "release-wyl" into "release" 修复查看已被删除的函数/过程没有提示的问题, Merge remote-tracking branch 'origin/release' into release-wyl, 修复查看已被删除的函数/过程没有提示的问题 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7218682 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-wyl" into "release" 修复查看已被删除的函数/过程没有提示的问题, Merge remote-tracking branch 'origin/release' into release-wyl, 修复查看已被删除的函数/过程没有提示的问题 See merge request: openGaussythcs00001/openGauss-workbench!281, 1、修改告警记录、告警配置、告警模板相关样式 2、修复bug: 告警记录，统计图中没有显示数量。 告警记录，列表记录告警等级和告警状态，没有显示对应的图标。 告警记录，列表记录的持续时间格式应为：hh:mm:ss。 告警配置，搜索输入框提示应为“请输入集群/实例名称” 告警模板，搜索输入框输入内容，规则搜索输入框会同步显示。 告警模板，页数选择20条/页，模板列表记录显示不全，没有下拉进度条。, merge feature-wyb into release merge "feature-wyb" into "release" 1、修改告警记录、告警配置、告警模板相关样式 2、修复bug: 告警记录，统计图中没有显示数量。 告警记录，列表记录告警等级和告警状态，没有显示对应的图标。 告警记录，列表记录的持续时间格式应为：hh:mm:ss。 告警配置，搜索输入框提示应为“请输入集群/实例名称” 告警模板，搜索输入框输入内容，规则搜索输入框会同步显示。 告警模板，页数选择20条/页，模板列表记录显示不全，没有下拉进度条。 Created-by: wuyuebin Author-id: 7158405 MR-id: 7218851 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 1、修改告警记录、告警配置、告警模板相关样式 2、修复bug: 告警记录，统计图中没有显示数量。 告警记录，列表记录告警等级和告警状态，没有显示对应的图标。 告警记录，列表记录的持续时间格式应为：hh:mm:ss。 告警配置，搜索输入框提示应为“请输入集群/实例名称” 告警模板，搜索输入框输入内容，规则搜索输入框会同步显示。 告警模板，页数选择20条/页，模板列表记录显示不全，没有下拉进度条。 See merge request: openGaussythcs00001/openGauss-workbench!282, PR修改, Merge branch 'release-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into release-wyl, merge release-wyl into release merge "release-wyl" into "release" PR修改, Merge branch 'release-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into release-wyl Created-by: wuyulin Author-id: 7119753 MR-id: 7218935 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" PR修改, Merge branch 'release-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into release-wyl See merge request: openGaussythcs00001/openGauss-workbench!283 Created-by: wuyulin Author-id: 7119753 MR-id: 7218938 Commit-by: wuyulin;wuyuebin;zhouwenruo;zhangcheng;张昊宇;Zihao Yang Merged-by: wuyulin Description: merge "release" into "develop" 用户操作手册, merge feature-wyb into release merge "feature-wyb" into "release" 用户操作手册 Created-by: wuyuebin Author-id: 7158405 MR-id: 7218132 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 用户操作手册 See merge request: openGaussythcs00001/openGauss-workbench!273, 兼容性修改, 兼容性修改, 添加字段.移除无效文件,改名, 提交等待事件统计代码, 增加锁分析诊断点, 修改样式, Squashed commit of the following: commit ae724aec71fed5b5351ed9f1d05b73be72d5d292 Merge: 84970cb9 78c32bbd Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:47:30 2023 +0800 Merge branch 'develop' into dev-zhy commit 84970cb9a70db7560fac4ac6e402f6279d99e0cf Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:44:39 2023 +0800 添加字段.移除无效文件,改名, 文档更新, 配置, 修复bug, merge release-wyl into release merge "release-wyl" into "release" 兼容性修改, 兼容性修改, 修复bug Created-by: zhouwenruo Author-id: 7119763 MR-id: 7218349 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-wyl" into "release" 兼容性修改, 兼容性修改, 修复bug See merge request: openGaussythcs00001/openGauss-workbench!277, 修复bug, merge release-wyl into release merge "release-wyl" into "release" 修复bug Created-by: zhouwenruo Author-id: 7119763 MR-id: 7218440 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-wyl" into "release" 修复bug See merge request: openGaussythcs00001/openGauss-workbench!278, 调整没有参数名的函数/过程解析, terminal-editor修改参数弹窗格式, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" terminal-editor修改参数弹窗格式 Created-by: zhangcheng Author-id: 7119759 MR-id: 7218563 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" terminal-editor修改参数弹窗格式 See merge request: openGaussythcs00001/openGauss-workbench!279, merge release-wyl into release merge "release-wyl" into "release" 调整没有参数名的函数/过程解析 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7218564 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-wyl" into "release" 调整没有参数名的函数/过程解析 See merge request: openGaussythcs00001/openGauss-workbench!280, 修复查看已被删除的函数/过程没有提示的问题, Merge remote-tracking branch 'origin/release' into release-wyl, 修复查看已被删除的函数/过程没有提示的问题, merge release-wyl into release merge "release-wyl" into "release" 修复查看已被删除的函数/过程没有提示的问题, Merge remote-tracking branch 'origin/release' into release-wyl, 修复查看已被删除的函数/过程没有提示的问题 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7218682 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-wyl" into "release" 修复查看已被删除的函数/过程没有提示的问题, Merge remote-tracking branch 'origin/release' into release-wyl, 修复查看已被删除的函数/过程没有提示的问题 See merge request: openGaussythcs00001/openGauss-workbench!281, 1、修改告警记录、告警配置、告警模板相关样式 2、修复bug: 告警记录，统计图中没有显示数量。 告警记录，列表记录告警等级和告警状态，没有显示对应的图标。 告警记录，列表记录的持续时间格式应为：hh:mm:ss。 告警配置，搜索输入框提示应为“请输入集群/实例名称” 告警模板，搜索输入框输入内容，规则搜索输入框会同步显示。 告警模板，页数选择20条/页，模板列表记录显示不全，没有下拉进度条。, merge feature-wyb into release merge "feature-wyb" into "release" 1、修改告警记录、告警配置、告警模板相关样式 2、修复bug: 告警记录，统计图中没有显示数量。 告警记录，列表记录告警等级和告警状态，没有显示对应的图标。 告警记录，列表记录的持续时间格式应为：hh:mm:ss。 告警配置，搜索输入框提示应为“请输入集群/实例名称” 告警模板，搜索输入框输入内容，规则搜索输入框会同步显示。 告警模板，页数选择20条/页，模板列表记录显示不全，没有下拉进度条。 Created-by: wuyuebin Author-id: 7158405 MR-id: 7218851 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 1、修改告警记录、告警配置、告警模板相关样式 2、修复bug: 告警记录，统计图中没有显示数量。 告警记录，列表记录告警等级和告警状态，没有显示对应的图标。 告警记录，列表记录的持续时间格式应为：hh:mm:ss。 告警配置，搜索输入框提示应为“请输入集群/实例名称” 告警模板，搜索输入框输入内容，规则搜索输入框会同步显示。 告警模板，页数选择20条/页，模板列表记录显示不全，没有下拉进度条。 See merge request: openGaussythcs00001/openGauss-workbench!282, PR修改, Merge branch 'release-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into release-wyl, merge release-wyl into release merge "release-wyl" into "release" PR修改, Merge branch 'release-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into release-wyl Created-by: wuyulin Author-id: 7119753 MR-id: 7218935 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" PR修改, Merge branch 'release-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into release-wyl See merge request: openGaussythcs00001/openGauss-workbench!283 See merge request: openGaussythcs00001/openGauss-workbench!284 commit a3604ba055593b1066f95eff757b1f6d37515515 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Thu Jun 15 09:41:08 2023 +0800 PR修改 cherry-pick merge request: PR修改, Merge branch 'release-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into release-wyl e8cb34dba47bced5e69f33c3a58340b6f50c6553 This cherry-pick merge request !283 commit 654104a86cd27e82a394b58bd4d5a46bbcc13871 Merge: b5cccb37 bff13877 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Thu Jun 15 09:41:08 2023 +0800 merge release-wyl into release merge "release-wyl" into "release" PR修改, Merge branch 'release-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into release-wyl Created-by: wuyulin Author-id: 7119753 MR-id: 7218935 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" PR修改, Merge branch 'release-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into release-wyl See merge request: openGaussythcs00001/openGauss-workbench!283 commit bff13877a6082dfd97a6f205c2e6f34290ea73b3 Merge: e8cb34db ca765a18 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Thu Jun 15 09:39:11 2023 +0800 Merge branch 'release-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into release-wyl commit e8cb34dba47bced5e69f33c3a58340b6f50c6553 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Thu Jun 15 09:38:43 2023 +0800 PR修改 commit b5cccb37e2fab5abc08e531eaea987fe05408d84 Merge: f6b16708 68908b72 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Wed Jun 14 19:15:05 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 1、修改告警记录、告警配置、告警模板相关样式 2、修复bug: 告警记录，统计图中没有显示数量。 告警记录，列表记录告警等级和告警状态，没有显示对应的图标。 告警记录，列表记录的持续时间格式应为：hh:mm:ss。 告警配置，搜索输入框提示应为“请输入集群/实例名称” 告警模板，搜索输入框输入内容，规则搜索输入框会同步显示。 告警模板，页数选择20条/页，模板列表记录显示不全，没有下拉进度条。 Created-by: wuyuebin Author-id: 7158405 MR-id: 7218851 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 1、修改告警记录、告警配置、告警模板相关样式 2、修复bug: 告警记录，统计图中没有显示数量。 告警记录，列表记录告警等级和告警状态，没有显示对应的图标。 告警记录，列表记录的持续时间格式应为：hh:mm:ss。 告警配置，搜索输入框提示应为“请输入集群/实例名称” 告警模板，搜索输入框输入内容，规则搜索输入框会同步显示。 告警模板，页数选择20条/页，模板列表记录显示不全，没有下拉进度条。 See merge request: openGaussythcs00001/openGauss-workbench!282 commit 68908b72446d289aeb4a31cdce761cb5da447aeb Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Jun 14 19:13:26 2023 +0800 1、修改告警记录、告警配置、告警模板相关样式 2、修复bug: 告警记录，统计图中没有显示数量。 告警记录，列表记录告警等级和告警状态，没有显示对应的图标。 告警记录，列表记录的持续时间格式应为：hh:mm:ss。 告警配置，搜索输入框提示应为“请输入集群/实例名称” 告警模板，搜索输入框输入内容，规则搜索输入框会同步显示。 告警模板，页数选择20条/页，模板列表记录显示不全，没有下拉进度条。 commit 048712e585c3cc1efeca5d4a6330ef75e351c01a Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Wed Jun 14 14:39:03 2023 +0800 修复查看已被删除的函数/过程没有提示的问题 cherry-pick merge request: 修复查看已被删除的函数/过程没有提示的问题 ca765a18d90a0e464a151b9bf4e88a3c5a881aa8 This cherry-pick merge request !281 commit f6b167088943dca59d3bb24daa30a8d067d54b46 Merge: 96fce275 ca765a18 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Wed Jun 14 14:39:03 2023 +0800 merge release-wyl into release merge "release-wyl" into "release" 修复查看已被删除的函数/过程没有提示的问题, Merge remote-tracking branch 'origin/release' into release-wyl, 修复查看已被删除的函数/过程没有提示的问题 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7218682 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-wyl" into "release" 修复查看已被删除的函数/过程没有提示的问题, Merge remote-tracking branch 'origin/release' into release-wyl, 修复查看已被删除的函数/过程没有提示的问题 See merge request: openGaussythcs00001/openGauss-workbench!281 commit ca765a18d90a0e464a151b9bf4e88a3c5a881aa8 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Wed Jun 14 14:36:53 2023 +0800 修复查看已被删除的函数/过程没有提示的问题 commit 4bc7501b613906251042199bec6fc31e5385ddd0 Merge: 82b20c89 96fce275 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Wed Jun 14 14:33:08 2023 +0800 Merge remote-tracking branch 'origin/release' into release-wyl commit 82b20c8903902fbb8cb15ac2816ae50cfcc38476 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Wed Jun 14 14:31:04 2023 +0800 修复查看已被删除的函数/过程没有提示的问题 commit 2202d43d32ac6a07af11765bd16d41bf96221c83 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 14:18:34 2023 +0800 文档更新 commit 0249b33b23897aa13078a2e6085ff9c2fd9c6ee1 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:50:46 2023 +0800 Squashed commit of the following: commit ae724aec71fed5b5351ed9f1d05b73be72d5d292 Merge: 84970cb9 78c32bbd Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:47:30 2023 +0800 Merge branch 'develop' into dev-zhy commit 84970cb9a70db7560fac4ac6e402f6279d99e0cf Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:44:39 2023 +0800 添加字段.移除无效文件,改名 commit 62bd14f302d3afa046ec472d91c0b35c08e8d358 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:44:39 2023 +0800 添加字段.移除无效文件,改名 commit e31af05fc1af31b98bc82f319390d6130437f5a8 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Wed Jun 14 09:12:32 2023 +0800 调整没有参数名的函数/过程解析 cherry-pick merge request: 调整没有参数名的函数/过程解析 7b69abead79ac7b845dcfd1ff5e00f1eab59e6c9 This cherry-pick merge request !280 commit 96fce275a89e4343c77eac963a019fb7ae52cf86 Merge: a383f75c 7b69abea Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Wed Jun 14 09:12:32 2023 +0800 merge release-wyl into release merge "release-wyl" into "release" 调整没有参数名的函数/过程解析 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7218564 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-wyl" into "release" 调整没有参数名的函数/过程解析 See merge request: openGaussythcs00001/openGauss-workbench!280 commit a383f75cab0bb4830f44172d656cc312012788bd Merge: ab888bd1 1241d0c2 Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Wed Jun 14 09:11:30 2023 +0800 merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" terminal-editor修改参数弹窗格式 Created-by: zhangcheng Author-id: 7119759 MR-id: 7218563 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" terminal-editor修改参数弹窗格式 See merge request: openGaussythcs00001/openGauss-workbench!279 commit 1241d0c268239b5ef29157164c28f9e8871eb6f1 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Wed Jun 14 09:10:12 2023 +0800 terminal-editor修改参数弹窗格式 commit 7b69abead79ac7b845dcfd1ff5e00f1eab59e6c9 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Wed Jun 14 09:09:50 2023 +0800 调整没有参数名的函数/过程解析 commit af7dbd6f00ce998ce5d0bd2c66632d7d69e66355 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Tue Jun 13 17:18:09 2023 +0800 修复bug cherry-pick merge request: 修复bug b2723921fabcd238ac68ebaed01cbd38702986bf This cherry-pick merge request !278 commit ab888bd166c48d620351ce3d53447e6e09d7a32f Merge: b3e3eb2b b2723921 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Tue Jun 13 17:18:09 2023 +0800 merge release-wyl into release merge "release-wyl" into "release" 修复bug Created-by: zhouwenruo Author-id: 7119763 MR-id: 7218440 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-wyl" into "release" 修复bug See merge request: openGaussythcs00001/openGauss-workbench!278 commit b2723921fabcd238ac68ebaed01cbd38702986bf Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Tue Jun 13 17:17:04 2023 +0800 修复bug commit 8806bdac23e6ceff52715f1c0e5912a641d2606f Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Tue Jun 13 15:59:35 2023 +0800 修复bug cherry-pick merge request: 兼容性修改, 兼容性修改, 修复bug 7849335d48367908dc8dd855db5ecf76382df963 This cherry-pick merge request !277 commit b3e3eb2bfdd8c4540d229168841db771d37f69f3 Merge: cdd5c4dd 7849335d Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Tue Jun 13 15:59:35 2023 +0800 merge release-wyl into release merge "release-wyl" into "release" 兼容性修改, 兼容性修改, 修复bug Created-by: zhouwenruo Author-id: 7119763 MR-id: 7218349 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-wyl" into "release" 兼容性修改, 兼容性修改, 修复bug See merge request: openGaussythcs00001/openGauss-workbench!277 commit 7849335d48367908dc8dd855db5ecf76382df963 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Tue Jun 13 15:58:04 2023 +0800 修复bug commit 30a9ce0de363d3aa392a3a32033f65fac43d71ee Merge: f3b12b9f e9dd4afc Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Tue Jun 13 15:06:33 2023 +0800 merge develop into feature-lm merge "develop" into "feature-lm" 修改pg_default问题, 编辑表刷新和关闭更新winId，导出接口做500的错误判断, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 编辑表刷新和关闭更新winId，导出接口做500的错误判断 Created-by: zhangcheng Author-id: 7119759 MR-id: 7217451 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 编辑表刷新和关闭更新winId，导出接口做500的错误判断 See merge request: openGaussythcs00001/openGauss-workbench!247, Merge remote-tracking branch 'origin/release' into release-wyl, Merge remote-tracking branch 'origin/release' into release-wyl, merge develop into release merge "develop" into "release" 版权信息, merge release into develop merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 Created-by: wuyulin Author-id: 7119753 MR-id: 7217325 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 See merge request: openGaussythcs00001/openGauss-workbench!236, merge release into develop merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 Created-by: wuyulin Author-id: 7119753 MR-id: 7217342 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 See merge request: openGaussythcs00001/openGauss-workbench!238, merge release into develop merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 Created-by: wuyulin Author-id: 7119753 MR-id: 7217355 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 See merge request: openGaussythcs00001/openGauss-workbench!240, 缩进和版权, 配置, 仅添加java文件版权, merge release into develop merge "release" into "develop" 分区表问题修改, merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 Created-by: wuyulin Author-id: 7119753 MR-id: 7217395 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 分区表问题修改, merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 See merge request: openGaussythcs00001/openGauss-workbench!242, merge release into develop merge "release" into "develop" 代码格式化, merge feature-wyb into release merge "feature-wyb" into "release" 代码格式化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7217417 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!243, 代码格式化, merge feature-zwr into release merge "feature-zwr" into "release" 代码格式化 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217433 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!244 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217436 Commit-by: zhouwenruo;wuyuebin Merged-by: zhouwenruo Description: merge "release" into "develop" 代码格式化, merge feature-wyb into release merge "feature-wyb" into "release" 代码格式化 Created-by: wuyuebin Author-id: 7158405 M Created-by: luomeng Author-id: 7119743 MR-id: 7218277 Commit-by: yangzihao;Zihao Yang;wuyulin;zhangcheng;luomeng;wuyuebin;zhouwenruo;liupengfei;张昊宇 Merged-by: luomeng Description: merge "develop" into "feature-lm" 修改pg_default问题, 编辑表刷新和关闭更新winId，导出接口做500的错误判断, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 编辑表刷新和关闭更新winId，导出接口做500的错误判断 Created-by: zhangcheng Author-id: 7119759 MR-id: 7217451 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 编辑表刷新和关闭更新winId，导出接口做500的错误判断 See merge request: openGaussythcs00001/openGauss-workbench!247, Merge remote-tracking branch 'origin/release' into release-wyl, Merge remote-tracking branch 'origin/release' into release-wyl, merge develop into release merge "develop" into "release" 版权信息, merge release into develop merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 Created-by: wuyulin Author-id: 7119753 MR-id: 7217325 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 See merge request: openGaussythcs00001/openGauss-workbench!236, merge release into develop merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 Created-by: wuyulin Author-id: 7119753 MR-id: 7217342 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 See merge request: openGaussythcs00001/openGauss-workbench!238, merge release into develop merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 Created-by: wuyulin Author-id: 7119753 MR-id: 7217355 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 See merge request: openGaussythcs00001/openGauss-workbench!240, 缩进和版权, 配置, 仅添加java文件版权, merge release into develop merge "release" into "develop" 分区表问题修改, merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 Created-by: wuyulin Author-id: 7119753 MR-id: 7217395 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 分区表问题修改, merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 See merge request: openGaussythcs00001/openGauss-workbench!242, merge release into develop merge "release" into "develop" 代码格式化, merge feature-wyb into release merge "feature-wyb" into "release" 代码格式化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7217417 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!243, 代码格式化, merge feature-zwr into release merge "feature-zwr" into "release" 代码格式化 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217433 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!244 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217436 Commit-by: zhouwenruo;wuyuebin Merged-by: zhouwenruo Description: merge "release" into "develop" 代码格式化, merge feature-wyb into release merge "feature-wyb" into "release" 代码格式化 Created-by: wuyuebin Author-id: 7158405 M See merge request: openGaussythcs00001/openGauss-workbench!276 commit cdd5c4dd4353db753de3de0e56f136ddc63cc3ef Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 14:21:40 2023 +0800 配置 commit 660b5d2bbed0621e2cada868f5da8c523de8f90a Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 14:18:34 2023 +0800 文档更新 commit 6e84eae1f162f3d0706069a5220d920f7b259411 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:50:46 2023 +0800 Squashed commit of the following: commit ae724aec71fed5b5351ed9f1d05b73be72d5d292 Merge: 84970cb9 78c32bbd Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:47:30 2023 +0800 Merge branch 'develop' into dev-zhy commit 84970cb9a70db7560fac4ac6e402f6279d99e0cf Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:44:39 2023 +0800 添加字段.移除无效文件,改名 commit 837ce708458b6acb3987b6a6b1dee34dd35e6b60 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue Jun 13 11:01:26 2023 +0800 修改样式 commit 00b5e70461b98cf4d1ce53ba5712a2e2b03161d5 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue Jun 13 11:02:14 2023 +0800 增加锁分析诊断点 commit 34ff86ae31e96b6b8d24a3d2b9d7510d421b3230 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Mon Jun 12 18:00:42 2023 +0800 提交等待事件统计代码 commit b566d3849d5c3d7aa6f3e41509698845b53d4c1e Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:44:39 2023 +0800 添加字段.移除无效文件,改名 commit 208c90361519208e39b95f2ce7093d5189911321 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 14:21:40 2023 +0800 配置 commit fc7763dd2626811462c840ea020a4d97ce889c69 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 14:18:34 2023 +0800 文档更新 commit de67bdb8add60cfa36bcfa8149b93cec6fbfef85 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Tue Jun 13 14:06:04 2023 +0800 兼容性修改 commit 85ae3b83a9717e08aff2fce741f028a4b9e8e6bd Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Tue Jun 13 11:45:33 2023 +0800 兼容性修改 commit 5afdc6844fbf5b44d8374f4d1d8417c1b3d0097c Merge: ae724aec 2ca8b057 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 11:27:05 2023 +0800 Merge branch 'develop' into dev-zhy commit 2ca8b057f48f66cdb053b894747990ed9ce0ab5f Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:50:46 2023 +0800 Squashed commit of the following: commit ae724aec71fed5b5351ed9f1d05b73be72d5d292 Merge: 84970cb9 78c32bbd Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:47:30 2023 +0800 Merge branch 'develop' into dev-zhy commit 84970cb9a70db7560fac4ac6e402f6279d99e0cf Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:44:39 2023 +0800 添加字段.移除无效文件,改名 commit e9dd4afcc98076b65a3c673a01551119601291e9 Merge: c3457d8f 95f4cdb3 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Tue Jun 13 11:03:42 2023 +0800 merge feature-yangzihao-instance into develop merge "feature-yangzihao-instance" into "develop" 修改样式 Created-by: yangzihao Author-id: 7119754 MR-id: 7218186 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "develop" 修改样式 See merge request: openGaussythcs00001/openGauss-workbench!275 commit c3457d8fdd67779003c3674271216c4634233e3f Merge: 78c32bbd 5f2cbd4b Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Tue Jun 13 11:03:17 2023 +0800 merge feature-yangzihao-history into develop merge "feature-yangzihao-history" into "develop" 增加锁分析诊断点 Created-by: yangzihao Author-id: 7119754 MR-id: 7218184 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-history" into "develop" 增加锁分析诊断点 See merge request: openGaussythcs00001/openGauss-workbench!274 commit 5f2cbd4bbc6f0380874f9807911af44b6abb8fc6 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue Jun 13 11:02:14 2023 +0800 增加锁分析诊断点 commit 95f4cdb3757aa11441636dfc33ea34533c77566a Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue Jun 13 11:01:26 2023 +0800 修改样式 commit 6292d62027557ce263a4887d9432d58cc0888886 Merge: d2e41bc1 c046068b Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Tue Jun 13 09:15:30 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 用户操作手册 Created-by: wuyuebin Author-id: 7158405 MR-id: 7218132 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 用户操作手册 See merge request: openGaussythcs00001/openGauss-workbench!273 commit c046068b495270c624c92be31a0c57cab40e4b78 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Jun 13 09:11:46 2023 +0800 用户操作手册 commit ae724aec71fed5b5351ed9f1d05b73be72d5d292 Merge: 84970cb9 78c32bbd Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:47:30 2023 +0800 Merge branch 'develop' into dev-zhy commit 84970cb9a70db7560fac4ac6e402f6279d99e0cf Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:44:39 2023 +0800 添加字段.移除无效文件,改名 commit 78c32bbd8526a8220fcb2b6ff638d248badf9e81 Merge: 01337445 2fede01d Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Mon Jun 12 18:01:40 2023 +0800 merge feature-yangzihao-instance into develop merge "feature-yangzihao-instance" into "develop" 提交等待事件统计代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7218046 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "develop" 提交等待事件统计代码 See merge request: openGaussythcs00001/openGauss-workbench!272 commit 2fede01dd0a56404520eedb3bfec04ddcf0c5c82 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Mon Jun 12 18:00:42 2023 +0800 提交等待事件统计代码 commit 01337445fdea66a6f82f25b5e63b1cb77835f42c Merge: 6c78a5bf d2e41bc1 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Mon Jun 12 15:15:23 2023 +0800 merge release into develop merge "release" into "develop" 创建表/编辑表：能否非空, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 创建表/编辑表：能否非空 Created-by: zhangcheng Author-id: 7119759 MR-id: 7217918 Commit-by: zhangcheng Merged-by: wuyulin Description: merge "bugfix-zhangcheng-0630-2" into "release" 创建表/编辑表：能否非空 See merge request: openGaussythcs00001/openGauss-workbench!270 Created-by: wuyulin Author-id: 7119753 MR-id: 7217919 Commit-by: wuyulin;zhangcheng Merged-by: wuyulin Description: merge "release" into "develop" 创建表/编辑表：能否非空, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 创建表/编辑表：能否非空 Created-by: zhangcheng Author-id: 7119759 MR-id: 7217918 Commit-by: zhangcheng Merged-by: wuyulin Description: merge "bugfix-zhangcheng-0630-2" into "release" 创建表/编辑表：能否非空 See merge request: openGaussythcs00001/openGauss-workbench!270 See merge request: openGaussythcs00001/openGauss-workbench!271 commit d2e41bc1ebebd8a5bee507f9a76af1da46646c4b Merge: e0df0540 ffdb1615 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Mon Jun 12 15:14:55 2023 +0800 merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 创建表/编辑表：能否非空 Created-by: zhangcheng Author-id: 7119759 MR-id: 7217918 Commit-by: zhangcheng Merged-by: wuyulin Description: merge "bugfix-zhangcheng-0630-2" into "release" 创建表/编辑表：能否非空 See merge request: openGaussythcs00001/openGauss-workbench!270 commit ffdb1615a39324e1ff06fbf2654db54433ddaf60 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Mon Jun 12 15:05:01 2023 +0800 创建表/编辑表：能否非空 commit 6c78a5bf713ed5dd1ee088a36a7e87378daec6d3 Merge: abc8a0b0 e0df0540 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Mon Jun 12 14:32:03 2023 +0800 merge release into develop merge "release" into "develop" merge develop into release merge "develop" into "release" merge develop into feature-lm merge "develop" into "feature-lm" 修改sqlite初始化方式, Revert "提交代码" This reverts commit e103ff955ec521cc063adca87b25257b28405b0f, sqliteinit, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 告警中心前端代码, 告警中心后端代码, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge develop into release merge "develop" into "release" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 调整部分编辑表的功能, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 Created-by: zhangcheng Author-id: 7119759 MR-id: 7209563 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 See merge request: openGaussythcs00001/openGauss-workbench!126, 数据更新联调问题修复, merge feature-wyl into develop merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7209762 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 See merge request: openGaussythcs00001/openGauss-workbench!127, 生成函数覆盖率报告, Merge remote-tracking branch 'origin/develop' into feature-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/util/DebugUtils.java # plugins/data-studio/src/main/resources/messages_en_US.properties # plugins/data-studio/src/main/resources/messages_zh_CN.properties, 生成函数覆盖率报告, merge feature-zwr into develop merge "feature-zwr" into "develop" 生成函数覆盖率报告 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7209971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 生成函数覆盖率报告 See merge request: openGaussythcs00001/openGauss-workbench!128, 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 Created-by: zhangcheng Author-id: 7119759 MR-id: 7210033 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 See merge request: openGaussythcs00001/openGauss-workbench!130, 调整文件, 生成函数覆盖率报告, 导出视图、序列DDL功能, 导出DDL页面, 创建表, resultSet添加try去捕获, 添加导出函数，模式DDL接口, merge feature-zwr into develop merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7210854 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 See merge request: openGaussythcs00001/openGauss-workbench!131, 1, merge feature-wyl into develop merge "feature-wyl" into "develop" 创建表, 1 Created-by: wuyulin Author-id: 7119753 MR-id: 7210950 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 创建表, 1 See merge request: openGaussythcs00001/openGauss-workbench!132, Merge remote-tracking branch 'origin/develop' into feature-wyl, 导出DDL接口联调, 添加导出表数据接口, merge feature-zwr into develop merge "feature-zwr" into "develop" 添加导出表数据接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7211802 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 添加导出表数据接口 See merge request: openGaussythcs00001/openGauss-workbench!133, 表属性修改于查看新增, 导出表数据, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整文件, 导出DDL页面, 导出DDL接口联调, 导出表数据 Created-by: zhangcheng Author-id: 7119759 MR-id: 7212093 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整文件, 导出DDL页面, 导出DDL接口联调, 导出表数据 See merge request: openGaussythcs00001/openGauss-workbench!134, 接口方法调整, merge feature-wyl into develop merge "feature-wyl" into "develop" Merge remote-tracking branch 'origin/develop' into feature-wyl, 表属性修改于查看新增, 接口方法调整 Created-by: wuyulin Author-id: 7119753 MR-id: 7212264 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" Merge remote-tracking branch 'origin/develop' into feature-wyl, 表属性修改于查看新增, 接口方法调整 See merge request: openGaussythcs00001/openGauss-workbench!135, 表属性实体类修改, 前端补充两个导出, merge feature-wyl into develop merge "feature-wyl" into "develop" 表属性实体类修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7212877 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 表属性实体类修改 See merge request: openGaussythcs00001/openGauss-workbench!137, 导出数据接口调整, 导出数据接口调整, merge feature-zwr into develop merge "feature-zwr" into "deve Created-by: wuyulin Author-id: 7119753 MR-id: 7217893 Commit-by: wuyulin;luomeng Merged-by: wuyulin Description: merge "release" into "develop" merge develop into release merge "develop" into "release" merge develop into feature-lm merge "develop" into "feature-lm" 修改sqlite初始化方式, Revert "提交代码" This reverts commit e103ff955ec521cc063adca87b25257b28405b0f, sqliteinit, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 告警中心前端代码, 告警中心后端代码, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge develop into release merge "develop" into "release" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 调整部分编辑表的功能, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 Created-by: zhangcheng Author-id: 7119759 MR-id: 7209563 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 See merge request: openGaussythcs00001/openGauss-workbench!126, 数据更新联调问题修复, merge feature-wyl into develop merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7209762 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 See merge request: openGaussythcs00001/openGauss-workbench!127, 生成函数覆盖率报告, Merge remote-tracking branch 'origin/develop' into feature-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/util/DebugUtils.java # plugins/data-studio/src/main/resources/messages_en_US.properties # plugins/data-studio/src/main/resources/messages_zh_CN.properties, 生成函数覆盖率报告, merge feature-zwr into develop merge "feature-zwr" into "develop" 生成函数覆盖率报告 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7209971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 生成函数覆盖率报告 See merge request: openGaussythcs00001/openGauss-workbench!128, 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 Created-by: zhangcheng Author-id: 7119759 MR-id: 7210033 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 See merge request: openGaussythcs00001/openGauss-workbench!130, 调整文件, 生成函数覆盖率报告, 导出视图、序列DDL功能, 导出DDL页面, 创建表, resultSet添加try去捕获, 添加导出函数，模式DDL接口, merge feature-zwr into develop merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7210854 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 See merge request: openGaussythcs00001/openGauss-workbench!131, 1, merge feature-wyl into develop merge "feature-wyl" into "develop" 创建表, 1 Created-by: wuyulin Author-id: 7119753 MR-id: 7210950 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 创建表, 1 See merge request: openGaussythcs00001/openGauss-workbench!132, Merge remote-tracking branch 'origin/develop' into feature-wyl, 导出DDL接口联调, 添加导出表数据接口, merge feature-zwr into develop merge "feature-zwr" into "develop" 添加导出表数据接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7211802 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 添加导出表数据接口 See merge request: openGaussythcs00001/openGauss-workbench!133, 表属性修改于查看新增, 导出表数据, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整文件, 导出DDL页面, 导出DDL接口联调, 导出表数据 Created-by: zhangcheng Author-id: 7119759 MR-id: 7212093 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整文件, 导出DDL页面, 导出DDL接口联调, 导出表数据 See merge request: openGaussythcs00001/openGauss-workbench!134, 接口方法调整, merge feature-wyl into develop merge "feature-wyl" into "develop" Merge remote-tracking branch 'origin/develop' into feature-wyl, 表属性修改于查看新增, 接口方法调整 Created-by: wuyulin Author-id: 7119753 MR-id: 7212264 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" Merge remote-tracking branch 'origin/develop' into feature-wyl, 表属性修改于查看新增, 接口方法调整 See merge request: openGaussythcs00001/openGauss-workbench!135, 表属性实体类修改, 前端补充两个导出, merge feature-wyl into develop merge "feature-wyl" into "develop" 表属性实体类修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7212877 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 表属性实体类修改 See merge request: openGaussythcs00001/openGauss-workbench!137, 导出数据接口调整, 导出数据接口调整, merge feature-zwr into develop merge "feature-zwr" into "deve See merge request: openGaussythcs00001/openGauss-workbench!269 commit e0df05405d922f3192918a16572f342f2bfd701b Merge: 11b86d5e 75b6bc4c Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Mon Jun 12 14:31:17 2023 +0800 merge release-wyl into release merge "release-wyl" into "release" 数据刷新问题修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7217892 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 数据刷新问题修复 See merge request: openGaussythcs00001/openGauss-workbench!268 commit 75b6bc4ce6a9592f2a07111bd004eb92f3675cbe Author: wuyulin <wuyulin@ncti-gba.cn> Date: Mon Jun 12 14:16:11 2023 +0800 数据刷新问题修复 commit 11b86d5e1e97b9aad8a7a447e6768870ab55c721 Merge: cd80333b abc8a0b0 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Mon Jun 12 12:10:59 2023 +0800 merge develop into release merge "develop" into "release" merge develop into feature-lm merge "develop" into "feature-lm" 修改sqlite初始化方式, Revert "提交代码" This reverts commit e103ff955ec521cc063adca87b25257b28405b0f, sqliteinit, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 告警中心前端代码, 告警中心后端代码, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge develop into release merge "develop" into "release" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 调整部分编辑表的功能, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 Created-by: zhangcheng Author-id: 7119759 MR-id: 7209563 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 See merge request: openGaussythcs00001/openGauss-workbench!126, 数据更新联调问题修复, merge feature-wyl into develop merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7209762 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 See merge request: openGaussythcs00001/openGauss-workbench!127, 生成函数覆盖率报告, Merge remote-tracking branch 'origin/develop' into feature-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/util/DebugUtils.java # plugins/data-studio/src/main/resources/messages_en_US.properties # plugins/data-studio/src/main/resources/messages_zh_CN.properties, 生成函数覆盖率报告, merge feature-zwr into develop merge "feature-zwr" into "develop" 生成函数覆盖率报告 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7209971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 生成函数覆盖率报告 See merge request: openGaussythcs00001/openGauss-workbench!128, 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 Created-by: zhangcheng Author-id: 7119759 MR-id: 7210033 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 See merge request: openGaussythcs00001/openGauss-workbench!130, 调整文件, 生成函数覆盖率报告, 导出视图、序列DDL功能, 导出DDL页面, 创建表, resultSet添加try去捕获, 添加导出函数，模式DDL接口, merge feature-zwr into develop merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7210854 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 See merge request: openGaussythcs00001/openGauss-workbench!131, 1, merge feature-wyl into develop merge "feature-wyl" into "develop" 创建表, 1 Created-by: wuyulin Author-id: 7119753 MR-id: 7210950 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 创建表, 1 See merge request: openGaussythcs00001/openGauss-workbench!132, Merge remote-tracking branch 'origin/develop' into feature-wyl, 导出DDL接口联调, 添加导出表数据接口, merge feature-zwr into develop merge "feature-zwr" into "develop" 添加导出表数据接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7211802 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 添加导出表数据接口 See merge request: openGaussythcs00001/openGauss-workbench!133, 表属性修改于查看新增, 导出表数据, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整文件, 导出DDL页面, 导出DDL接口联调, 导出表数据 Created-by: zhangcheng Author-id: 7119759 MR-id: 7212093 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整文件, 导出DDL页面, 导出DDL接口联调, 导出表数据 See merge request: openGaussythcs00001/openGauss-workbench!134, 接口方法调整, merge feature-wyl into develop merge "feature-wyl" into "develop" Merge remote-tracking branch 'origin/develop' into feature-wyl, 表属性修改于查看新增, 接口方法调整 Created-by: wuyulin Author-id: 7119753 MR-id: 7212264 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" Merge remote-tracking branch 'origin/develop' into feature-wyl, 表属性修改于查看新增, 接口方法调整 See merge request: openGaussythcs00001/openGauss-workbench!135, 表属性实体类修改, 前端补充两个导出, merge feature-wyl into develop merge "feature-wyl" into "develop" 表属性实体类修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7212877 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 表属性实体类修改 See merge request: openGaussythcs00001/openGauss-workbench!137, 导出数据接口调整, 导出数据接口调整, merge feature-zwr into develop merge "feature-zwr" into "develop" 导出数据接口调整, 导出数据接口调整 Created-by: zhouwenruo Author-id: Created-by: luomeng Author-id: 7119743 MR-id: 7217864 Commit-by: luomeng;罗梦;wuyulin;zhouwenruo Merged-by: luomeng Description: merge "develop" into "release" merge develop into feature-lm merge "develop" into "feature-lm" 修改sqlite初始化方式, Revert "提交代码" This reverts commit e103ff955ec521cc063adca87b25257b28405b0f, sqliteinit, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 告警中心前端代码, 告警中心后端代码, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge develop into release merge "develop" into "release" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 调整部分编辑表的功能, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 Created-by: zhangcheng Author-id: 7119759 MR-id: 7209563 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 See merge request: openGaussythcs00001/openGauss-workbench!126, 数据更新联调问题修复, merge feature-wyl into develop merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7209762 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 See merge request: openGaussythcs00001/openGauss-workbench!127, 生成函数覆盖率报告, Merge remote-tracking branch 'origin/develop' into feature-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/util/DebugUtils.java # plugins/data-studio/src/main/resources/messages_en_US.properties # plugins/data-studio/src/main/resources/messages_zh_CN.properties, 生成函数覆盖率报告, merge feature-zwr into develop merge "feature-zwr" into "develop" 生成函数覆盖率报告 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7209971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 生成函数覆盖率报告 See merge request: openGaussythcs00001/openGauss-workbench!128, 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 Created-by: zhangcheng Author-id: 7119759 MR-id: 7210033 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 See merge request: openGaussythcs00001/openGauss-workbench!130, 调整文件, 生成函数覆盖率报告, 导出视图、序列DDL功能, 导出DDL页面, 创建表, resultSet添加try去捕获, 添加导出函数，模式DDL接口, merge feature-zwr into develop merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7210854 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 See merge request: openGaussythcs00001/openGauss-workbench!131, 1, merge feature-wyl into develop merge "feature-wyl" into "develop" 创建表, 1 Created-by: wuyulin Author-id: 7119753 MR-id: 7210950 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 创建表, 1 See merge request: openGaussythcs00001/openGauss-workbench!132, Merge remote-tracking branch 'origin/develop' into feature-wyl, 导出DDL接口联调, 添加导出表数据接口, merge feature-zwr into develop merge "feature-zwr" into "develop" 添加导出表数据接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7211802 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 添加导出表数据接口 See merge request: openGaussythcs00001/openGauss-workbench!133, 表属性修改于查看新增, 导出表数据, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整文件, 导出DDL页面, 导出DDL接口联调, 导出表数据 Created-by: zhangcheng Author-id: 7119759 MR-id: 7212093 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整文件, 导出DDL页面, 导出DDL接口联调, 导出表数据 See merge request: openGaussythcs00001/openGauss-workbench!134, 接口方法调整, merge feature-wyl into develop merge "feature-wyl" into "develop" Merge remote-tracking branch 'origin/develop' into feature-wyl, 表属性修改于查看新增, 接口方法调整 Created-by: wuyulin Author-id: 7119753 MR-id: 7212264 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" Merge remote-tracking branch 'origin/develop' into feature-wyl, 表属性修改于查看新增, 接口方法调整 See merge request: openGaussythcs00001/openGauss-workbench!135, 表属性实体类修改, 前端补充两个导出, merge feature-wyl into develop merge "feature-wyl" into "develop" 表属性实体类修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7212877 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 表属性实体类修改 See merge request: openGaussythcs00001/openGauss-workbench!137, 导出数据接口调整, 导出数据接口调整, merge feature-zwr into develop merge "feature-zwr" into "develop" 导出数据接口调整, 导出数据接口调整 Created-by: zhouwenruo Author-id: See merge request: openGaussythcs00001/openGauss-workbench!267 commit abc8a0b07b0e1fadad55bd4be482afeeeb62ad16 Merge: c2b8050d f3b12b9f Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Mon Jun 12 12:10:16 2023 +0800 merge feature-lm into develop merge "feature-lm" into "develop" merge develop into feature-lm merge "develop" into "feature-lm" 修改sqlite初始化方式, Revert "提交代码" This reverts commit e103ff955ec521cc063adca87b25257b28405b0f, sqliteinit, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 告警中心前端代码, 告警中心后端代码, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge develop into release merge "develop" into "release" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 调整部分编辑表的功能, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 Created-by: zhangcheng Author-id: 7119759 MR-id: 7209563 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 See merge request: openGaussythcs00001/openGauss-workbench!126, 数据更新联调问题修复, merge feature-wyl into develop merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7209762 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 See merge request: openGaussythcs00001/openGauss-workbench!127, 生成函数覆盖率报告, Merge remote-tracking branch 'origin/develop' into feature-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/util/DebugUtils.java # plugins/data-studio/src/main/resources/messages_en_US.properties # plugins/data-studio/src/main/resources/messages_zh_CN.properties, 生成函数覆盖率报告, merge feature-zwr into develop merge "feature-zwr" into "develop" 生成函数覆盖率报告 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7209971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 生成函数覆盖率报告 See merge request: openGaussythcs00001/openGauss-workbench!128, 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 Created-by: zhangcheng Author-id: 7119759 MR-id: 7210033 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 See merge request: openGaussythcs00001/openGauss-workbench!130, 调整文件, 生成函数覆盖率报告, 导出视图、序列DDL功能, 导出DDL页面, 创建表, resultSet添加try去捕获, 添加导出函数，模式DDL接口, merge feature-zwr into develop merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7210854 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 See merge request: openGaussythcs00001/openGauss-workbench!131, 1, merge feature-wyl into develop merge "feature-wyl" into "develop" 创建表, 1 Created-by: wuyulin Author-id: 7119753 MR-id: 7210950 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 创建表, 1 See merge request: openGaussythcs00001/openGauss-workbench!132, Merge remote-tracking branch 'origin/develop' into feature-wyl, 导出DDL接口联调, 添加导出表数据接口, merge feature-zwr into develop merge "feature-zwr" into "develop" 添加导出表数据接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7211802 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 添加导出表数据接口 See merge request: openGaussythcs00001/openGauss-workbench!133, 表属性修改于查看新增, 导出表数据, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整文件, 导出DDL页面, 导出DDL接口联调, 导出表数据 Created-by: zhangcheng Author-id: 7119759 MR-id: 7212093 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整文件, 导出DDL页面, 导出DDL接口联调, 导出表数据 See merge request: openGaussythcs00001/openGauss-workbench!134, 接口方法调整, merge feature-wyl into develop merge "feature-wyl" into "develop" Merge remote-tracking branch 'origin/develop' into feature-wyl, 表属性修改于查看新增, 接口方法调整 Created-by: wuyulin Author-id: 7119753 MR-id: 7212264 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" Merge remote-tracking branch 'origin/develop' into feature-wyl, 表属性修改于查看新增, 接口方法调整 See merge request: openGaussythcs00001/openGauss-workbench!135, 表属性实体类修改, 前端补充两个导出, merge feature-wyl into develop merge "feature-wyl" into "develop" 表属性实体类修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7212877 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 表属性实体类修改 See merge request: openGaussythcs00001/openGauss-workbench!137, 导出数据接口调整, 导出数据接口调整, merge feature-zwr into develop merge "feature-zwr" into "develop" 导出数据接口调整, 导出数据接口调整 Created-by: zhouwenruo Author-i Created-by: luomeng Author-id: 7119743 MR-id: 7217863 Commit-by: 罗梦;luomeng Merged-by: luomeng Description: merge "feature-lm" into "develop" merge develop into feature-lm merge "develop" into "feature-lm" 修改sqlite初始化方式, Revert "提交代码" This reverts commit e103ff955ec521cc063adca87b25257b28405b0f, sqliteinit, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 告警中心前端代码, 告警中心后端代码, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge develop into release merge "develop" into "release" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 调整部分编辑表的功能, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 Created-by: zhangcheng Author-id: 7119759 MR-id: 7209563 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 See merge request: openGaussythcs00001/openGauss-workbench!126, 数据更新联调问题修复, merge feature-wyl into develop merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7209762 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 See merge request: openGaussythcs00001/openGauss-workbench!127, 生成函数覆盖率报告, Merge remote-tracking branch 'origin/develop' into feature-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/util/DebugUtils.java # plugins/data-studio/src/main/resources/messages_en_US.properties # plugins/data-studio/src/main/resources/messages_zh_CN.properties, 生成函数覆盖率报告, merge feature-zwr into develop merge "feature-zwr" into "develop" 生成函数覆盖率报告 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7209971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 生成函数覆盖率报告 See merge request: openGaussythcs00001/openGauss-workbench!128, 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 Created-by: zhangcheng Author-id: 7119759 MR-id: 7210033 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 See merge request: openGaussythcs00001/openGauss-workbench!130, 调整文件, 生成函数覆盖率报告, 导出视图、序列DDL功能, 导出DDL页面, 创建表, resultSet添加try去捕获, 添加导出函数，模式DDL接口, merge feature-zwr into develop merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7210854 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 See merge request: openGaussythcs00001/openGauss-workbench!131, 1, merge feature-wyl into develop merge "feature-wyl" into "develop" 创建表, 1 Created-by: wuyulin Author-id: 7119753 MR-id: 7210950 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 创建表, 1 See merge request: openGaussythcs00001/openGauss-workbench!132, Merge remote-tracking branch 'origin/develop' into feature-wyl, 导出DDL接口联调, 添加导出表数据接口, merge feature-zwr into develop merge "feature-zwr" into "develop" 添加导出表数据接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7211802 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 添加导出表数据接口 See merge request: openGaussythcs00001/openGauss-workbench!133, 表属性修改于查看新增, 导出表数据, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整文件, 导出DDL页面, 导出DDL接口联调, 导出表数据 Created-by: zhangcheng Author-id: 7119759 MR-id: 7212093 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整文件, 导出DDL页面, 导出DDL接口联调, 导出表数据 See merge request: openGaussythcs00001/openGauss-workbench!134, 接口方法调整, merge feature-wyl into develop merge "feature-wyl" into "develop" Merge remote-tracking branch 'origin/develop' into feature-wyl, 表属性修改于查看新增, 接口方法调整 Created-by: wuyulin Author-id: 7119753 MR-id: 7212264 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" Merge remote-tracking branch 'origin/develop' into feature-wyl, 表属性修改于查看新增, 接口方法调整 See merge request: openGaussythcs00001/openGauss-workbench!135, 表属性实体类修改, 前端补充两个导出, merge feature-wyl into develop merge "feature-wyl" into "develop" 表属性实体类修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7212877 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 表属性实体类修改 See merge request: openGaussythcs00001/openGauss-workbench!137, 导出数据接口调整, 导出数据接口调整, merge feature-zwr into develop merge "feature-zwr" into "develop" 导出数据接口调整, 导出数据接口调整 Created-by: zhouwenruo Author-i See merge request: openGaussythcs00001/openGauss-workbench!266 commit f3b12b9fc6934da9fb2d7e6b2ab2b622247921f9 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Mon Jun 12 12:09:27 2023 +0800 修复codecheck严重问题 commit c2b8050d3328ae77d71d139163cf4716a93601d0 Merge: 44c41840 cd80333b Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Mon Jun 12 11:19:00 2023 +0800 merge release into develop merge "release" into "develop" 告警配置、告警记录去掉相关字段, merge feature-wyb into release merge "feature-wyb" into "release" 告警配置、告警记录去掉相关字段 Created-by: wuyuebin Author-id: 7158405 MR-id: 7217788 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 告警配置、告警记录去掉相关字段 See merge request: openGaussythcs00001/openGauss-workbench!260, 修改iconfont的__iconfont__svg__cssinject__变量, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 修改iconfont的__iconfont__svg__cssinject__变量 Created-by: zhangcheng Author-id: 7119759 MR-id: 7217801 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 修改iconfont的__iconfont__svg__cssinject__变量 See merge request: openGaussythcs00001/openGauss-workbench!261, 代码规范修改, merge release-wyl into release merge "release-wyl" into "release" 代码规范修改 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217806 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-wyl" into "release" 代码规范修改 See merge request: openGaussythcs00001/openGauss-workbench!262, 去掉告警模板和告警配置中编辑规则时的提示, merge feature-wyb into release merge "feature-wyb" into "release" 去掉告警模板和告警配置中编辑规则时的提示 Created-by: wuyuebin Author-id: 7158405 MR-id: 7217823 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 去掉告警模板和告警配置中编辑规则时的提示 See merge request: openGaussythcs00001/openGauss-workbench!263, 注释修改, merge release-wyl into release merge "release-wyl" into "release" 注释修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217834 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 注释修改 See merge request: openGaussythcs00001/openGauss-workbench!264 Created-by: wuyulin Author-id: 7119753 MR-id: 7217835 Commit-by: wuyulin;wuyuebin;zhouwenruo;zhangcheng Merged-by: wuyulin Description: merge "release" into "develop" 告警配置、告警记录去掉相关字段, merge feature-wyb into release merge "feature-wyb" into "release" 告警配置、告警记录去掉相关字段 Created-by: wuyuebin Author-id: 7158405 MR-id: 7217788 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 告警配置、告警记录去掉相关字段 See merge request: openGaussythcs00001/openGauss-workbench!260, 修改iconfont的__iconfont__svg__cssinject__变量, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 修改iconfont的__iconfont__svg__cssinject__变量 Created-by: zhangcheng Author-id: 7119759 MR-id: 7217801 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 修改iconfont的__iconfont__svg__cssinject__变量 See merge request: openGaussythcs00001/openGauss-workbench!261, 代码规范修改, merge release-wyl into release merge "release-wyl" into "release" 代码规范修改 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217806 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-wyl" into "release" 代码规范修改 See merge request: openGaussythcs00001/openGauss-workbench!262, 去掉告警模板和告警配置中编辑规则时的提示, merge feature-wyb into release merge "feature-wyb" into "release" 去掉告警模板和告警配置中编辑规则时的提示 Created-by: wuyuebin Author-id: 7158405 MR-id: 7217823 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 去掉告警模板和告警配置中编辑规则时的提示 See merge request: openGaussythcs00001/openGauss-workbench!263, 注释修改, merge release-wyl into release merge "release-wyl" into "release" 注释修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217834 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 注释修改 See merge request: openGaussythcs00001/openGauss-workbench!264 See merge request: openGaussythcs00001/openGauss-workbench!265 commit cd80333b77513311270ced27dfb0fce8173a54b6 Merge: 1052e39b 6dc3a047 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Mon Jun 12 11:18:31 2023 +0800 merge release-wyl into release merge "release-wyl" into "release" 注释修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217834 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 注释修改 See merge request: openGaussythcs00001/openGauss-workbench!264 commit 6dc3a0475a0b3455b544c231e2fdc8c895482955 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Mon Jun 12 11:17:50 2023 +0800 注释修改 commit 1052e39b14afab12ee7fe6d0ea1a57a2adf583a4 Merge: 7e1d2821 075a2ff6 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Mon Jun 12 11:02:27 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 去掉告警模板和告警配置中编辑规则时的提示 Created-by: wuyuebin Author-id: 7158405 MR-id: 7217823 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 去掉告警模板和告警配置中编辑规则时的提示 See merge request: openGaussythcs00001/openGauss-workbench!263 commit 075a2ff66a609402204beac30f1f49ea0d2a7f16 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Jun 12 11:01:07 2023 +0800 去掉告警模板和告警配置中编辑规则时的提示 commit 44c4184082da78e464a9adbb925aa6691f50a140 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Mon Jun 12 10:22:53 2023 +0800 代码规范修改 cherry-pick merge request: 代码规范修改 996b5fc354c936bc7914435b2fcc2ec3ae6cd002 This cherry-pick merge request !262 commit 7e1d2821f96c3da30c6bd51f964dc3d2d156082e Merge: f7922bfa 996b5fc3 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Mon Jun 12 10:22:53 2023 +0800 merge release-wyl into release merge "release-wyl" into "release" 代码规范修改 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217806 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-wyl" into "release" 代码规范修改 See merge request: openGaussythcs00001/openGauss-workbench!262 commit 996b5fc354c936bc7914435b2fcc2ec3ae6cd002 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Mon Jun 12 10:20:53 2023 +0800 代码规范修改 commit f7922bfab6fdb9834b7a2416cf74ed8e071b95b3 Merge: d9f275dc a681e2bd Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Mon Jun 12 10:17:40 2023 +0800 merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 修改iconfont的__iconfont__svg__cssinject__变量 Created-by: zhangcheng Author-id: 7119759 MR-id: 7217801 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 修改iconfont的__iconfont__svg__cssinject__变量 See merge request: openGaussythcs00001/openGauss-workbench!261 commit a681e2bd186f4d3db7fe1c1559d1f3deb8690da6 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Mon Jun 12 10:15:55 2023 +0800 修改iconfont的__iconfont__svg__cssinject__变量 commit d9f275dc715085b8e962eccacb055b1495ccafae Merge: d1e7f6eb 165398c0 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Mon Jun 12 09:59:02 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 告警配置、告警记录去掉相关字段 Created-by: wuyuebin Author-id: 7158405 MR-id: 7217788 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 告警配置、告警记录去掉相关字段 See merge request: openGaussythcs00001/openGauss-workbench!260 commit 165398c038f6d9ed5640550c2778f579aacb7e30 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Jun 12 09:56:07 2023 +0800 告警配置、告警记录去掉相关字段 commit 57f8bbc15033137d9551eab7b4956bfdcd5a8fbf Merge: dc5a46e8 d1e7f6eb Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Mon Jun 12 09:54:15 2023 +0800 merge release into develop merge "release" into "develop" 代码规范修改 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217781 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release" into "develop" 代码规范修改 See merge request: openGaussythcs00001/openGauss-workbench!259 commit d1e7f6eb78cd06281e2f0c22d86ae98e226c4c9d Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Mon Jun 12 09:52:58 2023 +0800 代码规范修改 commit dc5a46e85fdee80861b0c147bd944cc167b30e89 Merge: 2bd3b4b7 e0473f1a Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Mon Jun 12 09:16:25 2023 +0800 merge release into develop merge "release" into "develop" 修改pg_default问题, 编辑表刷新和关闭更新winId，导出接口做500的错误判断, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 编辑表刷新和关闭更新winId，导出接口做500的错误判断 Created-by: zhangcheng Author-id: 7119759 MR-id: 7217451 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 编辑表刷新和关闭更新winId，导出接口做500的错误判断 See merge request: openGaussythcs00001/openGauss-workbench!247, Merge remote-tracking branch 'origin/release' into release-wyl, Merge remote-tracking branch 'origin/release' into release-wyl, merge develop into release merge "develop" into "release" 版权信息, merge release into develop merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 Created-by: wuyulin Author-id: 7119753 MR-id: 7217325 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 See merge request: openGaussythcs00001/openGauss-workbench!236, merge release into develop merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 Created-by: wuyulin Author-id: 7119753 MR-id: 7217342 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 See merge request: openGaussythcs00001/openGauss-workbench!238, merge release into develop merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 Created-by: wuyulin Author-id: 7119753 MR-id: 7217355 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 See merge request: openGaussythcs00001/openGauss-workbench!240, 缩进和版权, 配置, 仅添加java文件版权, merge release into develop merge "release" into "develop" 分区表问题修改, merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 Created-by: wuyulin Author-id: 7119753 MR-id: 7217395 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 分区表问题修改, merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 See merge request: openGaussythcs00001/openGauss-workbench!242, merge release into develop merge "release" into "develop" 代码格式化, merge feature-wyb into release merge "feature-wyb" into "release" 代码格式化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7217417 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!243, 代码格式化, merge feature-zwr into release merge "feature-zwr" into "release" 代码格式化 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217433 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!244 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217436 Commit-by: zhouwenruo;wuyuebin Merged-by: zhouwenruo Description: merge "release" into "develop" 代码格式化, merge feature-wyb into release merge "feature-wyb" into "release" 代码格式化 Created-by: wuyuebin Author-id: 7158405 MR-i Created-by: wuyulin Author-id: 7119753 MR-id: 7217751 Commit-by: wuyulin;luomeng;liupengfei;zhouwenruo;wuyuebin;张昊宇;zhangcheng Merged-by: wuyulin Description: merge "release" into "develop" 修改pg_default问题, 编辑表刷新和关闭更新winId，导出接口做500的错误判断, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 编辑表刷新和关闭更新winId，导出接口做500的错误判断 Created-by: zhangcheng Author-id: 7119759 MR-id: 7217451 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 编辑表刷新和关闭更新winId，导出接口做500的错误判断 See merge request: openGaussythcs00001/openGauss-workbench!247, Merge remote-tracking branch 'origin/release' into release-wyl, Merge remote-tracking branch 'origin/release' into release-wyl, merge develop into release merge "develop" into "release" 版权信息, merge release into develop merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 Created-by: wuyulin Author-id: 7119753 MR-id: 7217325 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 See merge request: openGaussythcs00001/openGauss-workbench!236, merge release into develop merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 Created-by: wuyulin Author-id: 7119753 MR-id: 7217342 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 See merge request: openGaussythcs00001/openGauss-workbench!238, merge release into develop merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 Created-by: wuyulin Author-id: 7119753 MR-id: 7217355 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 See merge request: openGaussythcs00001/openGauss-workbench!240, 缩进和版权, 配置, 仅添加java文件版权, merge release into develop merge "release" into "develop" 分区表问题修改, merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 Created-by: wuyulin Author-id: 7119753 MR-id: 7217395 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 分区表问题修改, merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 See merge request: openGaussythcs00001/openGauss-workbench!242, merge release into develop merge "release" into "develop" 代码格式化, merge feature-wyb into release merge "feature-wyb" into "release" 代码格式化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7217417 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!243, 代码格式化, merge feature-zwr into release merge "feature-zwr" into "release" 代码格式化 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217433 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!244 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217436 Commit-by: zhouwenruo;wuyuebin Merged-by: zhouwenruo Description: merge "release" into "develop" 代码格式化, merge feature-wyb into release merge "feature-wyb" into "release" 代码格式化 Created-by: wuyuebin Author-id: 7158405 MR-i See merge request: openGaussythcs00001/openGauss-workbench!258 commit e0473f1a8e793d68a1567c9ae47222693448f795 Merge: 435bfe3a 80c536be Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Mon Jun 12 08:48:54 2023 +0800 merge release-wyl into release merge "release-wyl" into "release" 修改pg_default问题, Merge remote-tracking branch 'origin/release' into release-wyl, Merge remote-tracking branch 'origin/release' into release-wyl, 代码格式化, 换行符, Merge branch 'release-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into release-wyl # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/compatible/opengauss/SequenceObjectSQLServiceImpl.java, 解决冲突, 代码规范修改, 规范 Created-by: wuyulin Author-id: 7119753 MR-id: 7217750 Commit-by: wuyulin;zhouwenruo Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改pg_default问题, Merge remote-tracking branch 'origin/release' into release-wyl, Merge remote-tracking branch 'origin/release' into release-wyl, 代码格式化, 换行符, Merge branch 'release-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into release-wyl # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/compatible/opengauss/SequenceObjectSQLServiceImpl.java, 解决冲突, 代码规范修改, 规范 See merge request: openGaussythcs00001/openGauss-workbench!257 commit 80c536bee6b4cb9f911868cb993346fa2a46fd37 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Mon Jun 12 08:47:20 2023 +0800 规范 commit de32590316cc0acf2f9051388e308a138fc3b773 Merge: c2b48174 2bd3b4b7 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Sun Jun 11 16:06:39 2023 +0800 merge develop into feature-lm merge "develop" into "feature-lm" 卸载,安装文本, 卸载,安装文本, codeCheck, Merge branch 'dev-zhy' into develop # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/model/param/DatabaseParamData.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/model/param/OsParamData.java, codeCheck, Merge branch 'codeCheck-lpf' into develop # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/controller/SessionController.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/handler/session/SessionHandler.java, 提交前端代码, merge feature-yangzihao-history into develop merge "feature-yangzihao-history" into "develop" 提交前端代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7217598 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-history" into "develop" 提交前端代码 See merge request: openGaussythcs00001/openGauss-workbench!254 Created-by: luomeng Author-id: 7119743 MR-id: 7217738 Commit-by: yangzihao;Zihao Yang;liupengfei;张昊宇 Merged-by: luomeng Description: merge "develop" into "feature-lm" 卸载,安装文本, 卸载,安装文本, codeCheck, Merge branch 'dev-zhy' into develop # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/model/param/DatabaseParamData.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/model/param/OsParamData.java, codeCheck, Merge branch 'codeCheck-lpf' into develop # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/controller/SessionController.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/handler/session/SessionHandler.java, 提交前端代码, merge feature-yangzihao-history into develop merge "feature-yangzihao-history" into "develop" 提交前端代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7217598 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-history" into "develop" 提交前端代码 See merge request: openGaussythcs00001/openGauss-workbench!254 See merge request: openGaussythcs00001/openGauss-workbench!256 commit 435bfe3a1a0c8ea8ed1e3bc7bdebbef9a1774959 Merge: f59b228d 2bd3b4b7 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Sun Jun 11 16:04:15 2023 +0800 merge develop into release merge "develop" into "release" 卸载,安装文本, Merge branch 'dev-zhy' into develop # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/model/param/DatabaseParamData.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/model/param/OsParamData.java, Merge branch 'codeCheck-lpf' into develop # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/controller/SessionController.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/handler/session/SessionHandler.java, 提交前端代码, merge feature-yangzihao-history into develop merge "feature-yangzihao-history" into "develop" 提交前端代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7217598 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-history" into "develop" 提交前端代码 See merge request: openGaussythcs00001/openGauss-workbench!254 Created-by: luomeng Author-id: 7119743 MR-id: 7217737 Commit-by: yangzihao;Zihao Yang;liupengfei;张昊宇 Merged-by: luomeng Description: merge "develop" into "release" 卸载,安装文本, Merge branch 'dev-zhy' into develop # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/model/param/DatabaseParamData.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/model/param/OsParamData.java, Merge branch 'codeCheck-lpf' into develop # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/controller/SessionController.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/handler/session/SessionHandler.java, 提交前端代码, merge feature-yangzihao-history into develop merge "feature-yangzihao-history" into "develop" 提交前端代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7217598 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-history" into "develop" 提交前端代码 See merge request: openGaussythcs00001/openGauss-workbench!254 See merge request: openGaussythcs00001/openGauss-workbench!255 commit 2bd3b4b7692eb4d7c2cc3e22a4e8e4c31dd40801 Merge: 168df1e4 3a10d9a5 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Fri Jun 9 19:58:57 2023 +0800 merge feature-yangzihao-history into develop merge "feature-yangzihao-history" into "develop" 提交前端代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7217598 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-history" into "develop" 提交前端代码 See merge request: openGaussythcs00001/openGauss-workbench!254 commit 3a10d9a5d1b9170d62569c6873d1d298ce509ea1 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Fri Jun 9 19:57:10 2023 +0800 提交前端代码 commit f59b228d215f10a706e1f01f3d2a5565e14d5955 Merge: 39db28b5 6fd31c6a Author: liupengfei <liupengfei@ncti-gba.cn> Date: Fri Jun 9 18:00:57 2023 +0800 Merge branch 'codeCheck-lpf' into release # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/controller/SessionController.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/handler/session/SessionHandler.java commit 168df1e431760905ba8557a3dfdf493b708fc94c Merge: 446b12e3 6fd31c6a Author: liupengfei <liupengfei@ncti-gba.cn> Date: Fri Jun 9 17:58:29 2023 +0800 Merge branch 'codeCheck-lpf' into develop # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/controller/SessionController.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/handler/session/SessionHandler.java commit 6fd31c6a621beddaecc0e59a712b2d46818b9633 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Fri Jun 9 17:50:42 2023 +0800 codeCheck commit 82dca359df078ef1dd99ff83d9c986290fe7950a Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Fri Jun 9 17:48:25 2023 +0800 代码规范修改 commit 39db28b52889e34532a3f0ec0b504965eb9c7a83 Merge: 62d1a3d0 f8b6f5ea Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Fri Jun 9 17:40:33 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 设置告警接口 Created-by: wuyuebin Author-id: 7158405 MR-id: 7217567 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 设置告警接口 See merge request: openGaussythcs00001/openGauss-workbench!253 commit f8b6f5ea719cc4fab974e44d31e6eb5cc9e384c9 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Fri Jun 9 17:37:55 2023 +0800 设置告警接口 commit 62d1a3d0ae560c8f4fc9d11e8854f687635c7a54 Merge: 2269dc78 c0d459d6 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Fri Jun 9 17:35:55 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" checkcode Created-by: wuyuebin Author-id: 7158405 MR-id: 7217559 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" checkcode See merge request: openGaussythcs00001/openGauss-workbench!252 commit c0d459d6e4f04249857156bb1b71b2e3b960b077 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Fri Jun 9 17:34:50 2023 +0800 checkcode commit a2a0e11e29e6bc2de1f09e22dfdda2e9013a2a28 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri Jun 9 17:11:59 2023 +0800 解决冲突 commit 2269dc789036de8b26230fef37ba276a6c4ba01a Merge: d096200b 994e51c7 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Jun 9 17:10:54 2023 +0800 Merge branch 'dev-zhy' into release # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/model/param/DatabaseParamData.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/model/param/OsParamData.java commit 446b12e3e2db0f5a972d5b7fc9a17691a872d4dc Merge: 3f6f57da 994e51c7 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Jun 9 17:09:52 2023 +0800 Merge branch 'dev-zhy' into develop # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/model/param/DatabaseParamData.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/model/param/OsParamData.java commit baf3e45add44e3286d4c18b64cb34fb7f0a45faf Merge: 910f795e 89ce7d75 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri Jun 9 17:09:24 2023 +0800 Merge branch 'release-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into release-wyl # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/compatible/opengauss/SequenceObjectSQLServiceImpl.java commit 994e51c77a8913b3e3db9f6550540a28bf58cf3d Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Jun 9 17:08:32 2023 +0800 codeCheck commit 910f795e518bc1e0903af3cc8ec3fd64c18e2bd4 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri Jun 9 17:02:26 2023 +0800 换行符 commit 89ce7d75bf0d9e0e3d847540699e94d1fe4fecc0 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Fri Jun 9 16:58:24 2023 +0800 代码格式化 commit d096200b4fab3d2718f81409e2d15a850b303757 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Jun 9 16:47:19 2023 +0800 卸载,安装文本 commit 3f6f57dae1ee20541f566bf47e479c64d24fa6c8 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Jun 9 16:47:19 2023 +0800 卸载,安装文本 commit 57dd7ec24e096a4f89eb5534220166ea6836f88c Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Jun 9 16:47:19 2023 +0800 卸载,安装文本 commit 47fe74b995c74915b8b672ab62f21dbdaa43f3d8 Merge: 34693a9e f0b4eb20 Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Fri Jun 9 16:37:18 2023 +0800 merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" iconfont改单引号 Created-by: zhangcheng Author-id: 7119759 MR-id: 7217505 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" iconfont改单引号 See merge request: openGaussythcs00001/openGauss-workbench!251 commit f0b4eb20323521dcec05a3971d433c1e3b53fb17 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Fri Jun 9 16:35:24 2023 +0800 iconfont改单引号 commit c2b4817418e28e1c3605058d66ee331d3bb1abda Merge: f0323451 8cb63fc1 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Fri Jun 9 16:04:35 2023 +0800 merge develop into feature-lm merge "develop" into "feature-lm" 修改sqlite初始化方式, Revert "提交代码" This reverts commit e103ff955ec521cc063adca87b25257b28405b0f, sqliteinit, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 告警中心前端代码, 告警中心后端代码, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge develop into release merge "develop" into "release" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 调整部分编辑表的功能, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 Created-by: zhangcheng Author-id: 7119759 MR-id: 7209563 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 See merge request: openGaussythcs00001/openGauss-workbench!126, 数据更新联调问题修复, merge feature-wyl into develop merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7209762 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 See merge request: openGaussythcs00001/openGauss-workbench!127, 生成函数覆盖率报告, Merge remote-tracking branch 'origin/develop' into feature-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/util/DebugUtils.java # plugins/data-studio/src/main/resources/messages_en_US.properties # plugins/data-studio/src/main/resources/messages_zh_CN.properties, 生成函数覆盖率报告, merge feature-zwr into develop merge "feature-zwr" into "develop" 生成函数覆盖率报告 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7209971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 生成函数覆盖率报告 See merge request: openGaussythcs00001/openGauss-workbench!128, 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 Created-by: zhangcheng Author-id: 7119759 MR-id: 7210033 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 See merge request: openGaussythcs00001/openGauss-workbench!130, 调整文件, 生成函数覆盖率报告, 导出视图、序列DDL功能, 导出DDL页面, 创建表, resultSet添加try去捕获, 添加导出函数，模式DDL接口, merge feature-zwr into develop merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7210854 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 See merge request: openGaussythcs00001/openGauss-workbench!131, 1, merge feature-wyl into develop merge "feature-wyl" into "develop" 创建表, 1 Created-by: wuyulin Author-id: 7119753 MR-id: 7210950 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 创建表, 1 See merge request: openGaussythcs00001/openGauss-workbench!132, Merge remote-tracking branch 'origin/develop' into feature-wyl, 导出DDL接口联调, 添加导出表数据接口, merge feature-zwr into develop merge "feature-zwr" into "develop" 添加导出表数据接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7211802 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 添加导出表数据接口 See merge request: openGaussythcs00001/openGauss-workbench!133, 表属性修改于查看新增, 导出表数据, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整文件, 导出DDL页面, 导出DDL接口联调, 导出表数据 Created-by: zhangcheng Author-id: 7119759 MR-id: 7212093 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整文件, 导出DDL页面, 导出DDL接口联调, 导出表数据 See merge request: openGaussythcs00001/openGauss-workbench!134, 接口方法调整, merge feature-wyl into develop merge "feature-wyl" into "develop" Merge remote-tracking branch 'origin/develop' into feature-wyl, 表属性修改于查看新增, 接口方法调整 Created-by: wuyulin Author-id: 7119753 MR-id: 7212264 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" Merge remote-tracking branch 'origin/develop' into feature-wyl, 表属性修改于查看新增, 接口方法调整 See merge request: openGaussythcs00001/openGauss-workbench!135, 表属性实体类修改, 前端补充两个导出, merge feature-wyl into develop merge "feature-wyl" into "develop" 表属性实体类修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7212877 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 表属性实体类修改 See merge request: openGaussythcs00001/openGauss-workbench!137, 导出数据接口调整, 导出数据接口调整, merge feature-zwr into develop merge "feature-zwr" into "develop" 导出数据接口调整, 导出数据接口调整 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7212909 Commit-by: zhouwenruo Merged-by: zhouwe Created-by: luomeng Author-id: 7119743 MR-id: 7217484 Commit-by: luomeng;zhouwenruo;wuyuebin;wuyulin;张昊宇;yangzihao;Zihao Yang;zhangcheng;liupengfei;user Merged-by: luomeng Description: merge "develop" into "feature-lm" 修改sqlite初始化方式, Revert "提交代码" This reverts commit e103ff955ec521cc063adca87b25257b28405b0f, sqliteinit, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 告警中心前端代码, 告警中心后端代码, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge develop into release merge "develop" into "release" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 调整部分编辑表的功能, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 Created-by: zhangcheng Author-id: 7119759 MR-id: 7209563 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 See merge request: openGaussythcs00001/openGauss-workbench!126, 数据更新联调问题修复, merge feature-wyl into develop merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7209762 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 See merge request: openGaussythcs00001/openGauss-workbench!127, 生成函数覆盖率报告, Merge remote-tracking branch 'origin/develop' into feature-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/util/DebugUtils.java # plugins/data-studio/src/main/resources/messages_en_US.properties # plugins/data-studio/src/main/resources/messages_zh_CN.properties, 生成函数覆盖率报告, merge feature-zwr into develop merge "feature-zwr" into "develop" 生成函数覆盖率报告 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7209971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 生成函数覆盖率报告 See merge request: openGaussythcs00001/openGauss-workbench!128, 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 Created-by: zhangcheng Author-id: 7119759 MR-id: 7210033 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 See merge request: openGaussythcs00001/openGauss-workbench!130, 调整文件, 生成函数覆盖率报告, 导出视图、序列DDL功能, 导出DDL页面, 创建表, resultSet添加try去捕获, 添加导出函数，模式DDL接口, merge feature-zwr into develop merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7210854 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 See merge request: openGaussythcs00001/openGauss-workbench!131, 1, merge feature-wyl into develop merge "feature-wyl" into "develop" 创建表, 1 Created-by: wuyulin Author-id: 7119753 MR-id: 7210950 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 创建表, 1 See merge request: openGaussythcs00001/openGauss-workbench!132, Merge remote-tracking branch 'origin/develop' into feature-wyl, 导出DDL接口联调, 添加导出表数据接口, merge feature-zwr into develop merge "feature-zwr" into "develop" 添加导出表数据接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7211802 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 添加导出表数据接口 See merge request: openGaussythcs00001/openGauss-workbench!133, 表属性修改于查看新增, 导出表数据, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整文件, 导出DDL页面, 导出DDL接口联调, 导出表数据 Created-by: zhangcheng Author-id: 7119759 MR-id: 7212093 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整文件, 导出DDL页面, 导出DDL接口联调, 导出表数据 See merge request: openGaussythcs00001/openGauss-workbench!134, 接口方法调整, merge feature-wyl into develop merge "feature-wyl" into "develop" Merge remote-tracking branch 'origin/develop' into feature-wyl, 表属性修改于查看新增, 接口方法调整 Created-by: wuyulin Author-id: 7119753 MR-id: 7212264 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" Merge remote-tracking branch 'origin/develop' into feature-wyl, 表属性修改于查看新增, 接口方法调整 See merge request: openGaussythcs00001/openGauss-workbench!135, 表属性实体类修改, 前端补充两个导出, merge feature-wyl into develop merge "feature-wyl" into "develop" 表属性实体类修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7212877 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 表属性实体类修改 See merge request: openGaussythcs00001/openGauss-workbench!137, 导出数据接口调整, 导出数据接口调整, merge feature-zwr into develop merge "feature-zwr" into "develop" 导出数据接口调整, 导出数据接口调整 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7212909 Commit-by: zhouwenruo Merged-by: zhouwe See merge request: openGaussythcs00001/openGauss-workbench!250 commit 34693a9edff7a87e9ee0dbba31f9e415c0ae4e29 Merge: 2ba2adfc 8cb63fc1 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Fri Jun 9 16:03:56 2023 +0800 merge develop into release merge "develop" into "release" 版权信息, merge release into develop merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 Created-by: wuyulin Author-id: 7119753 MR-id: 7217325 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 See merge request: openGaussythcs00001/openGauss-workbench!236, merge release into develop merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 Created-by: wuyulin Author-id: 7119753 MR-id: 7217342 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 See merge request: openGaussythcs00001/openGauss-workbench!238, merge release into develop merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 Created-by: wuyulin Author-id: 7119753 MR-id: 7217355 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 See merge request: openGaussythcs00001/openGauss-workbench!240, 缩进和版权, 配置, 仅添加java文件版权, merge release into develop merge "release" into "develop" 分区表问题修改, merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 Created-by: wuyulin Author-id: 7119753 MR-id: 7217395 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 分区表问题修改, merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 See merge request: openGaussythcs00001/openGauss-workbench!242, merge release into develop merge "release" into "develop" 代码格式化, merge feature-wyb into release merge "feature-wyb" into "release" 代码格式化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7217417 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!243, 代码格式化, merge feature-zwr into release merge "feature-zwr" into "release" 代码格式化 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217433 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!244 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217436 Commit-by: zhouwenruo;wuyuebin Merged-by: zhouwenruo Description: merge "release" into "develop" 代码格式化, merge feature-wyb into release merge "feature-wyb" into "release" 代码格式化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7217417 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!243, 代码格式化, merge feature-zwr into release merge "feature-zwr" into "release" 代码格式化 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217433 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!244 See merge request: openGaussythcs00001/openGauss-workbench!245, 历史诊断-最新代码, merge feature-lm into develop merge "feature-lm" into "develop" 历史诊断 Created-by: luomeng Author-id: 7119743 MR-id: 7217482 Commit-by: luomeng;罗梦;zhouwenruo;wuyulin;张昊宇 Merged-by: luomeng Description: merge "develop" into "release" 版权信息, merge release into develop merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 Created-by: wuyulin Author-id: 7119753 MR-id: 7217325 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 See merge request: openGaussythcs00001/openGauss-workbench!236, merge release into develop merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 Created-by: wuyulin Author-id: 7119753 MR-id: 7217342 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 See merge request: openGaussythcs00001/openGauss-workbench!238, merge release into develop merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 Created-by: wuyulin Author-id: 7119753 MR-id: 7217355 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 See merge request: openGaussythcs00001/openGauss-workbench!240, 缩进和版权, 配置, 仅添加java文件版权, merge release into develop merge "release" into "develop" 分区表问题修改, merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 Created-by: wuyulin Author-id: 7119753 MR-id: 7217395 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 分区表问题修改, merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 See merge request: openGaussythcs00001/openGauss-workbench!242, merge release into develop merge "release" into "develop" 代码格式化, merge feature-wyb into release merge "feature-wyb" into "release" 代码格式化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7217417 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!243, 代码格式化, merge feature-zwr into release merge "feature-zwr" into "release" 代码格式化 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217433 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!244 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217436 Commit-by: zhouwenruo;wuyuebin Merged-by: zhouwenruo Description: merge "release" into "develop" 代码格式化, merge feature-wyb into release merge "feature-wyb" into "release" 代码格式化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7217417 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!243, 代码格式化, merge feature-zwr into release merge "feature-zwr" into "release" 代码格式化 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217433 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!244 See merge request: openGaussythcs00001/openGauss-workbench!245, 历史诊断-最新代码, merge feature-lm into develop merge "feature-lm" into "develop" 历史诊断 See merge request: openGaussythcs00001/openGauss-workbench!249 commit 8cb63fc1ab436aaf7bb7d141dc8c13b74826f89d Merge: 723fcae0 f0323451 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Fri Jun 9 16:03:01 2023 +0800 merge feature-lm into develop merge "feature-lm" into "develop" 历史诊断-最新代码 Created-by: luomeng Author-id: 7119743 MR-id: 7217480 Commit-by: 罗梦 Merged-by: luomeng Description: merge "feature-lm" into "develop" 历史诊断-最新代码 See merge request: openGaussythcs00001/openGauss-workbench!248 commit 944a39f2790b2dde8c0328da8f3b53d0e055d373 Merge: 45ee6286 2ba2adfc Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri Jun 9 16:02:53 2023 +0800 Merge remote-tracking branch 'origin/release' into release-wyl commit 0f7dc09746ea2c7bf02e4442b915b08fea5d8dcf Merge: 45ee6286 2ba2adfc Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Fri Jun 9 16:01:07 2023 +0800 Merge remote-tracking branch 'origin/release' into release-wyl commit f0323451b1f730d335dc43b91e9e72a8573c0633 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Fri Jun 9 16:00:54 2023 +0800 历史诊断-最新代码 commit 2ba2adfc449a6ab976b80377dbff4aff6675c5fc Merge: 619d9bc8 06efa75e Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Fri Jun 9 15:29:04 2023 +0800 merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 编辑表刷新和关闭更新winId，导出接口做500的错误判断 Created-by: zhangcheng Author-id: 7119759 MR-id: 7217451 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 编辑表刷新和关闭更新winId，导出接口做500的错误判断 See merge request: openGaussythcs00001/openGauss-workbench!247 commit 06efa75ea001930573b7ed8ab6ce7f0857d280ef Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Fri Jun 9 15:27:41 2023 +0800 编辑表刷新和关闭更新winId，导出接口做500的错误判断 commit 723fcae07eedf7757ae59aaf194615502fd65509 Merge: e9c6eb82 619d9bc8 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Fri Jun 9 15:03:51 2023 +0800 merge release into develop merge "release" into "develop" 代码格式化, merge feature-wyb into release merge "feature-wyb" into "release" 代码格式化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7217417 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!243, 代码格式化, merge feature-zwr into release merge "feature-zwr" into "release" 代码格式化 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217433 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!244 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217436 Commit-by: zhouwenruo;wuyuebin Merged-by: zhouwenruo Description: merge "release" into "develop" 代码格式化, merge feature-wyb into release merge "feature-wyb" into "release" 代码格式化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7217417 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!243, 代码格式化, merge feature-zwr into release merge "feature-zwr" into "release" 代码格式化 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217433 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!244 See merge request: openGaussythcs00001/openGauss-workbench!245 commit 619d9bc8debdc14965677625309f0b70e0502433 Merge: d658e7d2 843b6fc5 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Fri Jun 9 15:02:07 2023 +0800 merge feature-zwr into release merge "feature-zwr" into "release" 代码格式化 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217433 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!244 commit 843b6fc5b0fc7f624bef8142b2c56631bbd8aad1 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Fri Jun 9 15:01:12 2023 +0800 代码格式化 commit d658e7d21a79efa19a0d6e483322742e68896e0d Merge: d93b1d16 e25870e7 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Fri Jun 9 14:46:02 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 代码格式化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7217417 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!243 commit e25870e781dd7a1a267f26c604f355583e595d1e Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Fri Jun 9 14:44:25 2023 +0800 代码格式化 commit 45ee6286e97f741e9359dabc75e8fb00008bbb99 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri Jun 9 14:22:48 2023 +0800 修改pg_default问题 commit e9c6eb829e4885bd9aa894fb1aa81089fa99d3a1 Merge: fa1381f4 d93b1d16 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Fri Jun 9 14:11:57 2023 +0800 merge release into develop merge "release" into "develop" 分区表问题修改, merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 Created-by: wuyulin Author-id: 7119753 MR-id: 7217395 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 分区表问题修改, merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 See merge request: openGaussythcs00001/openGauss-workbench!242 commit d93b1d16d001ab46b6d08f395c267e761d1b1536 Merge: e81aa6d6 50878b29 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Fri Jun 9 14:11:34 2023 +0800 merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 commit 50878b293978ca4c0684299f33fd05dc375e1ebc Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri Jun 9 14:11:10 2023 +0800 分区表问题修改 commit fa1381f4474879e93cd1c3c90d281d9f76061ee8 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Jun 9 11:46:25 2023 +0800 仅添加java文件版权 commit a206fa25d408436804059c72549ee3f397ef0dc5 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Jun 9 11:31:22 2023 +0800 配置 commit 48baffcbbcc3f6561154bb322f30fb62e28ed863 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Jun 9 11:24:57 2023 +0800 缩进和版权 commit b78719ede40875237e60827525f305c355b37a9a Merge: 611e7b24 e81aa6d6 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Fri Jun 9 11:36:27 2023 +0800 merge release into develop merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 Created-by: wuyulin Author-id: 7119753 MR-id: 7217355 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 See merge request: openGaussythcs00001/openGauss-workbench!240 commit e81aa6d6043d4edc20a775093661d25f13cde526 Merge: 7b75d033 96b79276 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Fri Jun 9 11:30:43 2023 +0800 merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 commit 96b792769551a6b49c05c6f67aac9d7eb4d4636e Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri Jun 9 11:29:03 2023 +0800 修改判断逻辑 commit 611e7b24fb82cf9ec787ffcd8b14cf98e6167109 Merge: 3ad05772 7b75d033 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Fri Jun 9 11:19:43 2023 +0800 merge release into develop merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 Created-by: wuyulin Author-id: 7119753 MR-id: 7217342 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 See merge request: openGaussythcs00001/openGauss-workbench!238 commit 7b75d033a5ecdedb1dd88520724c139daa468f2f Merge: 6dc7f16a b612c955 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Fri Jun 9 11:19:23 2023 +0800 merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 commit b612c95545e140f803670fcfe5044b8f9adee8ba Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri Jun 9 11:13:45 2023 +0800 判断逻辑修改 commit 3ad05772f46b48cac55263c19d6f4ff15159e4f9 Merge: dcbf14e1 6dc7f16a Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Fri Jun 9 11:05:16 2023 +0800 merge release into develop merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 Created-by: wuyulin Author-id: 7119753 MR-id: 7217325 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 See merge request: openGaussythcs00001/openGauss-workbench!236 commit 6dc7f16a18b42377c021ce896e1e2caa0c1580f7 Merge: 6f2224a0 d6a98fdb Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Fri Jun 9 11:04:48 2023 +0800 merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 commit d6a98fdb03d162b95a94f926a1aaa71428db254c Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri Jun 9 11:04:26 2023 +0800 添加中英 commit dcbf14e18869cec5881b3a0cfa253a15639ca179 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Jun 9 10:54:32 2023 +0800 版权信息 commit 6f2224a0b0cbe2af969e238227029d4ff5d71bb0 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Jun 9 10:45:39 2023 +0800 解决冲突,版权信息 commit 16869a8cfdffbb24be3d666488c79cd021494f77 Merge: 57321d5f b11cda1f Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Jun 9 10:42:36 2023 +0800 Merge branch 'dev-zhy' into develop commit 57321d5f56f24ad9446112b1ad15ccecd1b0558d Merge: f6abf116 7a37a0c6 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Fri Jun 9 10:29:49 2023 +0800 merge feature-yangzihao-instance into develop merge "feature-yangzihao-instance" into "develop" 前端安装部署 Created-by: yangzihao Author-id: 7119754 MR-id: 7217293 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "develop" 前端安装部署 See merge request: openGaussythcs00001/openGauss-workbench!234 commit 7a37a0c6f1d233c39081363393d1c5e12dbd713d Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Fri Jun 9 10:28:52 2023 +0800 前端安装部署 commit b11cda1fdd5382ac2517d7bf8a4858254607d16a Merge: 45541603 4faf4d09 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Jun 9 10:14:15 2023 +0800 Merge branch 'release' into dev-zhy # Conflicts: # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/controller/Config.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/Ametric.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/opengauss/OpengaussExporter.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/opengauss/Top.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/system/VmStat.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/system/cpu/LoadAvg.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/system/cpu/ProcStat.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/system/disk/DiskStats.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/system/memory/Free.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/system/memory/ProcMeminfo.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/system/network/NetDev.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/system/network/Netstat.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/system/network/SockStat.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/system/network/Socket.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/server/HostMetric.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/util/CmdUtil.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/constants/MetricsLine.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/controller/Installer.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/controller/ResourceCPUController.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/controller/SessionController.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/handler/session/OpenGaussSessionHandler.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/listener/PluginListener.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/ExporterInstallService.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/TopSQLService.java # plugins/observability-instance/web-ui/vite.config.ts commit 45541603af2f4bff018f3390f5343c526c116503 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Jun 9 10:09:30 2023 +0800 版权,缩进 commit 4faf4d096a69ad21a33b794ce582e0ad46a1d1a0 Merge: 47e3c110 c8396459 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Fri Jun 9 09:53:56 2023 +0800 Merge branch 'bugfix-zhangcheng-0630-2' into release commit c83964599569461c6cd069ec83544dd577c47a3a Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Fri Jun 9 09:52:42 2023 +0800 编辑表格加上tableType commit 47e3c11017f9e779660f9b7e8f3cfb12e48657b9 Merge: 985dbee8 588e7e62 Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Fri Jun 9 09:03:31 2023 +0800 merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 编辑表必传精度、范围 Created-by: zhangcheng Author-id: 7119759 MR-id: 7217256 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 编辑表必传精度、范围 See merge request: openGaussythcs00001/openGauss-workbench!233 commit 588e7e6288cf29467fe69d667965337d0ae9888e Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Fri Jun 9 09:02:20 2023 +0800 编辑表必传精度、范围 commit f6abf116ad25af77982c551092c43d8a4a218ce0 Merge: 93701752 985dbee8 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Fri Jun 9 08:59:05 2023 +0800 merge release into develop merge "release" into "develop" 修改sqlite初始化方式, Revert "提交代码" This reverts commit e103ff955ec521cc063adca87b25257b28405b0f, sqliteinit, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 告警中心前端代码, 告警中心后端代码, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge develop into release merge "develop" into "release" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 调整部分编辑表的功能, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 Created-by: zhangcheng Author-id: 7119759 MR-id: 7209563 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 See merge request: openGaussythcs00001/openGauss-workbench!126, 数据更新联调问题修复, merge feature-wyl into develop merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7209762 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 See merge request: openGaussythcs00001/openGauss-workbench!127, 生成函数覆盖率报告, Merge remote-tracking branch 'origin/develop' into feature-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/util/DebugUtils.java # plugins/data-studio/src/main/resources/messages_en_US.properties # plugins/data-studio/src/main/resources/messages_zh_CN.properties, 生成函数覆盖率报告, merge feature-zwr into develop merge "feature-zwr" into "develop" 生成函数覆盖率报告 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7209971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 生成函数覆盖率报告 See merge request: openGaussythcs00001/openGauss-workbench!128, 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 Created-by: zhangcheng Author-id: 7119759 MR-id: 7210033 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 See merge request: openGaussythcs00001/openGauss-workbench!130, 调整文件, 生成函数覆盖率报告, 导出视图、序列DDL功能, 导出DDL页面, 创建表, resultSet添加try去捕获, 添加导出函数，模式DDL接口, merge feature-zwr into develop merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7210854 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 See merge request: openGaussythcs00001/openGauss-workbench!131, 1, merge feature-wyl into develop merge "feature-wyl" into "develop" 创建表, 1 Created-by: wuyulin Author-id: 7119753 MR-id: 7210950 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 创建表, 1 See merge request: openGaussythcs00001/openGauss-workbench!132, Merge remote-tracking branch 'origin/develop' into feature-wyl, 导出DDL接口联调, 添加导出表数据接口, merge feature-zwr into develop merge "feature-zwr" into "develop" 添加导出表数据接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7211802 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 添加导出表数据接口 See merge request: openGaussythcs00001/openGauss-workbench!133, 表属性修改于查看新增, 导出表数据, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整文件, 导出DDL页面, 导出DDL接口联调, 导出表数据 Created-by: zhangcheng Author-id: 7119759 MR-id: 7212093 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整文件, 导出DDL页面, 导出DDL接口联调, 导出表数据 See merge request: openGaussythcs00001/openGauss-workbench!134, 接口方法调整, merge feature-wyl into develop merge "feature-wyl" into "develop" Merge remote-tracking branch 'origin/develop' into feature-wyl, 表属性修改于查看新增, 接口方法调整 Created-by: wuyulin Author-id: 7119753 MR-id: 7212264 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" Merge remote-tracking branch 'origin/develop' into feature-wyl, 表属性修改于查看新增, 接口方法调整 See merge request: openGaussythcs00001/openGauss-workbench!135, 表属性实体类修改, 前端补充两个导出, merge feature-wyl into develop merge "feature-wyl" into "develop" 表属性实体类修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7212877 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 表属性实体类修改 See merge request: openGaussythcs00001/openGauss-workbench!137, 导出数据接口调整, 导出数据接口调整, merge feature-zwr into develop merge "feature-zwr" into "develop" 导出数据接口调整, 导出数据接口调整 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7212909 Commit-by: zhouwenruo Merged-by: zhouwenru Created-by: wuyulin Author-id: 7119753 MR-id: 7217255 Commit-by: wuyulin;luomeng;zhangcheng;wuyuebin;liupengfei;user;张昊宇;zhouwenruo;yangzihao Merged-by: wuyulin Description: merge "release" into "develop" 修改sqlite初始化方式, Revert "提交代码" This reverts commit e103ff955ec521cc063adca87b25257b28405b0f, sqliteinit, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 告警中心前端代码, 告警中心后端代码, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge develop into release merge "develop" into "release" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 调整部分编辑表的功能, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 Created-by: zhangcheng Author-id: 7119759 MR-id: 7209563 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 See merge request: openGaussythcs00001/openGauss-workbench!126, 数据更新联调问题修复, merge feature-wyl into develop merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7209762 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 See merge request: openGaussythcs00001/openGauss-workbench!127, 生成函数覆盖率报告, Merge remote-tracking branch 'origin/develop' into feature-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/util/DebugUtils.java # plugins/data-studio/src/main/resources/messages_en_US.properties # plugins/data-studio/src/main/resources/messages_zh_CN.properties, 生成函数覆盖率报告, merge feature-zwr into develop merge "feature-zwr" into "develop" 生成函数覆盖率报告 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7209971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 生成函数覆盖率报告 See merge request: openGaussythcs00001/openGauss-workbench!128, 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 Created-by: zhangcheng Author-id: 7119759 MR-id: 7210033 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 See merge request: openGaussythcs00001/openGauss-workbench!130, 调整文件, 生成函数覆盖率报告, 导出视图、序列DDL功能, 导出DDL页面, 创建表, resultSet添加try去捕获, 添加导出函数，模式DDL接口, merge feature-zwr into develop merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7210854 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 See merge request: openGaussythcs00001/openGauss-workbench!131, 1, merge feature-wyl into develop merge "feature-wyl" into "develop" 创建表, 1 Created-by: wuyulin Author-id: 7119753 MR-id: 7210950 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 创建表, 1 See merge request: openGaussythcs00001/openGauss-workbench!132, Merge remote-tracking branch 'origin/develop' into feature-wyl, 导出DDL接口联调, 添加导出表数据接口, merge feature-zwr into develop merge "feature-zwr" into "develop" 添加导出表数据接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7211802 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 添加导出表数据接口 See merge request: openGaussythcs00001/openGauss-workbench!133, 表属性修改于查看新增, 导出表数据, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整文件, 导出DDL页面, 导出DDL接口联调, 导出表数据 Created-by: zhangcheng Author-id: 7119759 MR-id: 7212093 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整文件, 导出DDL页面, 导出DDL接口联调, 导出表数据 See merge request: openGaussythcs00001/openGauss-workbench!134, 接口方法调整, merge feature-wyl into develop merge "feature-wyl" into "develop" Merge remote-tracking branch 'origin/develop' into feature-wyl, 表属性修改于查看新增, 接口方法调整 Created-by: wuyulin Author-id: 7119753 MR-id: 7212264 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" Merge remote-tracking branch 'origin/develop' into feature-wyl, 表属性修改于查看新增, 接口方法调整 See merge request: openGaussythcs00001/openGauss-workbench!135, 表属性实体类修改, 前端补充两个导出, merge feature-wyl into develop merge "feature-wyl" into "develop" 表属性实体类修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7212877 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 表属性实体类修改 See merge request: openGaussythcs00001/openGauss-workbench!137, 导出数据接口调整, 导出数据接口调整, merge feature-zwr into develop merge "feature-zwr" into "develop" 导出数据接口调整, 导出数据接口调整 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7212909 Commit-by: zhouwenruo Merged-by: zhouwenru See merge request: openGaussythcs00001/openGauss-workbench!232 commit 339161ab1bb4b9716aa9808763969bafb4bd1cbe Merge: 41a30dc7 985dbee8 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Fri Jun 9 08:58:03 2023 +0800 Merge remote-tracking branch 'origin/release' into release # Conflicts: # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/Impl/HisDiagnosisServiceImpl.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/collection/agent/CurrentCpuUsageItem.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/collection/agent/DbProcessCurrentCpuItem.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/collection/agent/OtherProcessCurrentCpuItem.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/collection/agent/TopDbProcessItem.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/AspAnalysis.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/AvgCpuUsageRate.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/CurrentCpuUsage.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/CurrentSlowSql.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/CurrentWaitEvent.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/DatabaseHostLowPressure.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/DbProcessCurrentCpuUsage.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/DeadlockAnalysis.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/HistorySlowSql.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/HistoryWaitEvent.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/LockAnalysis.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/LockTimeout.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/OtherProcessAvgCpuUsage.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/OtherProcessCurrentCpuUsage.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/TopDbProcess.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/WdrAnalysis.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/util/AgentUtil.java # plugins/observability-sql-diagnosis/src/main/resources/messages.properties # plugins/observability-sql-diagnosis/src/main/resources/messages_zh_CN.properties commit 41a30dc780c623c861b3fb7648d703497e905612 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Fri Jun 9 08:56:55 2023 +0800 备份 commit 985dbee8e2fd9914443785aa5e1a9b4c8f248031 Merge: 65c7bad7 42a7733f Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Thu Jun 8 19:59:34 2023 +0800 merge release-wyl into release merge "release-wyl" into "release" Merge remote-tracking branch 'origin/release' into release-wyl, 表列数据大小取值修改, 精度问题处理, 右括号 Created-by: wuyulin Author-id: 7119753 MR-id: 7217207 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" Merge remote-tracking branch 'origin/release' into release-wyl, 表列数据大小取值修改, 精度问题处理, 右括号 See merge request: openGaussythcs00001/openGauss-workbench!231 commit 42a7733fe747a88eda3aec1156523298436e4958 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Thu Jun 8 19:57:58 2023 +0800 右括号 commit 65c7bad77edadf4d4f5a6e211670320ec5c15316 Merge: 014a12bb 93701752 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Thu Jun 8 19:54:13 2023 +0800 merge develop into release merge "develop" into "release" 提交历史数据诊断代码, merge feature-yangzihao-history into develop merge "feature-yangzihao-history" into "develop" 提交历史数据诊断代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7217202 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-history" into "develop" 提交历史数据诊断代码 See merge request: openGaussythcs00001/openGauss-workbench!229 Created-by: luomeng Author-id: 7119743 MR-id: 7217204 Commit-by: yangzihao;Zihao Yang Merged-by: luomeng Description: merge "develop" into "release" 提交历史数据诊断代码, merge feature-yangzihao-history into develop merge "feature-yangzihao-history" into "develop" 提交历史数据诊断代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7217202 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-history" into "develop" 提交历史数据诊断代码 See merge request: openGaussythcs00001/openGauss-workbench!229 See merge request: openGaussythcs00001/openGauss-workbench!230 commit 7d37837d4ca9b70722d6e0509f98b1d34129a4a2 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Thu Jun 8 19:52:56 2023 +0800 精度问题处理 commit 93701752cf5547eb55e6f570ce915e158e74c99c Merge: c0e9f1c8 135740c3 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Thu Jun 8 19:47:44 2023 +0800 merge feature-yangzihao-history into develop merge "feature-yangzihao-history" into "develop" 提交历史数据诊断代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7217202 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-history" into "develop" 提交历史数据诊断代码 See merge request: openGaussythcs00001/openGauss-workbench!229 commit 135740c30ad96b0c4cc06a2a836d223d4f8f8878 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Thu Jun 8 19:46:14 2023 +0800 提交历史数据诊断代码 commit 39fe0785a377afcb685d9325190501578e609794 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Thu Jun 8 19:23:50 2023 +0800 表列数据大小取值修改 commit 014a12bb2ed0dc71701cc185df64e97631f7a3c7 Merge: adf9ea9f 50fa721d Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Thu Jun 8 18:46:50 2023 +0800 merge release-wyl into release merge "release-wyl" into "release" 修修改表列问题 Created-by: wuyulin Author-id: 7119753 MR-id: 7216141 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修修改表列问题 See merge request: openGaussythcs00001/openGauss-workbench!217 commit 487ca25323bf3b4fdb7fa8c6374a2f477d2d997f Merge: 50fa721d adf9ea9f Author: wuyulin <wuyulin@ncti-gba.cn> Date: Thu Jun 8 16:52:19 2023 +0800 Merge remote-tracking branch 'origin/release' into release-wyl commit 50fa721d7a0805f2e480d559423fa71f12ae53c4 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Thu Jun 8 15:16:27 2023 +0800 列默认值bug修改 commit adf9ea9f4de6d2d4634c448c3fbc47bdec178a7a Merge: e5d21ace bdcc5b7b Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Thu Jun 8 10:45:25 2023 +0800 Merge branch 'bugfix-zhangcheng-0630-2' into release commit bdcc5b7b9671447eb269930f928a57c4cd1e6011 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Thu Jun 8 10:44:20 2023 +0800 iconfont.js格式2 commit e5d21ace885f04651f654e44b5c27fd3094b4b05 Merge: cf7aab76 d5f707ab Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Thu Jun 8 10:32:40 2023 +0800 Merge branch 'bugfix-zhangcheng-0630-2' into release commit d5f707ab434515f0789f7501b63b54eb4eb57ac4 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Thu Jun 8 10:28:06 2023 +0800 增加分区表不能编辑，iconfont.js格式，其他bug commit cf7aab763981a5bc863ec5a1205cb8d9b411bd94 Merge: 62b9342c dfad8dfb Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Wed Jun 7 10:20:31 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 删除该代码 Created-by: wuyuebin Author-id: 7158405 MR-id: 7216418 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 删除该代码 See merge request: openGaussythcs00001/openGauss-workbench!227 commit dfad8dfb87ba8dbcac51cb70336490c3a054a3e4 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Jun 7 10:19:26 2023 +0800 删除该代码 commit 62b9342ce05ab2d706f3881b90bb7cd560f76033 Merge: a725574b d9f3b959 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Wed Jun 7 10:15:12 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 调整黑暗模式下的样式, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 后端更换目录, 前端更换目录 Created-by: wuyuebin Author-id: 7158405 MR-id: 7216413 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 调整黑暗模式下的样式, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 后端更换目录, 前端更换目录 See merge request: openGaussythcs00001/openGauss-workbench!226 commit d9f3b95985c457ca0b5576f47fbef490a31a5619 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Jun 7 10:13:06 2023 +0800 前端更换目录 commit 9037d28acbf39a93aea80dc6b98eb9ad1123e70e Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Jun 7 10:11:45 2023 +0800 后端更换目录 commit fcade20848fb08edf6e0b9382a9bda7f5b2c58f2 Merge: 37cd6b53 a725574b Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Jun 7 10:08:18 2023 +0800 Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb commit a725574b7f2c42fbf640c773d2cc0bb90ce5c86d Merge: 7058b0b5 c0e9f1c8 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Wed Jun 7 09:42:19 2023 +0800 merge develop into release merge "develop" into "release" 历史诊断-新增诊断点代码, merge feature-lm into develop merge "feature-lm" into "develop" 历史诊断-新增诊断点代码 Created-by: luomeng Author-id: 7119743 MR-id: 7216388 Commit-by: 罗梦 Merged-by: luomeng Description: merge "feature-lm" into "develop" 历史诊断-新增诊断点代码 See merge request: openGaussythcs00001/openGauss-workbench!224 Created-by: luomeng Author-id: 7119743 MR-id: 7216391 Commit-by: luomeng;罗梦 Merged-by: luomeng Description: merge "develop" into "release" 历史诊断-新增诊断点代码, merge feature-lm into develop merge "feature-lm" into "develop" 历史诊断-新增诊断点代码 Created-by: luomeng Author-id: 7119743 MR-id: 7216388 Commit-by: 罗梦 Merged-by: luomeng Description: merge "feature-lm" into "develop" 历史诊断-新增诊断点代码 See merge request: openGaussythcs00001/openGauss-workbench!224 See merge request: openGaussythcs00001/openGauss-workbench!225 commit 37cd6b53b0ac4dd096e76b239038c2ff7f1eebed Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Jun 7 09:42:01 2023 +0800 调整黑暗模式下的样式 commit c0e9f1c83a34a5b3c5e2ea3080e15329bc11ec5c Merge: edee4b30 a8bfc1ff Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Wed Jun 7 09:36:22 2023 +0800 merge feature-lm into develop merge "feature-lm" into "develop" 历史诊断-新增诊断点代码 Created-by: luomeng Author-id: 7119743 MR-id: 7216388 Commit-by: 罗梦 Merged-by: luomeng Description: merge "feature-lm" into "develop" 历史诊断-新增诊断点代码 See merge request: openGaussythcs00001/openGauss-workbench!224 commit a8bfc1ffad81c24ab1038e7b0629efa5e15c4faa Author: 罗梦 <luomeng@ncti-gba.cn> Date: Tue Jun 6 20:09:05 2023 +0800 历史诊断-新增诊断点代码 commit 7058b0b52f2296e5e7314b3cef6d5588b8b2a82b Merge: 6c871ed1 c33bbc91 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Tue Jun 6 19:06:23 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 告警接口配置以及样式调整, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb Created-by: wuyuebin Author-id: 7158405 MR-id: 7216326 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 告警接口配置以及样式调整, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb See merge request: openGaussythcs00001/openGauss-workbench!223 commit c33bbc9124793bb956db68d031f2793d32cf0277 Merge: 4ae334cf 6c871ed1 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Jun 6 19:03:46 2023 +0800 Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb commit 4ae334cf4586cade02dac9c3b74656f9f855b49c Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Jun 6 19:02:02 2023 +0800 告警接口配置以及样式调整 commit 6c871ed181a3715b81ab5c9f795b2d763242f0c7 Merge: 44486fad edee4b30 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Tue Jun 6 19:01:48 2023 +0800 Merge branch 'develop' into release # Conflicts: # plugins/observability-sql-diagnosis/web-ui/src/components/echarts/LazyLine.vue commit edee4b30a7d0c19f9b45fbf8e9a7cbd20e636149 Merge: eb17d144 ef13151b Author: liupengfei <liupengfei@ncti-gba.cn> Date: Tue Jun 6 18:52:00 2023 +0800 Merge remote-tracking branch 'origin/develop' into develop commit eb17d144b1e717923c489d63d6d1a1495a876efe Author: liupengfei <liupengfei@ncti-gba.cn> Date: Tue Jun 6 18:50:46 2023 +0800 会话监控--处理指标没有数据的情况 commit ef13151bf5063874f1dd85da112c524fe4e82aff Merge: 1aa58763 5521be87 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Tue Jun 6 17:58:19 2023 +0800 merge feature-yangzihao-instance into develop merge "feature-yangzihao-instance" into "develop" 提交样式代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7216291 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "develop" 提交样式代码 See merge request: openGaussythcs00001/openGauss-workbench!221 commit 5521be8711fa7ecf54761c1c5c38432b9cb32809 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue Jun 6 17:57:34 2023 +0800 提交样式代码 commit 1aa58763d04d2d3585d6a7e52832fa74a7f04d67 Merge: cce0ea59 97f42a6f Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Tue Jun 6 17:52:19 2023 +0800 merge feature-yangzihao-history into develop merge "feature-yangzihao-history" into "develop" 提交诊断点代码, 撤回配置文件, 黑色样式 Created-by: yangzihao Author-id: 7119754 MR-id: 7216286 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-history" into "develop" 提交诊断点代码, 撤回配置文件, 黑色样式 See merge request: openGaussythcs00001/openGauss-workbench!220 commit cce0ea59c1cb478d7cbd684d26db2515a8bbadbd Merge: fecd2c76 d9b5c5bd Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Tue Jun 6 17:51:26 2023 +0800 merge feature-yangzihao-instance into develop merge "feature-yangzihao-instance" into "develop" 撤回app.vue修改 Created-by: yangzihao Author-id: 7119754 MR-id: 7216255 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "develop" 撤回app.vue修改 See merge request: openGaussythcs00001/openGauss-workbench!219 commit 97f42a6f316ccab556cf4715f44f045cd63772e4 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue Jun 6 17:50:04 2023 +0800 黑色样式 commit d9b5c5bd2c045f054f7c3eee7a5c7572e7a7eb02 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue Jun 6 17:04:24 2023 +0800 撤回app.vue修改 commit 151084a1c6b386dcbb24c27124b786fa980b0a89 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue Jun 6 16:59:17 2023 +0800 撤回配置文件 commit 1369cb8e907ee36b604852eb20090e385a6a3839 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue Jun 6 16:58:28 2023 +0800 提交诊断点代码 commit fecd2c76e4676ee3639fa35501217dbe4132c818 Merge: 3ecbc179 7f56da92 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Tue Jun 6 16:57:47 2023 +0800 merge feature-yangzihao-instance into develop merge "feature-yangzihao-instance" into "develop" 黑色样式代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7216245 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "develop" 黑色样式代码 See merge request: openGaussythcs00001/openGauss-workbench!218 commit 7f56da92b9bf394554634477db77f4bea2aad92a Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue Jun 6 16:53:14 2023 +0800 黑色样式代码 commit 3ecbc1799c17243902d2848e89d5d0e286e87f43 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 6 16:31:49 2023 +0800 安装 commit 9ef1657429ef2ca3b46950d5c8b0f6521f7e9d28 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 6 16:31:49 2023 +0800 安装 commit e316d23c162d9895fed4c2039713b19b3897c509 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Tue Jun 6 15:44:21 2023 +0800 会话监控--调整长事务sql commit 1b348b98b7c2f1d0e06dfed124f4c9bd1e6cc3bf Merge: e90024bd a9d37f42 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Tue Jun 6 15:42:45 2023 +0800 Merge remote-tracking branch 'origin/develop' into develop commit e90024bdfe6291a903dc6a2a6518725ffa3c1c14 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Tue Jun 6 15:37:54 2023 +0800 会话监控--调整长事务sql commit b0cff5a190de0cd6e43458b81047aea4b0320a54 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Tue Jun 6 14:14:57 2023 +0800 修修改表列问题 commit a9d37f42c9f06da04b6ad833c2bdf58b440d7435 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 6 12:08:08 2023 +0800 Squashed commit of the following: commit e6bba54e55fc82885e5d3ca0f8a40d06143731fd Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 6 12:07:11 2023 +0800 安装带配置 commit e6bba54e55fc82885e5d3ca0f8a40d06143731fd Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 6 12:07:11 2023 +0800 安装带配置 commit f30edcf70adef82487a29f30c5dea5ac4964d7e7 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Tue Jun 6 12:06:52 2023 +0800 会话监控--增加路由 commit 24a6e6079e0d5e23bcc16ee5b60f34f0eebe2629 Merge: 1c74ea9d f2d721f5 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Tue Jun 6 12:03:58 2023 +0800 merge feature-yangzihao-instance into develop merge "feature-yangzihao-instance" into "develop" 提交实例监控代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7216113 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "develop" 提交实例监控代码 See merge request: openGaussythcs00001/openGauss-workbench!216 commit f2d721f50741056ddd093471b1519c91865205cd Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue Jun 6 12:03:25 2023 +0800 提交实例监控代码 commit 44486fad80b6744663e1b27f099b1844bcd0705e Merge: 83fb3b6f 322e929c Author: user <wuguobiao@ncti-gba.cn> Date: Tue Jun 6 12:00:51 2023 +0800 Merge remote-tracking branch 'origin/master' into release # Conflicts: # plugins/observability-instance/web-ui/src/components/MyLine3.vue # plugins/observability-instance/web-ui/src/components/echarts/LazyLine.vue # plugins/observability-sql-diagnosis/web-ui/src/components/echarts/LazyLine.vue commit 83fb3b6f41ed8ea028c1567cd1971f1f0cc440ca Merge: f0018b44 256ba085 Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Tue Jun 6 11:48:59 2023 +0800 merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 增加依赖插件unplugin-auto-import, 修改表模式 Created-by: zhangcheng Author-id: 7119759 MR-id: 7216099 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 增加依赖插件unplugin-auto-import, 修改表模式 See merge request: openGaussythcs00001/openGauss-workbench!214 commit 256ba0854e7a31bd5bdf65b5c4b7c880e71d806b Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Tue Jun 6 11:44:40 2023 +0800 修改表模式 commit 322e929cb94ed8ec4b58c4da9746bc44f784fe8f Author: user <wuguobiao@ncti-gba.cn> Date: Tue Jun 6 11:43:02 2023 +0800 修改冲突问题 commit f650b1b63758d5b447c4faee4ff5cc87f2038c70 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Tue Jun 6 11:38:05 2023 +0800 增加依赖插件unplugin-auto-import commit 078e8ef3c1ac4ae5890d71a6c78d036eb6c4b45f Author: user <wuguobiao@ncti-gba.cn> Date: Tue Jun 6 11:16:36 2023 +0800 修改冲突问题 commit 7bf50f45aa9693e5d8ef97efdcfc08c13a5a3913 Author: user <wuguobiao@ncti-gba.cn> Date: Tue Jun 6 10:02:16 2023 +0800 解决冲突问题 commit f0018b44a35450d64597a0f90100801237f7918a Merge: 1d63b28f 1c74ea9d Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Tue Jun 6 09:30:10 2023 +0800 merge develop into release merge "develop" into "release" top接口移动, 更改top路径, Merge branch 'develop' into dev-zhy, exporter安装, 安装, Merge branch 'dev-zhy' into develop # Conflicts: # plugins/observability-instance/web-ui/package-lock.json # plugins/observability-instance/web-ui/yarn.lock, 历史数据诊断国际化, merge feature-yangzihao-instance into develop merge "feature-yangzihao-instance" into "develop" 历史数据诊断国际化 Created-by: yangzihao Author-id: 7119754 MR-id: 7215930 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "develop" 历史数据诊断国际化 See merge request: openGaussythcs00001/openGauss-workbench!202, 会话监控--优化sql, SQL诊断添加agent安装jar包, merge feature-lm into develop merge "feature-lm" into "develop" SQL诊断添加agent安装jar包 Created-by: luomeng Author-id: 7119743 MR-id: 7216000 Commit-by: 罗梦 Merged-by: luomeng Description: merge "feature-lm" into "develop" SQL诊断添加agent安装jar包 See merge request: openGaussythcs00001/openGauss-workbench!203 Created-by: luomeng Author-id: 7119743 MR-id: 7216002 Commit-by: luomeng;罗梦;liupengfei;yangzihao;Zihao Yang;张昊宇 Merged-by: luomeng Description: merge "develop" into "release" top接口移动, 更改top路径, Merge branch 'develop' into dev-zhy, exporter安装, 安装, Merge branch 'dev-zhy' into develop # Conflicts: # plugins/observability-instance/web-ui/package-lock.json # plugins/observability-instance/web-ui/yarn.lock, 历史数据诊断国际化, merge feature-yangzihao-instance into develop merge "feature-yangzihao-instance" into "develop" 历史数据诊断国际化 Created-by: yangzihao Author-id: 7119754 MR-id: 7215930 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "develop" 历史数据诊断国际化 See merge request: openGaussythcs00001/openGauss-workbench!202, 会话监控--优化sql, SQL诊断添加agent安装jar包, merge feature-lm into develop merge "feature-lm" into "develop" SQL诊断添加agent安装jar包 Created-by: luomeng Author-id: 7119743 MR-id: 7216000 Commit-by: 罗梦 Merged-by: luomeng Description: merge "feature-lm" into "develop" SQL诊断添加agent安装jar包 See merge request: openGaussythcs00001/openGauss-workbench!203 See merge request: openGaussythcs00001/openGauss-workbench!204 commit 1c74ea9d76edaa717650ae1fd9d3677b3bc064bb Merge: aa60a98f a7bebc22 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Tue Jun 6 09:28:01 2023 +0800 merge feature-lm into develop merge "feature-lm" into "develop" SQL诊断添加agent安装jar包 Created-by: luomeng Author-id: 7119743 MR-id: 7216000 Commit-by: 罗梦 Merged-by: luomeng Description: merge "feature-lm" into "develop" SQL诊断添加agent安装jar包 See merge request: openGaussythcs00001/openGauss-workbench!203 commit a7bebc220a36025dfa32429fc5a48c2b5424c620 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Tue Jun 6 09:27:06 2023 +0800 SQL诊断添加agent安装jar包 commit aa60a98f76cf89dffdc67f8e7209741eb0dd8d1f Author: liupengfei <liupengfei@ncti-gba.cn> Date: Mon Jun 5 18:52:17 2023 +0800 会话监控--优化sql commit 7b8a76f662dcfced757d00ec88efb2b2d5ef95d3 Merge: 8ea72d4f b987be5e Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Mon Jun 5 18:42:09 2023 +0800 merge feature-yangzihao-instance into develop merge "feature-yangzihao-instance" into "develop" 历史数据诊断国际化 Created-by: yangzihao Author-id: 7119754 MR-id: 7215930 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "develop" 历史数据诊断国际化 See merge request: openGaussythcs00001/openGauss-workbench!202 commit b987be5eff54d160990a9f7e7233928aab524d51 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Mon Jun 5 18:40:53 2023 +0800 历史数据诊断国际化 commit 8ea72d4f73a4592c74335d5b2662c0f3d84de108 Merge: 7611b610 b07024f2 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon Jun 5 17:49:36 2023 +0800 Merge branch 'dev-zhy' into develop # Conflicts: # plugins/observability-instance/web-ui/package-lock.json # plugins/observability-instance/web-ui/yarn.lock commit b07024f292080a383055748037d994459188b5b1 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon Jun 5 17:47:01 2023 +0800 安装 commit 1d63b28fc5132e300396c9ead61603d749832170 Merge: 8a80b45b 7611b610 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Mon Jun 5 17:44:21 2023 +0800 merge develop into release merge "develop" into "release" 打包前端, Merge branch 'dev-zhy' into develop, 提交实例监控代码, 实例监控支持跳转到历史数据诊断, merge feature-yangzihao-instance into develop merge "feature-yangzihao-instance" into "develop" 提交实例监控代码, 实例监控支持跳转到历史数据诊断 Created-by: yangzihao Author-id: 7119754 MR-id: 7215607 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "develop" 提交实例监控代码, 实例监控支持跳转到历史数据诊断 See merge request: openGaussythcs00001/openGauss-workbench!192, 提交历史数据诊断前端代码, 解决冲突, merge develop into feature-yangzihao-history merge "develop" into "feature-yangzihao-history" 冲突, merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205550 Commit-by: 罗梦;luomeng Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!92, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, merge feature-wyb into develop merge "feature-wyb" into "develop" 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205559 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录 See merge request: openGaussythcs00001/openGauss-workbench!93, 数据更新，表字段更新, 冲突, 多数据库环境安装, 冲突修复, merge feature-wyl into develop merge "feature-wyl" into "develop" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, 数据更新，表字段更新, 冲突, Created-by: luomeng Author-id: 7119743 MR-id: 7215886 Commit-by: yangzihao;Zihao Yang;zhangcheng;liupengfei;张昊宇 Merged-by: luomeng Description: merge "develop" into "release" 打包前端, Merge branch 'dev-zhy' into develop, 提交实例监控代码, 实例监控支持跳转到历史数据诊断, merge feature-yangzihao-instance into develop merge "feature-yangzihao-instance" into "develop" 提交实例监控代码, 实例监控支持跳转到历史数据诊断 Created-by: yangzihao Author-id: 7119754 MR-id: 7215607 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "develop" 提交实例监控代码, 实例监控支持跳转到历史数据诊断 See merge request: openGaussythcs00001/openGauss-workbench!192, 提交历史数据诊断前端代码, 解决冲突, merge develop into feature-yangzihao-history merge "develop" into "feature-yangzihao-history" 冲突, merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205550 Commit-by: 罗梦;luomeng Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!92, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, merge feature-wyb into develop merge "feature-wyb" into "develop" 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205559 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录 See merge request: openGaussythcs00001/openGauss-workbench!93, 数据更新，表字段更新, 冲突, 多数据库环境安装, 冲突修复, merge feature-wyl into develop merge "feature-wyl" into "develop" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, 数据更新，表字段更新, 冲突, See merge request: openGaussythcs00001/openGauss-workbench!201 commit 7611b6106bcc9b204bb059b3ec3352859f49f2bd Merge: 865feefa 6d578072 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Mon Jun 5 17:04:55 2023 +0800 merge feature-yangzihao-instance into develop merge "feature-yangzihao-instance" into "develop" 会话列表与会话详情 Created-by: yangzihao Author-id: 7119754 MR-id: 7215842 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "develop" 会话列表与会话详情 See merge request: openGaussythcs00001/openGauss-workbench!200 commit 6d578072c12905636e28387b1670d119ba202cb7 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Mon Jun 5 17:03:39 2023 +0800 会话列表与会话详情 commit 8a80b45b056760fa02141916e8845528ee4a5d7f Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Mon Jun 5 16:22:20 2023 +0800 创建同义词接口调整 (cherry picked from commit 99ae4a3c9f62a9c1aaf64a0cf5e5a6eef52f0696) commit faa48b5fd35de920b2f3a592cea1868287bae925 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Mon Jun 5 15:44:28 2023 +0800 增加ace的gutter点击区域 (cherry picked from commit 896bbbb04d0288191eabac88d73c3ceb3e38a2a7) commit 865feefaad78d0a0a4c2d928f81e18840c8f6c83 Merge: 99ae4a3c 17265714 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Mon Jun 5 16:22:34 2023 +0800 Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop commit 99ae4a3c9f62a9c1aaf64a0cf5e5a6eef52f0696 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Mon Jun 5 16:22:20 2023 +0800 创建同义词接口调整 commit 7e6113743f75b5fc01196f8c12c9c53335a9892c Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon Jun 5 16:17:24 2023 +0800 exporter安装 commit 1726571474b0c25859e1cfdebadc24bdb7b6bf46 Merge: 3d6bc2be 896bbbb0 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Mon Jun 5 16:05:35 2023 +0800 Merge remote-tracking branch 'origin/develop' into develop commit 3d6bc2be944bc246b6a65b91a313519874084cbd Author: liupengfei <liupengfei@ncti-gba.cn> Date: Mon Jun 5 16:04:08 2023 +0800 会话监控--释放jdbc连接、多线程查询、优化sql commit 896bbbb04d0288191eabac88d73c3ceb3e38a2a7 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Mon Jun 5 15:44:28 2023 +0800 增加ace的gutter点击区域 commit 8de290736a008416a65f0c54a67fe0066706f7a5 Merge: ddbeb9c6 71fdb79d Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Mon Jun 5 11:08:45 2023 +0800 merge feature-yangzihao-instance into develop merge "feature-yangzihao-instance" into "develop" 提交实例监控前端代码, 撤销yarn.lock修改 Created-by: yangzihao Author-id: 7119754 MR-id: 7215678 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "develop" 提交实例监控前端代码, 撤销yarn.lock修改 See merge request: openGaussythcs00001/openGauss-workbench!199 commit 71fdb79d65532c18a91c646ec7c55074febac071 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Mon Jun 5 11:08:02 2023 +0800 撤销yarn.lock修改 commit e4e7dc28e34e5bc23d27740f7e6fdf65b6518446 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Mon Jun 5 11:05:35 2023 +0800 提交实例监控前端代码 commit ddbeb9c69b877f16c7d981ca74442c7ecd6bcf4d Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Mon Jun 5 10:29:47 2023 +0800 查看表格数据列宽的问题 commit 1cdfd661c40d4b2232fd76c8eff216a182a019fa Merge: bc52b3e9 941f9744 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Mon Jun 5 10:46:54 2023 +0800 merge feature-yangzihao-history into develop merge "feature-yangzihao-history" into "develop" 历史数据诊断前端代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7215663 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-history" into "develop" 历史数据诊断前端代码 See merge request: openGaussythcs00001/openGauss-workbench!197 commit 941f97443e080b1f96f689daf1530adf88bf1ea4 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Mon Jun 5 10:44:05 2023 +0800 历史数据诊断前端代码 commit 2916ddaefc3a0e59a53a96590cc67f582869faff Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Mon Jun 5 10:29:47 2023 +0800 查看表格数据列宽的问题 commit f683b06ec76be02b6a0bd668d8adbd0dc0a36b7a Merge: 5735f28a bc52b3e9 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon Jun 5 10:12:44 2023 +0800 Merge branch 'develop' into dev-zhy commit 5735f28a2fbf22d72339904cd1ef1123abc905c8 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon Jun 5 10:11:52 2023 +0800 更改top路径 commit bc52b3e9c4d1fadff4fafe4cbe61a265f7de4f0e Merge: cb85dd74 679bbaad Author: liupengfei <liupengfei@ncti-gba.cn> Date: Mon Jun 5 10:04:22 2023 +0800 Merge branch 'feature-lm' into develop commit 679bbaadec783372aa6910f0aaff522dc9bf8767 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Mon Jun 5 10:02:55 2023 +0800 会话监控 commit cf312617e27fbfefcdb9afc2c25814717fcb40fd Merge: 9f058583 c3651c94 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Mon Jun 5 09:44:09 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 告警中心前端代码, 告警中心后端代码, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 告警中心代码更新, 告警中心代码更新, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 告警中心代码更新, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 告警通知功能 Created-by: wuyuebin Author-id: 7158405 MR-id: 7215629 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 告警中心前端代码, 告警中心后端代码, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 告警中心代码更新, 告警中心代码更新, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 告警中心代码更新, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 告警通知功能 See merge request: openGaussythcs00001/openGauss-workbench!196 commit c3651c94e473441060588c9f8e55a0c3c7d25097 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Jun 5 09:41:36 2023 +0800 告警通知功能 commit 094885dc9e96de3dd48e6da13a8b848bb89db880 Merge: e9853d6e 9f058583 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Jun 5 09:36:42 2023 +0800 Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb commit cb85dd7412fd25fd31af7d37af0e900f5d2bdcd4 Merge: 87f61660 bc94c3b8 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Mon Jun 5 09:03:51 2023 +0800 merge feature-yangzihao-history into develop merge "feature-yangzihao-history" into "develop" merge develop into feature-yangzihao-history merge "develop" into "feature-yangzihao-history" 冲突, merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205550 Commit-by: 罗梦;luomeng Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!92, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, merge feature-wyb into develop merge "feature-wyb" into "develop" 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205559 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录 See merge request: openGaussythcs00001/openGauss-workbench!93, 数据更新，表字段更新, 冲突, 多数据库环境安装, 冲突修复, merge feature-wyl into develop merge "feature-wyl" into "develop" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, 数据更新，表字段更新, 冲突, 冲突修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7205661 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, 数据更新，表字段更新, 冲突, 冲突修复 See merge request: openGaussythcs00001/openGauss-workbench!96 Created-by: luomeng Author-id: 7119743 MR-id: Created-by: yangzihao Author-id: 7119754 MR-id: 7215611 Commit-by: Zihao Yang;yangzihao Merged-by: yangzihao Description: merge "feature-yangzihao-history" into "develop" merge develop into feature-yangzihao-history merge "develop" into "feature-yangzihao-history" 冲突, merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205550 Commit-by: 罗梦;luomeng Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!92, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, merge feature-wyb into develop merge "feature-wyb" into "develop" 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205559 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录 See merge request: openGaussythcs00001/openGauss-workbench!93, 数据更新，表字段更新, 冲突, 多数据库环境安装, 冲突修复, merge feature-wyl into develop merge "feature-wyl" into "develop" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, 数据更新，表字段更新, 冲突, 冲突修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7205661 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, 数据更新，表字段更新, 冲突, 冲突修复 See merge request: openGaussythcs00001/openGauss-workbench!96 Created-by: luomeng Author-id: 7119743 MR-id: See merge request: openGaussythcs00001/openGauss-workbench!195 commit bc94c3b801dd757401d27aa79211ac412fc7069a Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Mon Jun 5 09:02:46 2023 +0800 提交历史诊断前端代码 commit 152a8f6888839f1ddbce924cbad404dfb98e8585 Merge: 0999c7d9 87f61660 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Mon Jun 5 09:00:33 2023 +0800 merge develop into feature-yangzihao-history merge "develop" into "feature-yangzihao-history" 冲突, merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205550 Commit-by: 罗梦;luomeng Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!92, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, merge feature-wyb into develop merge "feature-wyb" into "develop" 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205559 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录 See merge request: openGaussythcs00001/openGauss-workbench!93, 数据更新，表字段更新, 冲突, 多数据库环境安装, 冲突修复, merge feature-wyl into develop merge "feature-wyl" into "develop" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, 数据更新，表字段更新, 冲突, 冲突修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7205661 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, 数据更新，表字段更新, 冲突, 冲突修复 See merge request: openGaussythcs00001/openGauss-workbench!96 Created-by: luomeng Author-id: 7119743 MR-id: 7205780 Commit-by: wuyulin;张昊宇;wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" Created-by: yangzihao Author-id: 7119754 MR-id: 7215610 Commit-by: yangzihao;Zihao Yang;张昊宇;zhouwenruo;zhangcheng;wuyulin;luomeng;罗梦;user;wuguobiao;wuyuebin Merged-by: yangzihao Description: merge "develop" into "feature-yangzihao-history" 冲突, merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205550 Commit-by: 罗梦;luomeng Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!92, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, merge feature-wyb into develop merge "feature-wyb" into "develop" 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205559 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录 See merge request: openGaussythcs00001/openGauss-workbench!93, 数据更新，表字段更新, 冲突, 多数据库环境安装, 冲突修复, merge feature-wyl into develop merge "feature-wyl" into "develop" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, 数据更新，表字段更新, 冲突, 冲突修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7205661 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, 数据更新，表字段更新, 冲突, 冲突修复 See merge request: openGaussythcs00001/openGauss-workbench!96 Created-by: luomeng Author-id: 7119743 MR-id: 7205780 Commit-by: wuyulin;张昊宇;wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" See merge request: openGaussythcs00001/openGauss-workbench!194 commit 87f61660496f4663042d883687e5ff27194bd771 Merge: b24d73a6 0999c7d9 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Mon Jun 5 09:00:19 2023 +0800 解决冲突 commit 0999c7d9d3b55b581be8bbba4ce186c392929261 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Mon Jun 5 08:56:30 2023 +0800 提交历史数据诊断前端代码 commit b24d73a619ef6eb8e8c755259855cd07046a9e2c Merge: ac2b45dc bc6ac8b0 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Mon Jun 5 08:54:50 2023 +0800 merge feature-yangzihao-instance into develop merge "feature-yangzihao-instance" into "develop" 提交实例监控代码, 实例监控支持跳转到历史数据诊断 Created-by: yangzihao Author-id: 7119754 MR-id: 7215607 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "develop" 提交实例监控代码, 实例监控支持跳转到历史数据诊断 See merge request: openGaussythcs00001/openGauss-workbench!192 commit bc6ac8b00b99699741266930a7ba24769b363b90 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Mon Jun 5 08:53:03 2023 +0800 实例监控支持跳转到历史数据诊断 commit 2e46647eb5e34fde08d67dfe3e43e40870a0640b Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Jun 2 18:16:42 2023 +0800 top接口移动 commit 7b280812f7169691bfa0050ed4e8778484fe49d5 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Fri Jun 2 18:01:43 2023 +0800 提交实例监控代码 commit 9f05858388017ff9dda28c4223a15354957b18a6 Merge: 8778b105 23d4b00f Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Jun 2 15:47:32 2023 +0800 Merge branch 'dev-zhy' into release commit ac2b45dceaa812a2cdf9c211300516fadfbc1fb3 Merge: a065a6c1 23d4b00f Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Jun 2 15:45:55 2023 +0800 Merge branch 'dev-zhy' into develop commit a065a6c1c76acc80ecaa7ee8981aa5d20aa5a253 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Jun 2 15:45:47 2023 +0800 打包前端 commit 23d4b00fb6d5ec5bd9eb3fbb79e0924ac27b40d2 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Jun 2 15:37:37 2023 +0800 接口 commit ac2262fbd67ad67e93aefcd1eaf36b4d657f6771 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Jun 2 14:41:26 2023 +0800 添加topsql的等待事件统计 commit a1a460a6aff44b5578bd5c88d146c134fc6351a6 Merge: 002e4d9c 8a52033d Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Jun 2 09:22:27 2023 +0800 Merge branch 'develop' into dev-zhy commit 002e4d9c72bbdbd18190afdd573faf63e041ef50 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Jun 2 09:21:44 2023 +0800 修复 commit 8778b1050440b56bb1b6963027f211b8b44238cf Merge: 7e82fa09 8a52033d Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Thu Jun 1 16:34:46 2023 +0800 merge develop into release merge "develop" into "release" 提交实例监控指标前端代码, merge feature-yangzihao-instance into develop merge "feature-yangzihao-instance" into "develop" 提交实例监控指标前端代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7215007 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "develop" 提交实例监控指标前端代码 See merge request: openGaussythcs00001/openGauss-workbench!187, 修改导出文件名称, merge feature-zwr into develop merge "feature-zwr" into "develop" 修改导出文件名称 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7215067 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 修改导出文件名称 See merge request: openGaussythcs00001/openGauss-workbench!188, 增加系统模式不能编辑删除的功能, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, 导出表数据限制字符数输入, 修复导出表数据Text问题, merge feature-zwr into develop merge "feature-zwr" into "develop" 修复导出表数据Text问题 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7215258 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 修复导出表数据Text问题 See merge request: openGaussythcs00001/openGauss-workbench!190 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7215259 Commit-by: zhouwenruo;zhangcheng;yangzihao;Zihao Yang Merged-by: zhouwenruo Description: merge "develop" into "release" 提交实例监控指标前端代码, merge feature-yangzihao-instance into develop merge "feature-yangzihao-instance" into "develop" 提交实例监控指标前端代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7215007 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "develop" 提交实例监控指标前端代码 See merge request: openGaussythcs00001/openGauss-workbench!187, 修改导出文件名称, merge feature-zwr into develop merge "feature-zwr" into "develop" 修改导出文件名称 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7215067 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 修改导出文件名称 See merge request: openGaussythcs00001/openGauss-workbench!188, 增加系统模式不能编辑删除的功能, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, 导出表数据限制字符数输入, 修复导出表数据Text问题, merge feature-zwr into develop merge "feature-zwr" into "develop" 修复导出表数据Text问题 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7215258 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 修复导出表数据Text问题 See merge request: openGaussythcs00001/openGauss-workbench!190 See merge request: openGaussythcs00001/openGauss-workbench!191 commit 7e82fa09048bada6252f27d7f004a2bdbcb4aeea Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Thu Jun 1 16:32:24 2023 +0800 修复导出表数据Text问题 cherry-pick merge request: 修复导出表数据Text问题 0e9a6f6e66384928bae74d450940330335eba527 This cherry-pick merge request !190 commit 8a52033daedb66cd29fd798821a49b53f6c057a3 Merge: a4dc138a 0e9a6f6e Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Thu Jun 1 16:32:24 2023 +0800 merge feature-zwr into develop merge "feature-zwr" into "develop" 修复导出表数据Text问题 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7215258 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 修复导出表数据Text问题 See merge request: openGaussythcs00001/openGauss-workbench!190 commit 0e9a6f6e66384928bae74d450940330335eba527 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu Jun 1 15:15:55 2023 +0800 修复导出表数据Text问题 commit 7778c6cacacb035918bb552863dbbbef9292797e Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Thu Jun 1 10:50:37 2023 +0800 导出表数据限制字符数输入 (cherry picked from commit a4dc138a2a9558770838f1044f7feb1eca582d2e) commit a4dc138a2a9558770838f1044f7feb1eca582d2e Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Thu Jun 1 10:50:37 2023 +0800 导出表数据限制字符数输入 commit 66f46fbcff26e9e7a784d2d2535a53054f6cdd14 Merge: 5dec12cf 48d5281e Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Thu Jun 1 10:31:44 2023 +0800 Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop commit 5dec12cfc9b2f010161a137cf2342603d09bd48f Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Thu Jun 1 10:29:22 2023 +0800 增加系统模式不能编辑删除的功能 commit 1abce9dcfac811405d425446f509cfeef53b927a Merge: ae6e203f a40ca8c3 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Thu Jun 1 10:29:37 2023 +0800 Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into release commit ae6e203ff5c747cd32cf93e9ea5992a24e704992 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Thu Jun 1 10:29:22 2023 +0800 增加系统模式不能编辑删除的功能 commit a40ca8c3edee75a9e21d45226bdd2c64f1536364 Merge: f6c49fb4 81ecd939 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Thu Jun 1 08:42:51 2023 +0800 merge cherry-pick-mr-188-1685580142914-auto into release merge "cherry-pick-mr-188-1685580142914-auto" into "release" 修改导出文件名称 cherry-pick merge request: 修改导出文件名称 b4b853d375a5dc140073112e68decb5167982de2 This cherry-pick merge request !188 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7215068 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "cherry-pick-mr-188-1685580142914-auto" into "release" 修改导出文件名称 cherry-pick merge request: 修改导出文件名称 b4b853d375a5dc140073112e68decb5167982de2 This cherry-pick merge request !188 See merge request: openGaussythcs00001/openGauss-workbench!189 commit 81ecd939a26ae523f0dcdcf8fb99bcde45218eff Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Thu Jun 1 08:42:10 2023 +0800 修改导出文件名称 cherry-pick merge request: 修改导出文件名称 b4b853d375a5dc140073112e68decb5167982de2 This cherry-pick merge request !188 commit 48d5281e8577a964251c4e7eac6a9cee1e1311ce Merge: 51f7cc39 b4b853d3 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Thu Jun 1 08:42:10 2023 +0800 merge feature-zwr into develop merge "feature-zwr" into "develop" 修改导出文件名称 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7215067 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 修改导出文件名称 See merge request: openGaussythcs00001/openGauss-workbench!188 commit b4b853d375a5dc140073112e68decb5167982de2 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu Jun 1 08:41:02 2023 +0800 修改导出文件名称 commit 51f7cc398a6b7298d78f748ff099c1c2c2706f92 Merge: addd98b7 1e756da6 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Wed May 31 18:00:44 2023 +0800 merge feature-yangzihao-instance into develop merge "feature-yangzihao-instance" into "develop" 提交实例监控指标前端代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7215007 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "develop" 提交实例监控指标前端代码 See merge request: openGaussythcs00001/openGauss-workbench!187 commit 1e756da6c4319c6b74cdc580cf43fabbbf7e3205 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Wed May 31 17:59:19 2023 +0800 提交实例监控指标前端代码 commit f6c49fb4f246b34481dae7ddaabbd870455d0447 Merge: edcd9406 addd98b7 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Wed May 31 17:20:26 2023 +0800 merge develop into release merge "develop" into "release" 历史数据诊断代码, merge feature-yangzihao-history into develop merge "feature-yangzihao-history" into "develop" 历史数据诊断代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7214935 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-history" into "develop" 历史数据诊断代码 See merge request: openGaussythcs00001/openGauss-workbench!183, 修改类增加型转换, 解决冲突, merge feature-wyl into develop merge "feature-wyl" into "develop" 修改类增加型转换 Created-by: wuyulin Author-id: 7119753 MR-id: 7214939 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 修改类增加型转换 See merge request: openGaussythcs00001/openGauss-workbench!184, 解决冲突, merge feature-wyl into develop merge "feature-wyl" into "develop" 解决冲突 Created-by: wuyulin Author-id: 7119753 MR-id: 7214948 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 解决冲突 See merge request: openGaussythcs00001/openGauss-workbench!185 Created-by: wuyulin Author-id: 7119753 MR-id: 7214959 Commit-by: wuyulin;yangzihao;Zihao Yang Merged-by: wuyulin Description: merge "develop" into "release" 历史数据诊断代码, merge feature-yangzihao-history into develop merge "feature-yangzihao-history" into "develop" 历史数据诊断代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7214935 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-history" into "develop" 历史数据诊断代码 See merge request: openGaussythcs00001/openGauss-workbench!183, 修改类增加型转换, 解决冲突, merge feature-wyl into develop merge "feature-wyl" into "develop" 修改类增加型转换 Created-by: wuyulin Author-id: 7119753 MR-id: 7214939 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 修改类增加型转换 See merge request: openGaussythcs00001/openGauss-workbench!184, 解决冲突, merge feature-wyl into develop merge "feature-wyl" into "develop" 解决冲突 Created-by: wuyulin Author-id: 7119753 MR-id: 7214948 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 解决冲突 See merge request: openGaussythcs00001/openGauss-workbench!185 See merge request: openGaussythcs00001/openGauss-workbench!186 commit addd98b705a8181bbefc7bb5e2bcbda33748d81a Merge: 3812a778 e163bd7b Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Wed May 31 17:09:09 2023 +0800 merge feature-wyl into develop merge "feature-wyl" into "develop" 解决冲突 Created-by: wuyulin Author-id: 7119753 MR-id: 7214948 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 解决冲突 See merge request: openGaussythcs00001/openGauss-workbench!185 commit e163bd7b4fe877b72027177d48a53e1f60d73710 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Wed May 31 17:08:11 2023 +0800 解决冲突 commit 3812a778adf5a79579e32f42de8c5e7f4dcf7e8a Merge: 5fe9eda5 e56dc5e1 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Wed May 31 17:01:52 2023 +0800 merge feature-wyl into develop merge "feature-wyl" into "develop" 修改类增加型转换 Created-by: wuyulin Author-id: 7119753 MR-id: 7214939 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 修改类增加型转换 See merge request: openGaussythcs00001/openGauss-workbench!184 commit e56dc5e180db48277604a688aefe5463d992012a Merge: 0cd873b7 5fe9eda5 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Wed May 31 17:01:37 2023 +0800 解决冲突 commit 0cd873b72860ecde12a5490e356e233d62e5778d Author: wuyulin <wuyulin@ncti-gba.cn> Date: Wed May 31 17:00:07 2023 +0800 修改类增加型转换 commit 5fe9eda5d2d75c1802ed6ab2349ea3ad3553cc96 Merge: 68c733c0 4473a639 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Wed May 31 16:53:10 2023 +0800 merge feature-yangzihao-history into develop merge "feature-yangzihao-history" into "develop" 历史数据诊断代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7214935 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-history" into "develop" 历史数据诊断代码 See merge request: openGaussythcs00001/openGauss-workbench!183 commit edcd9406e953658589a96a0d91f85e5c0be84950 Merge: 36ab3501 119d269f Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed May 31 16:51:58 2023 +0800 Merge branch 'dev-zhy' into release commit 119d269f25356598298ef4170c56cae8d1c62cfe Merge: b4b0d773 68c733c0 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed May 31 16:51:47 2023 +0800 Merge branch 'develop' into dev-zhy commit 4473a6392cff976aa3f2a892b80d18e1fabe8106 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Wed May 31 16:51:42 2023 +0800 历史数据诊断代码 commit 36ab35013310a16b134425c7ec82d22762a0f444 Merge: c993055e b4b0d773 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed May 31 16:49:46 2023 +0800 Merge branch 'dev-zhy' into release commit 68c733c05996f7ee1e2f52250562661bf5788930 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed May 31 16:48:49 2023 +0800 进程排序 commit b4b0d773cda15ecdf64aa1f507cabfcb24e0c964 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed May 31 16:48:49 2023 +0800 进程排序 commit 98a3dc0311ed2401b6d249d4b3198c5d09dae79d Merge: ba085bfb ee8fa7fc Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Wed May 31 16:46:44 2023 +0800 merge feature-yangzihao-instance into develop merge "feature-yangzihao-instance" into "develop" merge develop into feature-yangzihao-instance merge "develop" into "feature-yangzihao-instance" merge develop into feature-lm merge "develop" into "feature-lm" 文件分片上传和断点续传优化, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, promethues、es、exports、filebeat、agent安装优化, merge feature-wyb into develop merge "feature-wyb" into "develop" 文件分片上传和断点续传优化, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, promethues、es、exports、filebeat、agent安装优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7206095 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 文件分片上传和断点续传优化, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, promethues、es、exports、filebeat、agent安装优化 See merge request: openGaussythcs00001/openGauss-workbench!106, 多数据库配置, filebeat列表, filebeat卸载, 多agent安装, merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" 修改index, 修改index, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" 冲突, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205550 Created-by: yangzihao Author-id: 7119754 MR-id: 7214926 Commit-by: Zihao Yang;yangzihao Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "develop" merge develop into feature-yangzihao-instance merge "develop" into "feature-yangzihao-instance" merge develop into feature-lm merge "develop" into "feature-lm" 文件分片上传和断点续传优化, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, promethues、es、exports、filebeat、agent安装优化, merge feature-wyb into develop merge "feature-wyb" into "develop" 文件分片上传和断点续传优化, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, promethues、es、exports、filebeat、agent安装优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7206095 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 文件分片上传和断点续传优化, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, promethues、es、exports、filebeat、agent安装优化 See merge request: openGaussythcs00001/openGauss-workbench!106, 多数据库配置, filebeat列表, filebeat卸载, 多agent安装, merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" 修改index, 修改index, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" 冲突, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205550 See merge request: openGaussythcs00001/openGauss-workbench!182 commit ee8fa7fc6fff5b090855ba96bafc38508cae904f Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Wed May 31 16:45:17 2023 +0800 实例监控内存代码 commit 34a808fd2a2aab682ecc4e6db2b34efc97329b66 Merge: 4e2ab03e 2ad675c9 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Wed May 31 16:38:51 2023 +0800 Merge branch 'feature-yangzihao-instance' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-yangzihao-instance commit 4e2ab03e48cfc3c5313097c1a05091b564282505 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Wed May 31 16:38:12 2023 +0800 提交实例监控内存代码 commit c993055eae34e7096b0216ae9a9d19e338548462 Merge: 5fc15f75 ba085bfb Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Wed May 31 15:49:34 2023 +0800 merge develop into release merge "develop" into "release" 修改导出模式DDL和数据参数, 修改导出文件名称, ds修bug, merge feature-zwr into develop merge "feature-zwr" into "develop" 修改导出模式DDL和数据参数 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7214867 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 修改导出模式DDL和数据参数 See merge request: openGaussythcs00001/openGauss-workbench!180 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7214891 Commit-by: zhouwenruo;zhangcheng Merged-by: zhouwenruo Description: merge "develop" into "release" 修改导出模式DDL和数据参数, 修改导出文件名称, ds修bug, merge feature-zwr into develop merge "feature-zwr" into "develop" 修改导出模式DDL和数据参数 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7214867 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 修改导出模式DDL和数据参数 See merge request: openGaussythcs00001/openGauss-workbench!180 See merge request: openGaussythcs00001/openGauss-workbench!181 commit ba085bfb5fd9fd58e0c4cc18cd1e1ef0a41133bf Merge: b09cd553 6c822f4f Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Wed May 31 15:48:17 2023 +0800 merge feature-zwr into develop merge "feature-zwr" into "develop" 修改导出模式DDL和数据参数 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7214867 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 修改导出模式DDL和数据参数 See merge request: openGaussythcs00001/openGauss-workbench!180 commit b09cd553ecf5659c9424c094762e8ea827457757 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Wed May 31 15:44:51 2023 +0800 ds修bug commit 5fc15f756740a108c5ef94ca3b355835a928c18d Merge: d608dc9e f11c5454 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Wed May 31 15:45:04 2023 +0800 Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into release commit d608dc9e4e2c25bf5af9741bdbed366b6d3fed1e Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Wed May 31 15:44:51 2023 +0800 ds修bug commit 6c822f4f0c596713f7efd0d37bed3b2b9ac929b0 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Wed May 31 15:40:34 2023 +0800 修改导出文件名称 commit f11c54543b097f40b7fc81e5700832da6eccc89b Merge: 5cfd8156 47addd8e Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed May 31 15:40:13 2023 +0800 Merge branch 'dev-zhy' into release commit 47addd8e86ba7e123a46632e84f546bac02c0cca Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed May 31 15:32:37 2023 +0800 exporter commit 24f32a7e99d95dd308ef8c8e1cb23a35588a7a93 Merge: 47031bd9 9c864796 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed May 31 15:14:53 2023 +0800 Merge branch 'develop' into dev-zhy # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/constants/MetricsValue.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/controller/PageController.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/MetricsService.java commit 47031bd919b74d78e5b97f4feb12c86bc3e4e852 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed May 31 15:11:37 2023 +0800 内存，网络指标 commit 810200c40aa4dd860e9675321a469ba37fd5d993 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Wed May 31 14:55:37 2023 +0800 修改导出模式DDL和数据参数 commit 9c86479669301a5015ae0cdebe4206627b2a4914 Merge: c14d158a 46169fba Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Wed May 31 14:52:14 2023 +0800 merge feature-zwr into develop merge "feature-zwr" into "develop" 修改导出模式DDL和数据参数 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7214866 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 修改导出模式DDL和数据参数 See merge request: openGaussythcs00001/openGauss-workbench!179 commit 46169fba4e1bf61324dcfbd2532fbf988fc6e509 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Wed May 31 14:51:30 2023 +0800 修改导出模式DDL和数据参数 commit 2ad675c9441b8287356d87bbba700e6da96825e2 Merge: 9a6f5cdb c14d158a Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Wed May 31 14:40:39 2023 +0800 merge develop into feature-yangzihao-instance merge "develop" into "feature-yangzihao-instance" merge develop into feature-lm merge "develop" into "feature-lm" 文件分片上传和断点续传优化, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, promethues、es、exports、filebeat、agent安装优化, merge feature-wyb into develop merge "feature-wyb" into "develop" 文件分片上传和断点续传优化, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, promethues、es、exports、filebeat、agent安装优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7206095 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 文件分片上传和断点续传优化, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, promethues、es、exports、filebeat、agent安装优化 See merge request: openGaussythcs00001/openGauss-workbench!106, 多数据库配置, filebeat列表, filebeat卸载, 多agent安装, merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" 修改index, 修改index, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" 冲突, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205550 Commit-by: 罗梦;luomeng Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" m Created-by: yangzihao Author-id: 7119754 MR-id: 7214860 Commit-by: yangzihao;zhouwenruo;zhangcheng;张昊宇;wuyulin;luomeng;罗梦;Zihao Yang Merged-by: yangzihao Description: merge "develop" into "feature-yangzihao-instance" merge develop into feature-lm merge "develop" into "feature-lm" 文件分片上传和断点续传优化, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, promethues、es、exports、filebeat、agent安装优化, merge feature-wyb into develop merge "feature-wyb" into "develop" 文件分片上传和断点续传优化, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, promethues、es、exports、filebeat、agent安装优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7206095 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 文件分片上传和断点续传优化, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, promethues、es、exports、filebeat、agent安装优化 See merge request: openGaussythcs00001/openGauss-workbench!106, 多数据库配置, filebeat列表, filebeat卸载, 多agent安装, merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" 修改index, 修改index, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" 冲突, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205550 Commit-by: 罗梦;luomeng Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" m See merge request: openGaussythcs00001/openGauss-workbench!178 commit c14d158a3da5236f7b7b703b4c87fd5ad0cb831a Merge: 2ca203eb 9a6f5cdb Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Wed May 31 14:37:38 2023 +0800 merge feature-yangzihao-instance into develop merge "feature-yangzihao-instance" into "develop" 提交实例监控前端代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7214856 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "develop" 提交实例监控前端代码 See merge request: openGaussythcs00001/openGauss-workbench!177 commit 9a6f5cdba541a461a79cb76cf68a5a0f6390fa85 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Wed May 31 14:36:16 2023 +0800 提交实例监控前端代码 commit 5cfd81567c56db8b864558b5925258c7536fc7ff Merge: f059be0c 2ca203eb Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Wed May 31 10:28:28 2023 +0800 merge develop into release merge "develop" into "release" 调整导出表数据文件名, merge feature-zwr into develop merge "feature-zwr" into "develop" 调整导出表数据文件名 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7214783 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 调整导出表数据文件名 See merge request: openGaussythcs00001/openGauss-workbench!175 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7214784 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "develop" into "release" 调整导出表数据文件名, merge feature-zwr into develop merge "feature-zwr" into "develop" 调整导出表数据文件名 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7214783 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 调整导出表数据文件名 See merge request: openGaussythcs00001/openGauss-workbench!175 See merge request: openGaussythcs00001/openGauss-workbench!176 commit 2ca203eb1c40c99b440504e5f33681d0b5f059d7 Merge: b23a8f9e a66924ec Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Wed May 31 10:27:56 2023 +0800 merge feature-zwr into develop merge "feature-zwr" into "develop" 调整导出表数据文件名 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7214783 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 调整导出表数据文件名 See merge request: openGaussythcs00001/openGauss-workbench!175 commit a66924ec01f1ad839ddb042f5e2303a4816b9c49 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Wed May 31 10:26:38 2023 +0800 调整导出表数据文件名 commit f059be0c3521aff41de1e057ea6feb7f9ad180e1 Merge: 533422c0 b23a8f9e Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Wed May 31 09:56:02 2023 +0800 merge develop into release merge "develop" into "release" 增加调试函数时禁止关闭标签功能, 查看表的ddl优化样式, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 增加调试函数时禁止关闭标签功能, 查看表的ddl优化样式 Created-by: zhangcheng Author-id: 7119759 MR-id: 7214629 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 增加调试函数时禁止关闭标签功能, 查看表的ddl优化样式 See merge request: openGaussythcs00001/openGauss-workbench!170, io指标, 调试子函数-切换窗口, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调试子函数-切换窗口 Created-by: zhangcheng Author-id: 7119759 MR-id: 7214663 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调试子函数-切换窗口 See merge request: openGaussythcs00001/openGauss-workbench!171, 调整函数/过程循环调用相关接口, merge feature-zwr into develop merge "feature-zwr" into "develop" 调整函数/过程循环调用相关接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7214672 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 调整函数/过程循环调用相关接口 See merge request: openGaussythcs00001/openGauss-workbench!172, 调整函数/过程循环调用相关接口, merge feature-zwr into develop merge "feature-zwr" into "develop" 调整函数/过程循环调用相关接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7214764 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 调整函数/过程循环调用相关接口 See merge request: openGaussythcs00001/openGauss-workbench!173 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7214766 Commit-by: zhouwenruo;zhangcheng;张昊宇 Merged-by: zhouwenruo Description: merge "develop" into "release" 增加调试函数时禁止关闭标签功能, 查看表的ddl优化样式, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 增加调试函数时禁止关闭标签功能, 查看表的ddl优化样式 Created-by: zhangcheng Author-id: 7119759 MR-id: 7214629 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 增加调试函数时禁止关闭标签功能, 查看表的ddl优化样式 See merge request: openGaussythcs00001/openGauss-workbench!170, io指标, 调试子函数-切换窗口, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调试子函数-切换窗口 Created-by: zhangcheng Author-id: 7119759 MR-id: 7214663 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调试子函数-切换窗口 See merge request: openGaussythcs00001/openGauss-workbench!171, 调整函数/过程循环调用相关接口, merge feature-zwr into develop merge "feature-zwr" into "develop" 调整函数/过程循环调用相关接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7214672 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 调整函数/过程循环调用相关接口 See merge request: openGaussythcs00001/openGauss-workbench!172, 调整函数/过程循环调用相关接口, merge feature-zwr into develop merge "feature-zwr" into "develop" 调整函数/过程循环调用相关接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7214764 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 调整函数/过程循环调用相关接口 See merge request: openGaussythcs00001/openGauss-workbench!173 See merge request: openGaussythcs00001/openGauss-workbench!174 commit b23a8f9ebc1c0d0cfdf6cf5883f82744bf9ecc37 Merge: 3ef9d091 702c5824 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Wed May 31 09:53:53 2023 +0800 merge feature-zwr into develop merge "feature-zwr" into "develop" 调整函数/过程循环调用相关接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7214764 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 调整函数/过程循环调用相关接口 See merge request: openGaussythcs00001/openGauss-workbench!173 commit 702c5824963fc18b70834da0a88275945d9be365 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Wed May 31 09:52:47 2023 +0800 调整函数/过程循环调用相关接口 commit e9853d6e19890c0bcc9531fe6f645d7d43aa5178 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed May 31 09:13:53 2023 +0800 告警中心代码更新 commit c851dd24363d951a94685b8ddbac199cfce31ba4 Merge: 27eaf8d5 3ef9d091 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed May 31 09:12:10 2023 +0800 Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb commit 3ef9d09189187620bfdeea9146deb3a75f6844d3 Merge: 142374d4 98f7941a Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Tue May 30 17:50:12 2023 +0800 merge feature-zwr into develop merge "feature-zwr" into "develop" 调整函数/过程循环调用相关接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7214672 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 调整函数/过程循环调用相关接口 See merge request: openGaussythcs00001/openGauss-workbench!172 commit 98f7941a41af2fd3df904a3d5c020fc5c2d2ba86 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Tue May 30 17:48:16 2023 +0800 调整函数/过程循环调用相关接口 commit 142374d4b0e00c0bf454f718362f175e3137f52a Merge: 04421290 c61915e7 Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Tue May 30 17:30:42 2023 +0800 merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调试子函数-切换窗口 Created-by: zhangcheng Author-id: 7119759 MR-id: 7214663 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调试子函数-切换窗口 See merge request: openGaussythcs00001/openGauss-workbench!171 commit c61915e7146cbf6d92e1b0ad47eaee0041eb76f4 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Tue May 30 17:29:36 2023 +0800 调试子函数-切换窗口 commit 533422c07198e001db4c8abe8aa13c6f4ddbbaf4 Merge: 84386fe5 4322f7da Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue May 30 17:24:28 2023 +0800 Merge branch 'dev-zhy' into release commit 04421290e53d2794281d0093aa8b7400ed5d2d3e Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue May 30 17:22:24 2023 +0800 io指标 commit 4322f7da173861fd9202e50e65cc3b5a3e927562 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue May 30 17:22:24 2023 +0800 io指标 commit 330564b8e71f8b8f5ed667f3bcc83a1b5777f12c Merge: 9ea4b57d c7bb2ec8 Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Tue May 30 16:50:15 2023 +0800 merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 增加调试函数时禁止关闭标签功能, 查看表的ddl优化样式 Created-by: zhangcheng Author-id: 7119759 MR-id: 7214629 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 增加调试函数时禁止关闭标签功能, 查看表的ddl优化样式 See merge request: openGaussythcs00001/openGauss-workbench!170 commit c7bb2ec86b507d17acdf331efe1c16cd7dabd9ed Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Tue May 30 16:48:45 2023 +0800 查看表的ddl优化样式 commit 9ea4b57d581eb0357f80320ed4e3f2edc7c5a95c Merge: 6d73ea5c 0234c9e0 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Tue May 30 14:13:06 2023 +0800 merge feature-yangzihao-instance into develop merge "feature-yangzihao-instance" into "develop" CPU图增加单位, 修改图表样式 Created-by: yangzihao Author-id: 7119754 MR-id: 7214553 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "develop" CPU图增加单位, 修改图表样式 See merge request: openGaussythcs00001/openGauss-workbench!169 commit 0234c9e01252baf4bacd7ae699dc5b7c435cd975 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue May 30 14:11:47 2023 +0800 修改图表样式 commit 4b8e914798e62e98265c586946d2fd8d0a0a534d Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue May 30 13:00:57 2023 +0800 CPU图增加单位 commit 6d73ea5cb1e9498e5fc9a645f592298afa90f0e8 Merge: 98b66855 dc1322f9 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Tue May 30 12:45:17 2023 +0800 merge feature-yangzihao-instance into develop merge "feature-yangzihao-instance" into "develop" 增加数据库进程CPU使用率 Created-by: yangzihao Author-id: 7119754 MR-id: 7214532 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "develop" 增加数据库进程CPU使用率 See merge request: openGaussythcs00001/openGauss-workbench!168 commit dc1322f984b2293180b910d7202ce5b487afbea3 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue May 30 12:44:49 2023 +0800 增加数据库进程CPU使用率 commit 5c0c5f19a128fca3ba5fdc0eb2c9fe4526aa7912 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Tue May 30 11:54:40 2023 +0800 增加调试函数时禁止关闭标签功能 commit 98b6685500903ee062bffa6ecb23bef50f952219 Merge: 1863e49a 933dceaa Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Tue May 30 11:44:34 2023 +0800 merge feature-yangzihao-instance into develop merge "feature-yangzihao-instance" into "develop" 提交实例监控代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7214520 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "develop" 提交实例监控代码 See merge request: openGaussythcs00001/openGauss-workbench!167 commit 933dceaa7a62378e45a65eedbb428a5e72688b64 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue May 30 11:42:33 2023 +0800 提交实例监控代码 commit 1863e49aefdd058ca0eb16253543f46c7aba9abd Merge: 15ab3826 3df99323 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Tue May 30 11:16:23 2023 +0800 merge feature-wyl into develop merge "feature-wyl" into "develop" 修改查询语句 Created-by: wuyulin Author-id: 7119753 MR-id: 7214507 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 修改查询语句 See merge request: openGaussythcs00001/openGauss-workbench!166 commit 3df993233ac89cba5127fbc1b639fa93a45e03f7 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Tue May 30 11:14:19 2023 +0800 修改查询语句 commit 84386fe52b54cc3ee375050a6fe57e353957937f Merge: cb61a616 15ab3826 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Tue May 30 09:20:36 2023 +0800 merge develop into release merge "develop" into "release" merge "develop" into "master" 日志检索-修复日志内容解析问题, merge "bugfix_lm_20230321" into "develop" 日志检索-修复日志内容解析问题, 添加unzip安装/校验, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, 添加旧数据处理, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, merge "feature-wyb" into "develop" merge "develop" into "master" 连接信息删除后重置, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, sql诊断_%IOWait高-分布图_数据显示被遮挡, sql诊断_%IOWait高-分布图_数据显示被遮挡, 重新设计AppStore的lastestConnectDatabase, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, merge "bugfix_lm_20230321" into "develop" 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "feature-wyb" into "develop" 修改文案,添加历史数据源, 添加压缩包, SQL诊断-国际化参数诊断, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "develop" into "master" 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, merge "feature-wyb" into "develop" 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench, el-table移除key=“Math.random()”属性,, merge "develop" into "master" agent-修改TCP取数时间周期, 日志检索-修改中文备注, merge "bugfix_lm_20230321" into "develop" agent-修改TCP取数时间周期, 日志检索-修改中文备注, 修复日志分布图自适应问题, 添加诊断预校验,多进程不调用bcc.ssh添加异常信息.TCPTOP格式修改, merge "develop" into "master" 修复日志分布图无法收起问题, merge "feature-wyb" into "develop" 修复日志分布图无法收起问题, 添加诊断预校验,多进程不调用bcc.ssh添加异常信息.TCPTOP格式修改, merge "develop" into "master" 修改长度, merge "develop_wyl" into "develop" 修改长度, 更新 README.md, merge "develop" into "master" exporter环境防空,bcc校验sql修改, 迁代码：修复父子窗口关闭时联动的问题, 补充DSreadme审核人, 补充DSreadme审核人, 移除pid后设置结果, merge "develop" into "master" 移除pid后设置结果, 日志检索离线安装服务elasticsearch的bug, 日志检索离线安装服务elasticsearch的bug, 日志检索离线安装服务elasticsearch的bug, 日志检索离线安装服务elasticsearch的bug, filebeat配置移除尾部/, filebeat配置移除尾部/, 修复离线上传文件后，再次查看文件上传组件时，没有显示上传文件名的bug, 修复无法新增sql诊断的问题, 修复离线上传文件后，再次查看文件上传组件时，没有显示上传文件名的bug, 修复无法新增sql诊断的问题, !157 执行SQL诊断任务报错,卸载代理exporter_初始化失败 Merge pull request !157 from 板栗/master # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/ExporterService.java, 修复readme有些图片无法显示的问题, filebeat修改权限, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench, 数据库线程池校验, 诊断_执行计划图未显示及数据问题, 实例监控_离线安装_上传包界面显示上传的包名不正确, , , merge "develop" into "master" agent-修复onCpu和offCpu原始文件为空的判断逻辑, merge "bugfix_lm_20230328" into "develop" agent-修复onCpu和offCpu原始文件为空的判断逻辑, , 添加FAQ # Conflicts: # plugins/observability-sql-diagnosis/README.md, FAQ修改, FAQ修改, merge develop into master merge "develop" into "master" 调整多层子函数功能, 迁代码：修复父子窗口关闭时联动的问题 (cherry picked from commit 065ad437e04fb3b309ffa2d18fdd747523cf973a), 创建编辑模式功能ui, 函数/过程功能重构, 调整无用代码, terminal：主窗口调试oldWindowName应该为空，父子函数按钮控制由后端控制, Merge branch 'feature-zhangcheng-模式' into feature-zhangcheng, 添加FAQ, 添加FAQ # Conflicts: # plugins/observability-sql-diagnosis/README.md # Conflicts: # plugins/observability-sql-diagnosis/README.md, FAQ修改, FAQ修改, 调整函数/过程参数处理, 新增模式管理功能模块, 模式接口联调, 恢复pom文件, 函数/过程调整, 修复sonar，华为云上报的致命和严重问题, 修复sonar，华为云上报的致命和严重问题, merge "develop-wuguobiao-fix-sonar-20230406" into "develop" 修复sonar，华为云上报的致命和严重问题,, 兼容修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/DatabaseFunctionSPServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/DbConnectionServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/SqlWindowByJdbcServiceImpl.java, 兼容修改, 冲突, 冲突, 1, 更新, Merge branch 'feature-zwr-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-zwr-wyl, merge "feature-zwr-wyl" into "feature-zwr" 兼容修改 # Conflicts: # plugins/data-studio/src/main/java/com Created-by: luomeng Author-id: 7119743 MR-id: 7214446 Commit-by: luomeng;罗梦;张昊宇;zhangcheng;yangzihao;Zihao Yang;wuyulin;zhouwenruo;user;wuguobiao;zengseliang;wuyuebin;opengauss-bot Merged-by: luomeng Description: merge "develop" into "release" merge "develop" into "master" 日志检索-修复日志内容解析问题, merge "bugfix_lm_20230321" into "develop" 日志检索-修复日志内容解析问题, 添加unzip安装/校验, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, 添加旧数据处理, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, merge "feature-wyb" into "develop" merge "develop" into "master" 连接信息删除后重置, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, sql诊断_%IOWait高-分布图_数据显示被遮挡, sql诊断_%IOWait高-分布图_数据显示被遮挡, 重新设计AppStore的lastestConnectDatabase, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, merge "bugfix_lm_20230321" into "develop" 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "feature-wyb" into "develop" 修改文案,添加历史数据源, 添加压缩包, SQL诊断-国际化参数诊断, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "develop" into "master" 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, merge "feature-wyb" into "develop" 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench, el-table移除key=“Math.random()”属性,, merge "develop" into "master" agent-修改TCP取数时间周期, 日志检索-修改中文备注, merge "bugfix_lm_20230321" into "develop" agent-修改TCP取数时间周期, 日志检索-修改中文备注, 修复日志分布图自适应问题, 添加诊断预校验,多进程不调用bcc.ssh添加异常信息.TCPTOP格式修改, merge "develop" into "master" 修复日志分布图无法收起问题, merge "feature-wyb" into "develop" 修复日志分布图无法收起问题, 添加诊断预校验,多进程不调用bcc.ssh添加异常信息.TCPTOP格式修改, merge "develop" into "master" 修改长度, merge "develop_wyl" into "develop" 修改长度, 更新 README.md, merge "develop" into "master" exporter环境防空,bcc校验sql修改, 迁代码：修复父子窗口关闭时联动的问题, 补充DSreadme审核人, 补充DSreadme审核人, 移除pid后设置结果, merge "develop" into "master" 移除pid后设置结果, 日志检索离线安装服务elasticsearch的bug, 日志检索离线安装服务elasticsearch的bug, 日志检索离线安装服务elasticsearch的bug, 日志检索离线安装服务elasticsearch的bug, filebeat配置移除尾部/, filebeat配置移除尾部/, 修复离线上传文件后，再次查看文件上传组件时，没有显示上传文件名的bug, 修复无法新增sql诊断的问题, 修复离线上传文件后，再次查看文件上传组件时，没有显示上传文件名的bug, 修复无法新增sql诊断的问题, !157 执行SQL诊断任务报错,卸载代理exporter_初始化失败 Merge pull request !157 from 板栗/master # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/ExporterService.java, 修复readme有些图片无法显示的问题, filebeat修改权限, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench, 数据库线程池校验, 诊断_执行计划图未显示及数据问题, 实例监控_离线安装_上传包界面显示上传的包名不正确, , , merge "develop" into "master" agent-修复onCpu和offCpu原始文件为空的判断逻辑, merge "bugfix_lm_20230328" into "develop" agent-修复onCpu和offCpu原始文件为空的判断逻辑, , 添加FAQ # Conflicts: # plugins/observability-sql-diagnosis/README.md, FAQ修改, FAQ修改, merge develop into master merge "develop" into "master" 调整多层子函数功能, 迁代码：修复父子窗口关闭时联动的问题 (cherry picked from commit 065ad437e04fb3b309ffa2d18fdd747523cf973a), 创建编辑模式功能ui, 函数/过程功能重构, 调整无用代码, terminal：主窗口调试oldWindowName应该为空，父子函数按钮控制由后端控制, Merge branch 'feature-zhangcheng-模式' into feature-zhangcheng, 添加FAQ, 添加FAQ # Conflicts: # plugins/observability-sql-diagnosis/README.md # Conflicts: # plugins/observability-sql-diagnosis/README.md, FAQ修改, FAQ修改, 调整函数/过程参数处理, 新增模式管理功能模块, 模式接口联调, 恢复pom文件, 函数/过程调整, 修复sonar，华为云上报的致命和严重问题, 修复sonar，华为云上报的致命和严重问题, merge "develop-wuguobiao-fix-sonar-20230406" into "develop" 修复sonar，华为云上报的致命和严重问题,, 兼容修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/DatabaseFunctionSPServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/DbConnectionServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/SqlWindowByJdbcServiceImpl.java, 兼容修改, 冲突, 冲突, 1, 更新, Merge branch 'feature-zwr-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-zwr-wyl, merge "feature-zwr-wyl" into "feature-zwr" 兼容修改 # Conflicts: # plugins/data-studio/src/main/java/com See merge request: openGaussythcs00001/openGauss-workbench!165 commit 15ab3826eda56b4ee5f5a4842caaa98e049c0129 Merge: a0a0f455 d1790d28 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Tue May 30 09:17:41 2023 +0800 merge feature-lm into develop merge "feature-lm" into "develop" merge develop into feature-lm merge "develop" into "feature-lm" 文件分片上传和断点续传优化, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, promethues、es、exports、filebeat、agent安装优化, merge feature-wyb into develop merge "feature-wyb" into "develop" 文件分片上传和断点续传优化, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, promethues、es、exports、filebeat、agent安装优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7206095 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 文件分片上传和断点续传优化, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, promethues、es、exports、filebeat、agent安装优化 See merge request: openGaussythcs00001/openGauss-workbench!106, 多数据库配置, filebeat列表, filebeat卸载, 多agent安装, merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" 修改index, 修改index, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" 冲突, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205550 Commit-by: 罗梦;luomeng Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" merge develop int Created-by: luomeng Author-id: 7119743 MR-id: 7214445 Commit-by: luomeng;罗梦;张昊宇;Zihao Yang Merged-by: luomeng Description: merge "feature-lm" into "develop" merge develop into feature-lm merge "develop" into "feature-lm" 文件分片上传和断点续传优化, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, promethues、es、exports、filebeat、agent安装优化, merge feature-wyb into develop merge "feature-wyb" into "develop" 文件分片上传和断点续传优化, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, promethues、es、exports、filebeat、agent安装优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7206095 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 文件分片上传和断点续传优化, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, promethues、es、exports、filebeat、agent安装优化 See merge request: openGaussythcs00001/openGauss-workbench!106, 多数据库配置, filebeat列表, filebeat卸载, 多agent安装, merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" 修改index, 修改index, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" 冲突, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205550 Commit-by: 罗梦;luomeng Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" merge develop int See merge request: openGaussythcs00001/openGauss-workbench!164 commit d1790d281b72655190036118010d697164731f52 Merge: 5b4ff069 a0a0f455 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Tue May 30 09:16:24 2023 +0800 merge develop into feature-lm merge "develop" into "feature-lm" 调整表右键顺序, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整表右键顺序 Created-by: zhangcheng Author-id: 7119759 MR-id: 7214377 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整表右键顺序 See merge request: openGaussythcs00001/openGauss-workbench!162 Created-by: luomeng Author-id: 7119743 MR-id: 7214443 Commit-by: zhangcheng Merged-by: luomeng Description: merge "develop" into "feature-lm" 调整表右键顺序, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整表右键顺序 Created-by: zhangcheng Author-id: 7119759 MR-id: 7214377 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整表右键顺序 See merge request: openGaussythcs00001/openGauss-workbench!162 See merge request: openGaussythcs00001/openGauss-workbench!163 commit 5b4ff0699b68488583c708b0e8a3f8230798379a Merge: 18986783 0b94bb4c Author: 罗梦 <luomeng@ncti-gba.cn> Date: Tue May 30 09:14:48 2023 +0800 Merge remote-tracking branch 'origin/feature-lm' into feature-lm commit 18986783a38d46018b6c4bf38ec3551b8e6650a3 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Tue May 30 09:13:59 2023 +0800 630历史数据诊断代码 commit 27eaf8d50d2f4b1c3d0f87a99122d2432d0d6eda Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon May 29 23:35:27 2023 +0800 告警中心代码更新 commit 890cdb394a8271794129a92a47ad608927ac173e Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon May 29 23:22:22 2023 +0800 告警中心代码更新 commit 33023c28242b440127f76de20beda9802ce23a45 Merge: 7b597034 a0a0f455 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon May 29 23:11:34 2023 +0800 Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb commit 0b94bb4c33f7cc44efd1518df6512298fa2fb762 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon May 29 17:19:50 2023 +0800 清理 commit a0a0f4558dbce93d9fca802cc4f08b206e2e682d Merge: b4a0de59 cbaee897 Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Mon May 29 17:16:04 2023 +0800 merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整表右键顺序 Created-by: zhangcheng Author-id: 7119759 MR-id: 7214377 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整表右键顺序 See merge request: openGaussythcs00001/openGauss-workbench!162 commit cbaee89785d4a88208e62d46415c1dfb06b1563d Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Mon May 29 17:14:57 2023 +0800 调整表右键顺序 commit f3cc3e7baa0e286b78dfd47aea243a23afa71118 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon May 29 17:14:52 2023 +0800 代码警告清理 commit 6a0f307c987aef32b8e9b7153cce0fc0f56c5241 Merge: a88122c5 b4a0de59 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon May 29 16:35:03 2023 +0800 Merge remote-tracking branch 'remotes/origin/develop' into feature-lm commit a88122c51886ed2c47189ec44060c4b4ee0c8031 Merge: 8e25f39b 76232cf5 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon May 29 16:33:56 2023 +0800 Merge branch 'develop' into feature-lm commit b4a0de5943ebdf4fa0676e39d5f28df93ad06adf Merge: 13934d54 1d99ffe8 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Mon May 29 16:29:45 2023 +0800 merge feature-yangzihao-instance into develop merge "feature-yangzihao-instance" into "develop" merge develop into feature-yangzihao-instance merge "develop" into "feature-yangzihao-instance" merge "develop" into "master" 日志检索-修复日志内容解析问题, merge "bugfix_lm_20230321" into "develop" 日志检索-修复日志内容解析问题, 添加unzip安装/校验, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, 添加旧数据处理, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, merge "feature-wyb" into "develop" merge "develop" into "master" 连接信息删除后重置, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, sql诊断_%IOWait高-分布图_数据显示被遮挡, sql诊断_%IOWait高-分布图_数据显示被遮挡, 重新设计AppStore的lastestConnectDatabase, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, merge "bugfix_lm_20230321" into "develop" 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "feature-wyb" into "develop" 修改文案,添加历史数据源, 添加压缩包, SQL诊断-国际化参数诊断, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "develop" into "master" 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, merge "feature-wyb" into "develop" 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench, el-table移除key=“Math.random()”属性,, merge "develop" into "master" agent-修改TCP取数时间周期, 日志检索-修改中文备注, merge "bugfix_lm_20230321" into "develop" agent-修改TCP取数时间周期, 日志检索-修改中文备注, 修复日志分布图自适应问题, 添加诊断预校验,多进程不调用bcc.ssh添加异常信息.TCPTOP格式修改, merge "develop" into "master" 修复日志分布图无法收起问题, merge "feature-wyb" into "develop" 修复日志分布图无法收起问题, 添加诊断预校验,多进程不调用bcc.ssh添加异常信息.TCPTOP格式修改, merge "develop" into "master" 修改长度, merge "develop_wyl" into "develop" 修改长度, 更新 README.md, merge "develop" into "master" exporter环境防空,bcc校验sql修改, 迁代码：修复父子窗口关闭时联动的问题, 补充DSreadme审核人, 补充DSreadme审核人, 移除pid后设置结果, merge "develop" into "master" 移除pid后设置结果, 日志检索离线安装服务elasticsearch的bug, 日志检索离线安装服务elasticsearch的bug, 日志检索离线安装服务elasticsearch的bug, 日志检索离线安装服务elasticsearch的bug, filebeat配置移除尾部/, filebeat配置移除尾部/, 修复离线上传文件后，再次查看文件上传组件时，没有显示上传文件名的bug, 修复无法新增sql诊断的问题, 修复离线上传文件后，再次查看文件上传组件时，没有显示上传文件名的bug, 修复无法新增sql诊断的问题, !157 执行SQL诊断任务报错,卸载代理exporter_初始化失败 Merge pull request !157 from 板栗/master # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/ExporterService.java, 修复readme有些图片无法显示的问题, filebeat修改权限, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench, 数据库线程池校验, 诊断_执行计划图未显示及数据问题, 实例监控_离线安装_上传包界面显示上传的包名不正确, , , merge "develop" into "master" agent-修复onCpu和offCpu原始文件为空的判断逻辑, merge "bugfix_lm_20230328" into "develop" agent-修复onCpu和offCpu原始文件为空的判断逻辑, , 添加FAQ # Conflicts: # plugins/observability-sql-diagnosis/README.md, FAQ修改, FAQ修改, merge develop into master merge "develop" into "master" 调整多层子函数功能, 迁代码：修复父子窗口关闭时联动的问题 (cherry picked from commit 065ad437e04fb3b309ffa2d18fdd747523cf973a), 创建编辑模式功能ui, 函数/过程功能重构, 调整无用代码, terminal：主窗口调试oldWindowName应该为空，父子函数按钮控制由后端控制, Merge branch 'feature-zhangcheng-模式' into feature-zhangcheng, 添加FAQ, 添加FAQ # Conflicts: # plugins/observability-sql-diagnosis/README.md # Conflicts: # plugins/observability-sql-diagnosis/README.md, FAQ修改, FAQ修改, 调整函数/过程参数处理, 新增模式管理功能模块, 模式接口联调, 恢复pom文件, 函数/过程调整, 修复sonar，华为云上报的致命和严重问题, 修复sonar，华为云上报的致命和严重问题, merge "develop-wuguobiao-fix-sonar-20230406" into "develop" 修复sonar，华为云上报的致命和严重问题,, 兼容修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/DatabaseFunctionSPServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/DbConnectionServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/SqlWindowByJdbcServiceImpl.java, 兼容修改, 冲突, 冲突, 1, 更新, Merge branch 'feature-zwr-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into fe Created-by: yangzihao Author-id: 7119754 MR-id: 7214355 Commit-by: Zihao Yang;yangzihao Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "develop" merge develop into feature-yangzihao-instance merge "develop" into "feature-yangzihao-instance" merge "develop" into "master" 日志检索-修复日志内容解析问题, merge "bugfix_lm_20230321" into "develop" 日志检索-修复日志内容解析问题, 添加unzip安装/校验, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, 添加旧数据处理, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, merge "feature-wyb" into "develop" merge "develop" into "master" 连接信息删除后重置, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, sql诊断_%IOWait高-分布图_数据显示被遮挡, sql诊断_%IOWait高-分布图_数据显示被遮挡, 重新设计AppStore的lastestConnectDatabase, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, merge "bugfix_lm_20230321" into "develop" 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "feature-wyb" into "develop" 修改文案,添加历史数据源, 添加压缩包, SQL诊断-国际化参数诊断, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "develop" into "master" 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, merge "feature-wyb" into "develop" 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench, el-table移除key=“Math.random()”属性,, merge "develop" into "master" agent-修改TCP取数时间周期, 日志检索-修改中文备注, merge "bugfix_lm_20230321" into "develop" agent-修改TCP取数时间周期, 日志检索-修改中文备注, 修复日志分布图自适应问题, 添加诊断预校验,多进程不调用bcc.ssh添加异常信息.TCPTOP格式修改, merge "develop" into "master" 修复日志分布图无法收起问题, merge "feature-wyb" into "develop" 修复日志分布图无法收起问题, 添加诊断预校验,多进程不调用bcc.ssh添加异常信息.TCPTOP格式修改, merge "develop" into "master" 修改长度, merge "develop_wyl" into "develop" 修改长度, 更新 README.md, merge "develop" into "master" exporter环境防空,bcc校验sql修改, 迁代码：修复父子窗口关闭时联动的问题, 补充DSreadme审核人, 补充DSreadme审核人, 移除pid后设置结果, merge "develop" into "master" 移除pid后设置结果, 日志检索离线安装服务elasticsearch的bug, 日志检索离线安装服务elasticsearch的bug, 日志检索离线安装服务elasticsearch的bug, 日志检索离线安装服务elasticsearch的bug, filebeat配置移除尾部/, filebeat配置移除尾部/, 修复离线上传文件后，再次查看文件上传组件时，没有显示上传文件名的bug, 修复无法新增sql诊断的问题, 修复离线上传文件后，再次查看文件上传组件时，没有显示上传文件名的bug, 修复无法新增sql诊断的问题, !157 执行SQL诊断任务报错,卸载代理exporter_初始化失败 Merge pull request !157 from 板栗/master # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/ExporterService.java, 修复readme有些图片无法显示的问题, filebeat修改权限, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench, 数据库线程池校验, 诊断_执行计划图未显示及数据问题, 实例监控_离线安装_上传包界面显示上传的包名不正确, , , merge "develop" into "master" agent-修复onCpu和offCpu原始文件为空的判断逻辑, merge "bugfix_lm_20230328" into "develop" agent-修复onCpu和offCpu原始文件为空的判断逻辑, , 添加FAQ # Conflicts: # plugins/observability-sql-diagnosis/README.md, FAQ修改, FAQ修改, merge develop into master merge "develop" into "master" 调整多层子函数功能, 迁代码：修复父子窗口关闭时联动的问题 (cherry picked from commit 065ad437e04fb3b309ffa2d18fdd747523cf973a), 创建编辑模式功能ui, 函数/过程功能重构, 调整无用代码, terminal：主窗口调试oldWindowName应该为空，父子函数按钮控制由后端控制, Merge branch 'feature-zhangcheng-模式' into feature-zhangcheng, 添加FAQ, 添加FAQ # Conflicts: # plugins/observability-sql-diagnosis/README.md # Conflicts: # plugins/observability-sql-diagnosis/README.md, FAQ修改, FAQ修改, 调整函数/过程参数处理, 新增模式管理功能模块, 模式接口联调, 恢复pom文件, 函数/过程调整, 修复sonar，华为云上报的致命和严重问题, 修复sonar，华为云上报的致命和严重问题, merge "develop-wuguobiao-fix-sonar-20230406" into "develop" 修复sonar，华为云上报的致命和严重问题,, 兼容修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/DatabaseFunctionSPServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/DbConnectionServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/SqlWindowByJdbcServiceImpl.java, 兼容修改, 冲突, 冲突, 1, 更新, Merge branch 'feature-zwr-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into fe See merge request: openGaussythcs00001/openGauss-workbench!161 commit 13934d54ed83da73353565839a73dd4bc2fa0544 Merge: 5de6541b 76232cf5 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Mon May 29 16:27:45 2023 +0800 Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop commit 5de6541bce8ba78c86999974dd3810a0230a5059 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Mon May 29 16:27:02 2023 +0800 历史数据诊断，修复下方空隙 commit 1d99ffe807a750ae18c1c21ab5a111e8636f08ac Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Mon May 29 16:25:52 2023 +0800 修复前端下方空隙 commit 8e25f39bdc24756cab05127ad6da1019f665aaa2 Merge: 624d9403 d8033870 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon May 29 16:22:50 2023 +0800 Merge branch 'feature-lm' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-lm commit 624d9403663d0de9328845f7ad6af5b51c730fa1 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon May 29 16:21:39 2023 +0800 exporter添加缓冲层 commit d8033870721d6552c5e10c806f579d5058c3c329 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon May 29 15:16:54 2023 +0800 Squashed commit of the following: commit 76232cf58cd7fa22b2700584e67ab9d8cb43f299 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Mon May 29 14:36:09 2023 +0800 【实例监控】修复前端错误 commit 7b127b5c0593858c832ec3d6618a6941c6940fd1 Merge: a57b0f12 76232cf5 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Mon May 29 14:51:22 2023 +0800 merge develop into feature-yangzihao-instance merge "develop" into "feature-yangzihao-instance" merge "develop" into "master" 日志检索-修复日志内容解析问题, merge "bugfix_lm_20230321" into "develop" 日志检索-修复日志内容解析问题, 添加unzip安装/校验, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, 添加旧数据处理, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, merge "feature-wyb" into "develop" merge "develop" into "master" 连接信息删除后重置, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, sql诊断_%IOWait高-分布图_数据显示被遮挡, sql诊断_%IOWait高-分布图_数据显示被遮挡, 重新设计AppStore的lastestConnectDatabase, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, merge "bugfix_lm_20230321" into "develop" 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "feature-wyb" into "develop" 修改文案,添加历史数据源, 添加压缩包, SQL诊断-国际化参数诊断, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "develop" into "master" 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, merge "feature-wyb" into "develop" 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench, el-table移除key=“Math.random()”属性,, merge "develop" into "master" agent-修改TCP取数时间周期, 日志检索-修改中文备注, merge "bugfix_lm_20230321" into "develop" agent-修改TCP取数时间周期, 日志检索-修改中文备注, 修复日志分布图自适应问题, 添加诊断预校验,多进程不调用bcc.ssh添加异常信息.TCPTOP格式修改, merge "develop" into "master" 修复日志分布图无法收起问题, merge "feature-wyb" into "develop" 修复日志分布图无法收起问题, 添加诊断预校验,多进程不调用bcc.ssh添加异常信息.TCPTOP格式修改, merge "develop" into "master" 修改长度, merge "develop_wyl" into "develop" 修改长度, 更新 README.md, merge "develop" into "master" exporter环境防空,bcc校验sql修改, 迁代码：修复父子窗口关闭时联动的问题, 补充DSreadme审核人, 补充DSreadme审核人, 移除pid后设置结果, merge "develop" into "master" 移除pid后设置结果, 日志检索离线安装服务elasticsearch的bug, 日志检索离线安装服务elasticsearch的bug, 日志检索离线安装服务elasticsearch的bug, 日志检索离线安装服务elasticsearch的bug, filebeat配置移除尾部/, filebeat配置移除尾部/, 修复离线上传文件后，再次查看文件上传组件时，没有显示上传文件名的bug, 修复无法新增sql诊断的问题, 修复离线上传文件后，再次查看文件上传组件时，没有显示上传文件名的bug, 修复无法新增sql诊断的问题, !157 执行SQL诊断任务报错,卸载代理exporter_初始化失败 Merge pull request !157 from 板栗/master # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/ExporterService.java, 修复readme有些图片无法显示的问题, filebeat修改权限, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench, 数据库线程池校验, 诊断_执行计划图未显示及数据问题, 实例监控_离线安装_上传包界面显示上传的包名不正确, , , merge "develop" into "master" agent-修复onCpu和offCpu原始文件为空的判断逻辑, merge "bugfix_lm_20230328" into "develop" agent-修复onCpu和offCpu原始文件为空的判断逻辑, , 添加FAQ # Conflicts: # plugins/observability-sql-diagnosis/README.md, FAQ修改, FAQ修改, merge develop into master merge "develop" into "master" 调整多层子函数功能, 迁代码：修复父子窗口关闭时联动的问题 (cherry picked from commit 065ad437e04fb3b309ffa2d18fdd747523cf973a), 创建编辑模式功能ui, 函数/过程功能重构, 调整无用代码, terminal：主窗口调试oldWindowName应该为空，父子函数按钮控制由后端控制, Merge branch 'feature-zhangcheng-模式' into feature-zhangcheng, 添加FAQ, 添加FAQ # Conflicts: # plugins/observability-sql-diagnosis/README.md # Conflicts: # plugins/observability-sql-diagnosis/README.md, FAQ修改, FAQ修改, 调整函数/过程参数处理, 新增模式管理功能模块, 模式接口联调, 恢复pom文件, 函数/过程调整, 修复sonar，华为云上报的致命和严重问题, 修复sonar，华为云上报的致命和严重问题, merge "develop-wuguobiao-fix-sonar-20230406" into "develop" 修复sonar，华为云上报的致命和严重问题,, 兼容修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/DatabaseFunctionSPServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/DbConnectionServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/SqlWindowByJdbcServiceImpl.java, 兼容修改, 冲突, 冲突, 1, 更新, Merge branch 'feature-zwr-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-zwr-wyl, merge "feature-zwr-wyl" into "feature-zwr" 兼容修改 # Conflicts: # plugins/data-studi Created-by: yangzihao Author-id: 7119754 MR-id: 7214321 Commit-by: Zihao Yang;zhangcheng;wuyulin;zhouwenruo;user;wuguobiao;张昊宇;罗梦;zengseliang;wuyuebin;luomeng;opengauss-bot;yangzihao Merged-by: yangzihao Description: merge "develop" into "feature-yangzihao-instance" merge "develop" into "master" 日志检索-修复日志内容解析问题, merge "bugfix_lm_20230321" into "develop" 日志检索-修复日志内容解析问题, 添加unzip安装/校验, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, 添加旧数据处理, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, merge "feature-wyb" into "develop" merge "develop" into "master" 连接信息删除后重置, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, sql诊断_%IOWait高-分布图_数据显示被遮挡, sql诊断_%IOWait高-分布图_数据显示被遮挡, 重新设计AppStore的lastestConnectDatabase, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, merge "bugfix_lm_20230321" into "develop" 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "feature-wyb" into "develop" 修改文案,添加历史数据源, 添加压缩包, SQL诊断-国际化参数诊断, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "develop" into "master" 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, merge "feature-wyb" into "develop" 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench, el-table移除key=“Math.random()”属性,, merge "develop" into "master" agent-修改TCP取数时间周期, 日志检索-修改中文备注, merge "bugfix_lm_20230321" into "develop" agent-修改TCP取数时间周期, 日志检索-修改中文备注, 修复日志分布图自适应问题, 添加诊断预校验,多进程不调用bcc.ssh添加异常信息.TCPTOP格式修改, merge "develop" into "master" 修复日志分布图无法收起问题, merge "feature-wyb" into "develop" 修复日志分布图无法收起问题, 添加诊断预校验,多进程不调用bcc.ssh添加异常信息.TCPTOP格式修改, merge "develop" into "master" 修改长度, merge "develop_wyl" into "develop" 修改长度, 更新 README.md, merge "develop" into "master" exporter环境防空,bcc校验sql修改, 迁代码：修复父子窗口关闭时联动的问题, 补充DSreadme审核人, 补充DSreadme审核人, 移除pid后设置结果, merge "develop" into "master" 移除pid后设置结果, 日志检索离线安装服务elasticsearch的bug, 日志检索离线安装服务elasticsearch的bug, 日志检索离线安装服务elasticsearch的bug, 日志检索离线安装服务elasticsearch的bug, filebeat配置移除尾部/, filebeat配置移除尾部/, 修复离线上传文件后，再次查看文件上传组件时，没有显示上传文件名的bug, 修复无法新增sql诊断的问题, 修复离线上传文件后，再次查看文件上传组件时，没有显示上传文件名的bug, 修复无法新增sql诊断的问题, !157 执行SQL诊断任务报错,卸载代理exporter_初始化失败 Merge pull request !157 from 板栗/master # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/ExporterService.java, 修复readme有些图片无法显示的问题, filebeat修改权限, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench, 数据库线程池校验, 诊断_执行计划图未显示及数据问题, 实例监控_离线安装_上传包界面显示上传的包名不正确, , , merge "develop" into "master" agent-修复onCpu和offCpu原始文件为空的判断逻辑, merge "bugfix_lm_20230328" into "develop" agent-修复onCpu和offCpu原始文件为空的判断逻辑, , 添加FAQ # Conflicts: # plugins/observability-sql-diagnosis/README.md, FAQ修改, FAQ修改, merge develop into master merge "develop" into "master" 调整多层子函数功能, 迁代码：修复父子窗口关闭时联动的问题 (cherry picked from commit 065ad437e04fb3b309ffa2d18fdd747523cf973a), 创建编辑模式功能ui, 函数/过程功能重构, 调整无用代码, terminal：主窗口调试oldWindowName应该为空，父子函数按钮控制由后端控制, Merge branch 'feature-zhangcheng-模式' into feature-zhangcheng, 添加FAQ, 添加FAQ # Conflicts: # plugins/observability-sql-diagnosis/README.md # Conflicts: # plugins/observability-sql-diagnosis/README.md, FAQ修改, FAQ修改, 调整函数/过程参数处理, 新增模式管理功能模块, 模式接口联调, 恢复pom文件, 函数/过程调整, 修复sonar，华为云上报的致命和严重问题, 修复sonar，华为云上报的致命和严重问题, merge "develop-wuguobiao-fix-sonar-20230406" into "develop" 修复sonar，华为云上报的致命和严重问题,, 兼容修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/DatabaseFunctionSPServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/DbConnectionServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/SqlWindowByJdbcServiceImpl.java, 兼容修改, 冲突, 冲突, 1, 更新, Merge branch 'feature-zwr-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-zwr-wyl, merge "feature-zwr-wyl" into "feature-zwr" 兼容修改 # Conflicts: # plugins/data-studi See merge request: openGaussythcs00001/openGauss-workbench!160 commit 76232cf58cd7fa22b2700584e67ab9d8cb43f299 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Mon May 29 14:36:09 2023 +0800 【实例监控】修复前端错误 commit 72d8792d79b165fb1f8faa3977f6768c385b7137 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon May 29 14:32:01 2023 +0800 数据库内存/cpu指标 commit 6906850f98a7c0e4a9eb7f5e42eeec99a7843f7a Merge: 0b7b07ef 847d2c37 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon May 29 14:28:37 2023 +0800 Merge remote-tracking branch 'remotes/origin/develop' into feature-lm commit 0b7b07ef9fdbde96a6614d26858d0a60f299d3cb Merge: 0a684638 c5aea1b6 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon May 29 14:10:15 2023 +0800 Merge branch 'feature-lm' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-lm commit 0a684638c8cb96c55488d2a1fe6766b600800ad3 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon May 29 14:10:01 2023 +0800 数据库内存/cpu commit c5aea1b6327a13195a78c96237e59c94780cfa25 Merge: 067b08c3 f1b7b373 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Mon May 29 11:31:42 2023 +0800 Merge branch 'feature-lm' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-lm commit 067b08c309da57d0860d79ca1f47f82f64c1bd48 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Mon May 29 11:30:58 2023 +0800 历史数据诊断，修改详情页打不开的问题 commit f1b7b37376862670ff652e49d9d10e67a316ce86 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon May 29 11:06:54 2023 +0800 补充指标缺失数据 commit 847d2c373e7b80f7720286d13b83075ec0b86554 Merge: ce37a34b 63c52dfa Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Mon May 29 10:57:00 2023 +0800 merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 表管理3 Created-by: zhangcheng Author-id: 7119759 MR-id: 7214256 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 表管理3 See merge request: openGaussythcs00001/openGauss-workbench!159 commit 63c52dfa1b8d862949d04771932d1ddb7a93849a Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Mon May 29 10:54:52 2023 +0800 表管理3 commit b5b831dd72dc7d5bf037c148c8f3ee2248712b53 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Mon May 29 10:34:20 2023 +0800 630历史数据诊断代码 commit ce37a34b9324df5e92ad38dea28d6bd3fbd1e341 Merge: 22612331 9355de63 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Mon May 29 10:23:34 2023 +0800 merge feature-wyl into develop merge "feature-wyl" into "develop" 表一般返回值修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7214234 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 表一般返回值修改 See merge request: openGaussythcs00001/openGauss-workbench!158 commit 9355de63794414865e93834575ac2ef61bccebae Author: wuyulin <wuyulin@ncti-gba.cn> Date: Mon May 29 10:21:21 2023 +0800 表一般返回值修改 commit 1d076b27d86ee4c3db1ae00551983bf0f691b127 Merge: b6cbac71 22612331 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Mon May 29 10:11:24 2023 +0800 merge develop into feature-lm merge "develop" into "feature-lm" 历史数据诊断，请求修复 Created-by: luomeng Author-id: 7119743 MR-id: 7214231 Commit-by: Zihao Yang Merged-by: luomeng Description: merge "develop" into "feature-lm" 历史数据诊断，请求修复 See merge request: openGaussythcs00001/openGauss-workbench!157 commit b6cbac719539e03151e846b565cfe3a82abe1939 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon May 29 10:06:16 2023 +0800 TOP性能优化 commit a1bf1ed8c9a2ac1a3ff5719ceed5dcb1a8a65e09 Merge: 17c3faa1 8e1f5383 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Mon May 29 10:03:10 2023 +0800 merge develop into feature-lm merge "develop" into "feature-lm" 去掉IP Created-by: luomeng Author-id: 7119743 MR-id: 7214227 Commit-by: Zihao Yang Merged-by: luomeng Description: merge "develop" into "feature-lm" 去掉IP See merge request: openGaussythcs00001/openGauss-workbench!156 commit 2261233142bfba3601ce1795f91ac6fa899d9964 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Mon May 29 10:02:07 2023 +0800 历史数据诊断，请求修复 commit 8e1f5383385c2e38e26c367bf4c68a74a6efcf7a Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Mon May 29 09:56:10 2023 +0800 去掉IP commit 17c3faa1f709d0e9bbda866fa3c695ffd741a8e2 Merge: e2102e66 8def3d51 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Mon May 29 09:51:40 2023 +0800 merge develop into feature-lm merge "develop" into "feature-lm" 修复前端路径问题, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop Created-by: luomeng Author-id: 7119743 MR-id: 7214215 Commit-by: Zihao Yang Merged-by: luomeng Description: merge "develop" into "feature-lm" 修复前端路径问题, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop See merge request: openGaussythcs00001/openGauss-workbench!155 commit 8def3d512be4cf7b6e6aedbd7cf1dd2b1185dcee Merge: f014d7a8 e5334073 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Mon May 29 09:50:46 2023 +0800 Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop commit f014d7a8b843e662dbebbdeba0b1d67d5d8af224 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Mon May 29 09:49:29 2023 +0800 修复前端路径问题 commit e2102e669735631220752aae129be8fa0178fcf1 Merge: 8cd7024f e5334073 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Mon May 29 09:24:33 2023 +0800 merge develop into feature-lm merge "develop" into "feature-lm" merge "develop" into "master" 日志检索-修复日志内容解析问题, merge "bugfix_lm_20230321" into "develop" 日志检索-修复日志内容解析问题, 添加unzip安装/校验, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, 添加旧数据处理, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, merge "feature-wyb" into "develop" merge "develop" into "master" 连接信息删除后重置, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, sql诊断_%IOWait高-分布图_数据显示被遮挡, sql诊断_%IOWait高-分布图_数据显示被遮挡, 重新设计AppStore的lastestConnectDatabase, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, merge "bugfix_lm_20230321" into "develop" 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "feature-wyb" into "develop" 修改文案,添加历史数据源, 添加压缩包, SQL诊断-国际化参数诊断, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "develop" into "master" 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, merge "feature-wyb" into "develop" 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench, el-table移除key=“Math.random()”属性,, merge "develop" into "master" agent-修改TCP取数时间周期, 日志检索-修改中文备注, merge "bugfix_lm_20230321" into "develop" agent-修改TCP取数时间周期, 日志检索-修改中文备注, 修复日志分布图自适应问题, 添加诊断预校验,多进程不调用bcc.ssh添加异常信息.TCPTOP格式修改, merge "develop" into "master" 修复日志分布图无法收起问题, merge "feature-wyb" into "develop" 修复日志分布图无法收起问题, 添加诊断预校验,多进程不调用bcc.ssh添加异常信息.TCPTOP格式修改, merge "develop" into "master" 修改长度, merge "develop_wyl" into "develop" 修改长度, 更新 README.md, merge "develop" into "master" exporter环境防空,bcc校验sql修改, 迁代码：修复父子窗口关闭时联动的问题, 补充DSreadme审核人, 补充DSreadme审核人, 移除pid后设置结果, merge "develop" into "master" 移除pid后设置结果, 日志检索离线安装服务elasticsearch的bug, 日志检索离线安装服务elasticsearch的bug, 日志检索离线安装服务elasticsearch的bug, 日志检索离线安装服务elasticsearch的bug, filebeat配置移除尾部/, filebeat配置移除尾部/, 修复离线上传文件后，再次查看文件上传组件时，没有显示上传文件名的bug, 修复无法新增sql诊断的问题, 修复离线上传文件后，再次查看文件上传组件时，没有显示上传文件名的bug, 修复无法新增sql诊断的问题, !157 执行SQL诊断任务报错,卸载代理exporter_初始化失败 Merge pull request !157 from 板栗/master # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/ExporterService.java, 修复readme有些图片无法显示的问题, filebeat修改权限, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench, 数据库线程池校验, 诊断_执行计划图未显示及数据问题, 实例监控_离线安装_上传包界面显示上传的包名不正确, , , merge "develop" into "master" agent-修复onCpu和offCpu原始文件为空的判断逻辑, merge "bugfix_lm_20230328" into "develop" agent-修复onCpu和offCpu原始文件为空的判断逻辑, , 添加FAQ # Conflicts: # plugins/observability-sql-diagnosis/README.md, FAQ修改, FAQ修改, merge develop into master merge "develop" into "master" 调整多层子函数功能, 迁代码：修复父子窗口关闭时联动的问题 (cherry picked from commit 065ad437e04fb3b309ffa2d18fdd747523cf973a), 创建编辑模式功能ui, 函数/过程功能重构, 调整无用代码, terminal：主窗口调试oldWindowName应该为空，父子函数按钮控制由后端控制, Merge branch 'feature-zhangcheng-模式' into feature-zhangcheng, 添加FAQ, 添加FAQ # Conflicts: # plugins/observability-sql-diagnosis/README.md # Conflicts: # plugins/observability-sql-diagnosis/README.md, FAQ修改, FAQ修改, 调整函数/过程参数处理, 新增模式管理功能模块, 模式接口联调, 恢复pom文件, 函数/过程调整, 修复sonar，华为云上报的致命和严重问题, 修复sonar，华为云上报的致命和严重问题, merge "develop-wuguobiao-fix-sonar-20230406" into "develop" 修复sonar，华为云上报的致命和严重问题,, 兼容修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/DatabaseFunctionSPServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/DbConnectionServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/SqlWindowByJdbcServiceImpl.java, 兼容修改, 冲突, 冲突, 1, 更新, Merge branch 'feature-zwr-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-zwr-wyl, merge "feature-zwr-wyl" into "feature-zwr" 兼容修改 # Conflicts: # plugins/data-studio/src/main/java/ Created-by: luomeng Author-id: 7119743 MR-id: 7214189 Commit-by: Zihao Yang;wuyulin;zhouwenruo;zhangcheng;user;wuguobiao;罗梦;zengseliang;张昊宇;wuyuebin;luomeng;opengauss-bot;yangzihao Merged-by: luomeng Description: merge "develop" into "feature-lm" merge "develop" into "master" 日志检索-修复日志内容解析问题, merge "bugfix_lm_20230321" into "develop" 日志检索-修复日志内容解析问题, 添加unzip安装/校验, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, 添加旧数据处理, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, merge "feature-wyb" into "develop" merge "develop" into "master" 连接信息删除后重置, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, sql诊断_%IOWait高-分布图_数据显示被遮挡, sql诊断_%IOWait高-分布图_数据显示被遮挡, 重新设计AppStore的lastestConnectDatabase, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, merge "bugfix_lm_20230321" into "develop" 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "feature-wyb" into "develop" 修改文案,添加历史数据源, 添加压缩包, SQL诊断-国际化参数诊断, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "develop" into "master" 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, merge "feature-wyb" into "develop" 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench, el-table移除key=“Math.random()”属性,, merge "develop" into "master" agent-修改TCP取数时间周期, 日志检索-修改中文备注, merge "bugfix_lm_20230321" into "develop" agent-修改TCP取数时间周期, 日志检索-修改中文备注, 修复日志分布图自适应问题, 添加诊断预校验,多进程不调用bcc.ssh添加异常信息.TCPTOP格式修改, merge "develop" into "master" 修复日志分布图无法收起问题, merge "feature-wyb" into "develop" 修复日志分布图无法收起问题, 添加诊断预校验,多进程不调用bcc.ssh添加异常信息.TCPTOP格式修改, merge "develop" into "master" 修改长度, merge "develop_wyl" into "develop" 修改长度, 更新 README.md, merge "develop" into "master" exporter环境防空,bcc校验sql修改, 迁代码：修复父子窗口关闭时联动的问题, 补充DSreadme审核人, 补充DSreadme审核人, 移除pid后设置结果, merge "develop" into "master" 移除pid后设置结果, 日志检索离线安装服务elasticsearch的bug, 日志检索离线安装服务elasticsearch的bug, 日志检索离线安装服务elasticsearch的bug, 日志检索离线安装服务elasticsearch的bug, filebeat配置移除尾部/, filebeat配置移除尾部/, 修复离线上传文件后，再次查看文件上传组件时，没有显示上传文件名的bug, 修复无法新增sql诊断的问题, 修复离线上传文件后，再次查看文件上传组件时，没有显示上传文件名的bug, 修复无法新增sql诊断的问题, !157 执行SQL诊断任务报错,卸载代理exporter_初始化失败 Merge pull request !157 from 板栗/master # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/ExporterService.java, 修复readme有些图片无法显示的问题, filebeat修改权限, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench, 数据库线程池校验, 诊断_执行计划图未显示及数据问题, 实例监控_离线安装_上传包界面显示上传的包名不正确, , , merge "develop" into "master" agent-修复onCpu和offCpu原始文件为空的判断逻辑, merge "bugfix_lm_20230328" into "develop" agent-修复onCpu和offCpu原始文件为空的判断逻辑, , 添加FAQ # Conflicts: # plugins/observability-sql-diagnosis/README.md, FAQ修改, FAQ修改, merge develop into master merge "develop" into "master" 调整多层子函数功能, 迁代码：修复父子窗口关闭时联动的问题 (cherry picked from commit 065ad437e04fb3b309ffa2d18fdd747523cf973a), 创建编辑模式功能ui, 函数/过程功能重构, 调整无用代码, terminal：主窗口调试oldWindowName应该为空，父子函数按钮控制由后端控制, Merge branch 'feature-zhangcheng-模式' into feature-zhangcheng, 添加FAQ, 添加FAQ # Conflicts: # plugins/observability-sql-diagnosis/README.md # Conflicts: # plugins/observability-sql-diagnosis/README.md, FAQ修改, FAQ修改, 调整函数/过程参数处理, 新增模式管理功能模块, 模式接口联调, 恢复pom文件, 函数/过程调整, 修复sonar，华为云上报的致命和严重问题, 修复sonar，华为云上报的致命和严重问题, merge "develop-wuguobiao-fix-sonar-20230406" into "develop" 修复sonar，华为云上报的致命和严重问题,, 兼容修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/DatabaseFunctionSPServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/DbConnectionServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/SqlWindowByJdbcServiceImpl.java, 兼容修改, 冲突, 冲突, 1, 更新, Merge branch 'feature-zwr-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-zwr-wyl, merge "feature-zwr-wyl" into "feature-zwr" 兼容修改 # Conflicts: # plugins/data-studio/src/main/java/ See merge request: openGaussythcs00001/openGauss-workbench!154 commit 8cd7024f2608cda5871baf062922f8e739101ad8 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Mon May 29 09:24:18 2023 +0800 解决冲突 commit e53340737c84062946d9ab337fe2414f47eccb19 Merge: 502e17c7 a57b0f12 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Sun May 28 10:15:16 2023 +0800 Merge branch 'feature-yangzihao-instance' into develop commit a57b0f1262bf69f824bc782c07bf1f2c86704737 Merge: 28e96e1b 76d5b904 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Sun May 28 10:13:41 2023 +0800 Merge branch 'feature-yangzihao-instance' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-yangzihao-instance commit 28e96e1b4aaffb8653ee7c20e0d5a770cd51cd98 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Sun May 28 10:09:23 2023 +0800 实例监控前端页面 commit 502e17c7dc9641b32b0004d3379af24e9e392508 Merge: 620e1629 1d95be46 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Sun May 28 14:00:00 2023 +0800 Merge branch 'feature-yangzihao-history' into develop 历史诊断前端代码 commit 1d95be4662318580de5b8a3e7793c5b1023b9dcb Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Sun May 28 14:00:00 2023 +0800 提交510修改 整合放大页面前修改 提交代码 提交代碼 提交代码 提交代码 提交代码 提交历史诊断代码 提交代码 commit 620e16292167f0479eee85bcf2012d7a7bdc7165 Merge: 7113223c 21c38545 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Fri May 26 16:41:15 2023 +0800 merge feature-wyl into develop merge "feature-wyl" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口, 添加导出表数据接口, 调整文件, 导出DDL页面, 导出DDL接口联调, 导出表数据, 导出数据接口调整, 导出数据接口调整, 前端补充两个导出, 创建表, 创建表：删除多余代码, 编辑table修复rowStatus, 修改文件名, 添加check检验, 编辑table修复rowStatus2, 调整导出Excel工具类, 调整返回函数名称, 加分号, Merge remote-tracking branch 'origin/develop' into feature-wyl # Conflicts: # plugins/data-studio/web-ui/src/api/table.ts # plugins/data-studio/web-ui/src/i18n/lang/en.ts # plugins/data-studio/web-ui/src/i18n/lang/zh-Cn.ts # plugins/data-studio/web-ui/src/layout/Sidebar/index.vue # plugins/data-studio/web-ui/src/layout/Sidebar/types.ts # plugins/data-studio/web-ui/src/views/table/index.vue, 加日志 Created-by: wuyulin Author-id: 7119753 MR-id: 7214008 Commit-by: wuyulin;zhouwenruo;zhangcheng;user Merged-by: wuyulin Description: merge "feature-wyl" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口, 添加导出表数据接口, 调整文件, 导出DDL页面, 导出DDL接口联调, 导出表数据, 导出数据接口调整, 导出数据接口调整, 前端补充两个导出, 创建表, 创建表：删除多余代码, 编辑table修复rowStatus, 修改文件名, 添加check检验, 编辑table修复rowStatus2, 调整导出Excel工具类, 调整返回函数名称, 加分号, Merge remote-tracking branch 'origin/develop' into feature-wyl # Conflicts: # plugins/data-studio/web-ui/src/api/table.ts # plugins/data-studio/web-ui/src/i18n/lang/en.ts # plugins/data-studio/web-ui/src/i18n/lang/zh-Cn.ts # plugins/data-studio/web-ui/src/layout/Sidebar/index.vue # plugins/data-studio/web-ui/src/layout/Sidebar/types.ts # plugins/data-studio/web-ui/src/views/table/index.vue, 加日志 See merge request: openGaussythcs00001/openGauss-workbench!153 commit 21c38545bc42f51b692cab849fbc8b54af7661d6 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri May 26 16:40:33 2023 +0800 加日志 commit 9cd8786ed1545caeda505fa8182ff279179ec79b Merge: d7d1ec10 7113223c Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri May 26 16:38:46 2023 +0800 Merge remote-tracking branch 'origin/develop' into feature-wyl # Conflicts: # plugins/data-studio/web-ui/src/api/table.ts # plugins/data-studio/web-ui/src/i18n/lang/en.ts # plugins/data-studio/web-ui/src/i18n/lang/zh-Cn.ts # plugins/data-studio/web-ui/src/layout/Sidebar/index.vue # plugins/data-studio/web-ui/src/layout/Sidebar/types.ts # plugins/data-studio/web-ui/src/views/table/index.vue commit d7d1ec10f8bf1be4130fa52aa119a401c5ef0f89 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri May 26 16:35:05 2023 +0800 加分号 commit f1ead1a24a602ce1258e29620b8fa298a142200c Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Fri May 26 09:29:14 2023 +0800 调整返回函数名称 commit c415f384048ed0c704a6492e4cf1cc6a69b917ac Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu May 25 15:22:11 2023 +0800 调整导出Excel工具类 commit 238839e65eff8d8b230106dab7f5a770c0947368 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Thu May 25 14:57:16 2023 +0800 编辑table修复rowStatus2 commit a40413503e593d4c0afdcd9094d269bad6493753 Author: user <wuguobiao@ncti-gba.cn> Date: Thu May 25 14:53:30 2023 +0800 添加check检验 commit 27040ec5c07448407c3d7ebd768f85539a388fd9 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu May 25 11:55:01 2023 +0800 修改文件名 commit 644037af252c13b04efb116b77106712d97e26e6 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Thu May 25 10:10:14 2023 +0800 编辑table修复rowStatus commit 74afc49792e2874eec66100bce1a173f4c1b4710 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Wed May 24 11:24:46 2023 +0800 创建表：删除多余代码 commit 2142b26a3d78f54acf94dae4e9cde5639c25ab4d Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Tue May 23 18:05:05 2023 +0800 创建表 commit e19096d28424e2ed2f5486d0da877bf3a3b4ee77 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Tue May 23 14:36:07 2023 +0800 前端补充两个导出 commit b9c7985d73e9b918fa31685e9e9afd896efe2a45 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Tue May 23 15:38:46 2023 +0800 导出数据接口调整 commit 51ea47022f082fa0e843ae573aa2c45d2c67f0cf Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Tue May 23 15:37:43 2023 +0800 导出数据接口调整 commit d8cfd469af3a99debb1994106c6bd32257403744 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Fri May 19 11:14:05 2023 +0800 导出表数据 commit ab5f1e1927f5230cbe007095ba48e2a52b004644 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Tue May 16 11:19:46 2023 +0800 导出DDL接口联调 commit cf374aa90e3ac217d6de9b5c9701e5db8473e0aa Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Mon May 15 15:25:02 2023 +0800 导出DDL页面 commit e0572b43b1154ed9b3b2475082ab1d963b28615b Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Fri May 12 10:38:15 2023 +0800 调整文件 commit bb725a3d51aef86b8468478824d09c01ee229941 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu May 18 14:56:40 2023 +0800 添加导出表数据接口 commit f4e7ba9a2c6edabc365f487272ed69cff6e7acbe Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Mon May 15 16:15:27 2023 +0800 添加导出函数，模式DDL接口 commit fcc8aa702fb0edb17f5c64f1d00268c94c310654 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Mon May 15 16:13:56 2023 +0800 resultSet添加try去捕获 commit 7113223c79d90af0cfd7ac571b1a26fab68b7e1e Merge: 14aeff34 cc946a6a Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Fri May 26 16:02:33 2023 +0800 merge feature-wyl into develop merge "feature-wyl" into "develop" 中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7213948 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 中英 See merge request: openGaussythcs00001/openGauss-workbench!150 commit 14aeff344a4ff9c63dd66080d2a202f75e54b4f1 Merge: 878fbd55 8c352ba4 Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Fri May 26 16:02:18 2023 +0800 merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 表管理1, 表管理2 Created-by: zhangcheng Author-id: 7119759 MR-id: 7213980 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 表管理1, 表管理2 See merge request: openGaussythcs00001/openGauss-workbench!151 commit 8c352ba4f0fd161a5f5af6babc3e9acbacc15764 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Fri May 26 15:59:29 2023 +0800 表管理2 commit cc946a6a1ed47c59775c46841ec7b7829dbc7f34 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri May 26 14:42:59 2023 +0800 中英 commit 878fbd55e063c71c8f19cd1f0c6aa28b1218e582 Merge: d6616752 9089ff7b Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Fri May 26 14:37:23 2023 +0800 merge feature-wyl into develop merge "feature-wyl" into "develop" 一般项修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7213945 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 一般项修改 See merge request: openGaussythcs00001/openGauss-workbench!149 commit 9089ff7bfa5f628828389af4c9968e94aa71a23a Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri May 26 14:36:43 2023 +0800 一般项修改 commit d6616752ab2b7463d02211e5b710727ec5e2f3e9 Merge: 3c8a26f3 5bd3ae0c Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Fri May 26 09:30:15 2023 +0800 merge feature-zwr into develop merge "feature-zwr" into "develop" 调整返回函数名称 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7213832 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 调整返回函数名称 See merge request: openGaussythcs00001/openGauss-workbench!148 commit 5bd3ae0c4e53b37344dfb3ce59b6053015bec380 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Fri May 26 09:29:14 2023 +0800 调整返回函数名称 commit 1d46f7fbdaeb9666ba2d8b773c3887e450649352 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Thu May 25 17:51:08 2023 +0800 表管理1 commit 34cfd5ea02d2140a0cee2b14ebcb43c098fb2263 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Thu May 25 16:39:36 2023 +0800 实例监控代码 commit cb61a616fe727ceaf27f7000e2dc49e8caf457a1 Merge: 0490e7d3 3c8a26f3 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Thu May 25 16:15:26 2023 +0800 merge develop into release merge "develop" into "release" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 调整部分编辑表的功能, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 Created-by: zhangcheng Author-id: 7119759 MR-id: 7209563 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 See merge request: openGaussythcs00001/openGauss-workbench!126, 数据更新联调问题修复, merge feature-wyl into develop merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7209762 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 See merge request: openGaussythcs00001/openGauss-workbench!127, 生成函数覆盖率报告, Merge remote-tracking branch 'origin/develop' into feature-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/util/DebugUtils.java # plugins/data-studio/src/main/resources/messages_en_US.properties # plugins/data-studio/src/main/resources/messages_zh_CN.properties, 生成函数覆盖率报告, merge feature-zwr into develop merge "feature-zwr" into "develop" 生成函数覆盖率报告 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7209971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 生成函数覆盖率报告 See merge request: openGaussythcs00001/openGauss-workbench!128, 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 Created-by: zhangcheng Author-id: 7119759 MR-id: 7210033 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 See merge request: openGaussythcs00001/openGauss-workbench!130, 调整文件, 生成函数覆盖率报告, 导出视图、序列DDL功能, 导出DDL页面, 创建表, resultSet添加try去捕获, 添加导出函数，模式DDL接口, merge feature-zwr into develop merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7210854 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 See merge request: openGaussythcs00001/openGauss-workbench!131, 1, merge feature-wyl into develop merge "feature-wyl" into "develop" 创建表, 1 Created-by: wuyulin Author-id: 7119753 MR-id: 7210950 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 创建表, 1 See merge request: openGaussythcs00001/openGauss-workbench!132, Merge remote-tracking branch 'origin/develop' into feature-wyl, 导出DDL接口联调, 添加导出表数据接口, merge feature-zwr into develop merge "feature-zwr" into "develop" 添加导出表数据接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7211802 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 添加导出表数据接口 See merge request: openGaussythcs00001/openGauss-workbench!133, 表属性修改于查看新增, 导出表数据, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整文件, 导出DDL页面, 导出DDL接口联调, 导出表数据 Created-by: zhangcheng Author-id: 7119759 MR-id: 7212093 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整文件, 导出DDL页面, 导出DDL接口联调, 导出表数据 See merge request: openGaussythcs00001/openGauss-workbench!134, 接口方法调整, merge feature-wyl into develop merge "feature-wyl" into "develop" Merge remote-tracking branch 'origin/develop' into feature-wyl, 表属性修改于查看新增, 接口方法调整 Created-by: wuyulin Author-id: 7119753 MR-id: 7212264 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" Merge remote-tracking branch 'origin/develop' into feature-wyl, 表属性修改于查看新增, 接口方法调整 See merge request: openGaussythcs00001/openGauss-workbench!135, 表属性实体类修改, 前端补充两个导出, merge feature-wyl into develop merge "feature-wyl" into "develop" 表属性实体类修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7212877 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 表属性实体类修改 See merge request: openGaussythcs00001/openGauss-workbench!137, 导出数据接口调整, 导出数据接口调整, merge feature-zwr into develop merge "feature-zwr" into "develop" 导出数据接口调整, 导出数据接口调整 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7212909 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 导出数据接口调整, 导出数据接口调整 See merge request: openGaussythcs00001/openGauss-workbench!138, 加校验, 创建表, 恢复, merge feature-wyl into develop merge "feature-wyl" into "develop" 加校验 Created-by: wuyulin Author-id: 7119753 MR-id: 7212971 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 加校验 See merge request: openGaussythcs00001/openGauss-workbench!139, 创建表：删除多余代码, merge feature-zhan Created-by: wuyulin Author-id: 7119753 MR-id: 7213667 Commit-by: zhouwenruo;zhangcheng;wuguobiao;user;wuyulin;张昊宇 Merged-by: wuyulin Description: merge "develop" into "release" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 调整部分编辑表的功能, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 Created-by: zhangcheng Author-id: 7119759 MR-id: 7209563 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 See merge request: openGaussythcs00001/openGauss-workbench!126, 数据更新联调问题修复, merge feature-wyl into develop merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7209762 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 See merge request: openGaussythcs00001/openGauss-workbench!127, 生成函数覆盖率报告, Merge remote-tracking branch 'origin/develop' into feature-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/util/DebugUtils.java # plugins/data-studio/src/main/resources/messages_en_US.properties # plugins/data-studio/src/main/resources/messages_zh_CN.properties, 生成函数覆盖率报告, merge feature-zwr into develop merge "feature-zwr" into "develop" 生成函数覆盖率报告 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7209971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 生成函数覆盖率报告 See merge request: openGaussythcs00001/openGauss-workbench!128, 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 Created-by: zhangcheng Author-id: 7119759 MR-id: 7210033 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 See merge request: openGaussythcs00001/openGauss-workbench!130, 调整文件, 生成函数覆盖率报告, 导出视图、序列DDL功能, 导出DDL页面, 创建表, resultSet添加try去捕获, 添加导出函数，模式DDL接口, merge feature-zwr into develop merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7210854 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 See merge request: openGaussythcs00001/openGauss-workbench!131, 1, merge feature-wyl into develop merge "feature-wyl" into "develop" 创建表, 1 Created-by: wuyulin Author-id: 7119753 MR-id: 7210950 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 创建表, 1 See merge request: openGaussythcs00001/openGauss-workbench!132, Merge remote-tracking branch 'origin/develop' into feature-wyl, 导出DDL接口联调, 添加导出表数据接口, merge feature-zwr into develop merge "feature-zwr" into "develop" 添加导出表数据接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7211802 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 添加导出表数据接口 See merge request: openGaussythcs00001/openGauss-workbench!133, 表属性修改于查看新增, 导出表数据, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整文件, 导出DDL页面, 导出DDL接口联调, 导出表数据 Created-by: zhangcheng Author-id: 7119759 MR-id: 7212093 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整文件, 导出DDL页面, 导出DDL接口联调, 导出表数据 See merge request: openGaussythcs00001/openGauss-workbench!134, 接口方法调整, merge feature-wyl into develop merge "feature-wyl" into "develop" Merge remote-tracking branch 'origin/develop' into feature-wyl, 表属性修改于查看新增, 接口方法调整 Created-by: wuyulin Author-id: 7119753 MR-id: 7212264 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" Merge remote-tracking branch 'origin/develop' into feature-wyl, 表属性修改于查看新增, 接口方法调整 See merge request: openGaussythcs00001/openGauss-workbench!135, 表属性实体类修改, 前端补充两个导出, merge feature-wyl into develop merge "feature-wyl" into "develop" 表属性实体类修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7212877 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 表属性实体类修改 See merge request: openGaussythcs00001/openGauss-workbench!137, 导出数据接口调整, 导出数据接口调整, merge feature-zwr into develop merge "feature-zwr" into "develop" 导出数据接口调整, 导出数据接口调整 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7212909 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 导出数据接口调整, 导出数据接口调整 See merge request: openGaussythcs00001/openGauss-workbench!138, 加校验, 创建表, 恢复, merge feature-wyl into develop merge "feature-wyl" into "develop" 加校验 Created-by: wuyulin Author-id: 7119753 MR-id: 7212971 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 加校验 See merge request: openGaussythcs00001/openGauss-workbench!139, 创建表：删除多余代码, merge feature-zhan See merge request: openGaussythcs00001/openGauss-workbench!147 commit 3c8a26f314f3edac1dc502c2a229eae40742dd92 Merge: 079e6ef0 0c2b46b4 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Thu May 25 15:23:12 2023 +0800 merge feature-zwr into develop merge "feature-zwr" into "develop" 调整导出Excel工具类 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7213636 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 调整导出Excel工具类 See merge request: openGaussythcs00001/openGauss-workbench!146 commit 0c2b46b40931931424e5e86cbdc9ecdb3f3ca945 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu May 25 15:22:11 2023 +0800 调整导出Excel工具类 commit 079e6ef007fa229a3fdda12d264ef71ac46d9c09 Merge: 45713e8f fc511444 Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Thu May 25 14:58:14 2023 +0800 merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 编辑table修复rowStatus2 Created-by: zhangcheng Author-id: 7119759 MR-id: 7213626 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 编辑table修复rowStatus2 See merge request: openGaussythcs00001/openGauss-workbench!145 commit fc51144489631382fe5202032f33987b7b55168d Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Thu May 25 14:57:16 2023 +0800 编辑table修复rowStatus2 commit 45713e8f637a5e93f266931591c1d66ea885a6dd Merge: 435fde45 959992a2 Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Thu May 25 14:53:57 2023 +0800 merge feature-wgb-20230525 into develop merge "feature-wgb-20230525" into "develop" 添加check检验 Created-by: wuguobiao Author-id: 7157987 MR-id: 7213625 Commit-by: user Merged-by: wuguobiao Description: merge "feature-wgb-20230525" into "develop" 添加check检验 See merge request: openGaussythcs00001/openGauss-workbench!144 commit 959992a25175095d3a0ff821c4912742a0cf5b76 Author: user <wuguobiao@ncti-gba.cn> Date: Thu May 25 14:53:30 2023 +0800 添加check检验 commit 965fbeb84d163a289d6829b07f6fb4a7c7b8be7f Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Mon May 8 11:43:58 2023 +0800 实例监控630版本代码0508 切换到yarn 撤销删除package-lock 提交代码 提交代码 提交代码 上传代码 提交代码 commit 76d5b904cc626fab102a3c19eccdb7166e306efa Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Thu May 25 14:41:34 2023 +0800 提交代码 commit 435fde45917f79266c83a96128f075c9e036af64 Merge: 74d0ad9c 2c5ca96e Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Thu May 25 11:55:56 2023 +0800 merge feature-zwr into develop merge "feature-zwr" into "develop" 修改文件名 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7213579 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 修改文件名 See merge request: openGaussythcs00001/openGauss-workbench!143 commit 2c5ca96e8a090b3964478477ba0ce0b5429c52a9 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu May 25 11:55:01 2023 +0800 修改文件名 commit 74d0ad9c24da10162e33bc1b2eab48062b219095 Merge: 51cbf729 e52bb6e0 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Thu May 25 10:56:21 2023 +0800 merge feature-wyl into develop merge "feature-wyl" into "develop" 修改行号 Created-by: wuyulin Author-id: 7119753 MR-id: 7213521 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 修改行号 See merge request: openGaussythcs00001/openGauss-workbench!142 commit e52bb6e01efbf4cdf9669e7b02b1a6394ed982d0 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Thu May 25 10:13:14 2023 +0800 修改行号 commit 51cbf7290304e417da2b4d5454fa80a833d32d56 Merge: e523e470 d79e6eab Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Thu May 25 10:11:47 2023 +0800 merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 编辑table修复rowStatus Created-by: zhangcheng Author-id: 7119759 MR-id: 7213518 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 编辑table修复rowStatus See merge request: openGaussythcs00001/openGauss-workbench!141 commit d79e6eab08570e75d429cceafca5b1a4024443ce Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Thu May 25 10:10:14 2023 +0800 编辑table修复rowStatus commit e523e47082483fa6497ffd97d3d9c764af978bd3 Merge: 6fe9cd23 153eaf57 Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Wed May 24 15:51:20 2023 +0800 merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 前端补充两个导出, 创建表, 创建表：删除多余代码 Created-by: zhangcheng Author-id: 7119759 MR-id: 7213308 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 前端补充两个导出, 创建表, 创建表：删除多余代码 See merge request: openGaussythcs00001/openGauss-workbench!140 commit 153eaf5713ec7d403ff1dbc077c7d2b246789b77 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Wed May 24 11:24:46 2023 +0800 创建表：删除多余代码 commit 6fe9cd230832165f6c36dd601aae1264e2e07663 Merge: 7407babf 89b1ebf0 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Wed May 24 10:26:06 2023 +0800 merge feature-wyl into develop merge "feature-wyl" into "develop" 加校验 Created-by: wuyulin Author-id: 7119753 MR-id: 7212971 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 加校验 See merge request: openGaussythcs00001/openGauss-workbench!139 commit 89b1ebf06fedfa8095034aefd6bd0fabc56680f7 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Wed May 24 10:25:21 2023 +0800 恢复 commit 07a0d6bde91a64bf60b430821c2faa39ff83114e Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue May 23 18:38:19 2023 +0800 上传代码 commit 16c2cd1a8d21fd480f7a6929a511f7ea7c471f48 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Tue May 23 18:05:05 2023 +0800 创建表 commit 113d1bead94f89b0df48debf82d2a92398b0c8b1 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Tue May 23 16:52:01 2023 +0800 加校验 commit 7407babf01ee04cf3e042defd28ff33fe3e7c325 Merge: 5c1a2e59 05ede3a1 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Tue May 23 15:40:11 2023 +0800 merge feature-zwr into develop merge "feature-zwr" into "develop" 导出数据接口调整, 导出数据接口调整 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7212909 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 导出数据接口调整, 导出数据接口调整 See merge request: openGaussythcs00001/openGauss-workbench!138 commit 05ede3a133e97fd203f2d1e73bda243c1e01761b Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Tue May 23 15:38:46 2023 +0800 导出数据接口调整 commit 261f59b1b55a732e809953df03f827329397ed3d Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Tue May 23 15:37:43 2023 +0800 导出数据接口调整 commit 5c1a2e59524ce541963f4f9ee572a64623f1919e Merge: da887017 64e7fcc4 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Tue May 23 14:45:53 2023 +0800 merge feature-wyl into develop merge "feature-wyl" into "develop" 表属性实体类修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7212877 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 表属性实体类修改 See merge request: openGaussythcs00001/openGauss-workbench!137 commit b904d8a8b8bbe9bb94c38c79f035cc76aa7765e0 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Tue May 23 14:36:07 2023 +0800 前端补充两个导出 commit 181116c291726f4312951174bab0180ebde071a5 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue May 23 14:25:31 2023 +0800 修改代码结构 commit 64e7fcc42740fa1053f8d54741d15f681a5c373e Author: wuyulin <wuyulin@ncti-gba.cn> Date: Tue May 23 10:36:38 2023 +0800 表属性实体类修改 commit ae8ac7dd390b359a99e1e8eb4ac57cda7e779d92 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue May 23 09:43:01 2023 +0800 提交代码 commit 029f93218e0164e222c277ecda05ebb59dad7c26 Merge: e9cd6176 47b984c9 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri May 19 17:35:38 2023 +0800 Merge branch 'feature-lm' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-lm commit e9cd6176b1ad23507e22be921925ed2958f48b45 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri May 19 17:35:12 2023 +0800 point metric commit 47b984c91ef54883c28dd7b3c84209b319bd447b Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri May 19 17:34:22 2023 +0800 指标 commit da8870174a4f2435ebcf1602d7c27ef17869ec17 Merge: bfc4b434 e6d9c39b Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Fri May 19 17:26:06 2023 +0800 merge feature-wyl into develop merge "feature-wyl" into "develop" Merge remote-tracking branch 'origin/develop' into feature-wyl, 表属性修改于查看新增, 接口方法调整 Created-by: wuyulin Author-id: 7119753 MR-id: 7212264 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" Merge remote-tracking branch 'origin/develop' into feature-wyl, 表属性修改于查看新增, 接口方法调整 See merge request: openGaussythcs00001/openGauss-workbench!135 commit e6d9c39bb1e8b13f146ddcd31eec38893097c463 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri May 19 17:24:45 2023 +0800 接口方法调整 commit 6f130baaf434290a81f640f2d28615b527586025 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Fri May 19 14:39:16 2023 +0800 提交代码 commit bfc4b434dce85933de77089bb2277e6bd9259f4a Merge: f40a9dd3 baab5d06 Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Fri May 19 11:16:19 2023 +0800 merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整文件, 导出DDL页面, 导出DDL接口联调, 导出表数据 Created-by: zhangcheng Author-id: 7119759 MR-id: 7212093 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整文件, 导出DDL页面, 导出DDL接口联调, 导出表数据 See merge request: openGaussythcs00001/openGauss-workbench!134 commit baab5d0664c681b42902d5c58519b73e0e9e9ad4 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Fri May 19 11:14:05 2023 +0800 导出表数据 commit 0e49b155b9ea1d1d2829463670cb7f70a8eda170 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri May 19 10:03:39 2023 +0800 指标 commit 117fc5839baa92b42d999f947471e6e8abcd4553 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri May 19 10:02:26 2023 +0800 exporter commit a084916cba3309fbfa139a093104e89c87b5bdae Author: wuyulin <wuyulin@ncti-gba.cn> Date: Thu May 18 15:11:19 2023 +0800 表属性修改于查看新增 commit f40a9dd33509256239545f99d6c9cdc5d16eaa10 Merge: 29024c9c 68629237 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Thu May 18 14:57:45 2023 +0800 merge feature-zwr into develop merge "feature-zwr" into "develop" 添加导出表数据接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7211802 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 添加导出表数据接口 See merge request: openGaussythcs00001/openGauss-workbench!133 commit 6862923754f53f7efa2dbe099e29991e5681e8a2 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu May 18 14:56:40 2023 +0800 添加导出表数据接口 commit 5d40b22f7e83b36d68e00229b8c1b8cadee7e906 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Thu May 18 10:42:44 2023 +0800 exporter commit d3fdec97acd7e9f17ae90e911f292128f22c3954 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Tue May 16 11:19:46 2023 +0800 导出DDL接口联调 commit 7b5970348e4cdbf549230b3b1bb7c015e2e6c51c Merge: 8f7af7c1 29024c9c Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue May 16 11:00:21 2023 +0800 Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb commit 45f99393133ddc9a4d8e956b29230334cd147738 Merge: 1a5b792b 742cd3f8 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Mon May 15 18:49:58 2023 +0800 Merge remote-tracking branch 'origin/develop' into feature-wyl commit 29024c9cec8f3b31672b8f7dcb049f325846c535 Merge: d011b764 1a5b792b Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Mon May 15 18:49:33 2023 +0800 merge feature-wyl into develop merge "feature-wyl" into "develop" 创建表, 1 Created-by: wuyulin Author-id: 7119753 MR-id: 7210950 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 创建表, 1 See merge request: openGaussythcs00001/openGauss-workbench!132 commit 1a5b792b9b285536026599c9c87a0b23eaa94939 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Mon May 15 18:48:55 2023 +0800 1 commit 39a91a250b370ca79489d6bed614f8f6742a04e0 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon May 15 17:01:37 2023 +0800 agent commit 8eb10ac7943bd82d20b8e1b44c18bb5fb7e35ff7 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon May 15 16:49:53 2023 +0800 agent commit d011b76457b23a52f2b354058065c70a2d19a3e8 Merge: 742cd3f8 c91b4fb3 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Mon May 15 16:16:32 2023 +0800 merge feature-zwr into develop merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7210854 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 See merge request: openGaussythcs00001/openGauss-workbench!131 commit c91b4fb3030b071678ff19b835fb7089aeefcea5 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Mon May 15 16:15:27 2023 +0800 添加导出函数，模式DDL接口 commit 4b265b6e070318bdf238eb1e95c7cdb6ebf8734e Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Mon May 15 16:13:56 2023 +0800 resultSet添加try去捕获 commit 12a14248c1250396779d96c371b84233f026906a Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon May 15 16:07:08 2023 +0800 添加注释,所有标签放开 commit f1124719294acc6fef66600f2ac63bc53f72b7df Author: wuyulin <wuyulin@ncti-gba.cn> Date: Mon May 15 15:58:34 2023 +0800 创建表 commit e43f85bc140598a3df4d485cd09a390ffff07518 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Mon May 15 15:25:02 2023 +0800 导出DDL页面 commit e99b1d40315cad7003f1051fae1954d563bc624c Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Mon May 15 09:16:11 2023 +0800 提交代码 commit 38608c3e79161c73a30c2e298aeac51bb19bc43a Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon May 15 09:01:43 2023 +0800 采集 commit 8f7af7c1d2f1b21bb3fbb4831a4e21be7effd728 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Fri May 12 18:24:05 2023 +0800 告警中心后端代码 commit 83fb011d63fa6f259f2225f523e8a967f6996f7a Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Fri May 12 18:22:50 2023 +0800 告警中心前端代码 commit 76f33a00074c32280a132018f5142abe139e41f7 Merge: 878fc8ec 57df364f Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri May 12 16:56:16 2023 +0800 Merge branch 'feature-lm' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-lm commit 878fc8ec87d1521f9f739250418e22172ced3e86 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri May 12 16:55:54 2023 +0800 指标 commit 742cd3f86c1666135593573bc04607f191809c4b Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Fri May 12 15:01:43 2023 +0800 导出视图、序列DDL功能 commit c76c67465a0c388f4ddc0475a593d5bcae16d6d6 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Fri May 12 11:23:03 2023 +0800 生成函数覆盖率报告 commit d9b09c6e1320e600a14fa230452e5f650cb37583 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Fri May 12 10:38:15 2023 +0800 调整文件 commit 967078f19b110ebe4566f1f5e4db8e1da7788def Merge: 26ee2920 6e8f3f58 Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Thu May 11 17:07:45 2023 +0800 merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 Created-by: zhangcheng Author-id: 7119759 MR-id: 7210033 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 See merge request: openGaussythcs00001/openGauss-workbench!130 commit 6e8f3f58594d3f3ef21fcf1b62a9992a9f272310 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Thu May 11 17:06:43 2023 +0800 函数覆盖率提示生成报告 commit 57df364f0c56a91a1933f3a0536c3cc77c0b3bf6 Merge: 6e860e4e 26ee2920 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Thu May 11 17:04:47 2023 +0800 merge develop into feature-lm merge "develop" into "feature-lm" 问题修复, Merge remote-tracking branch 'origin/develop' into feature-wyl, 编辑表数据添加设置唯一键弹窗, 数据修改, 1, 修改数据时创建主键, 删除多余代码, 调整函数覆盖率相关功能, 调整函数覆盖率接口为post请求, 将函数覆盖率删除接口改成同一个, 调整函数覆盖率返回参数名, 函数覆盖率, 修复 PARTIAL CLUSTER KEY 约束, merge feature-wgb-0505 into develop merge "feature-wgb-0505" into "develop" 修复 PARTIAL CLUSTER KEY 约束 Created-by: wuguobiao Author-id: 7157987 MR-id: 7208837 Commit-by: user Merged-by: wuguobiao Description: merge "feature-wgb-0505" into "develop" 修复 PARTIAL CLUSTER KEY 约束 See merge request: openGaussythcs00001/openGauss-workbench!120, 修改数据修复, 数据结构变更, 1, Merge remote-tracking branch 'origin/develop' into feature-wyl # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/debug/CoverageRateServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/util/DebugUtils.java, 开发导出表DDL和函数DDL功能, merge feature-zwr into develop merge "feature-zwr" into "develop" 删除多余代码, 调整函数覆盖率相关功能, 调整函数覆盖率接口为post请求, 将函数覆盖率删除接口改成同一个, 调整函数覆盖率返回参数名, 开发导出表DDL和函数DDL功能 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7209133 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 删除多余代码, 调整函数覆盖率相关功能, 调整函数覆盖率接口为post请求, 将函数覆盖率删除接口改成同一个, 调整函数覆盖率返回参数名, 开发导出表DDL和函数DDL功能 See merge request: openGaussythcs00001/openGauss-workbench!121, Merge remote-tracking branch 'origin/develop' into feature-zwr, 修改jdk兼容问题, merge feature-wyl into develop merge "feature-wyl" into "develop" 问题修复, Merge remote-tracking branch 'origin/develop' into feature-wyl, 数据修改, 1, 修改数据时创建主键, 修改数据修复, 数据结构变更, 1 Created-by: wuyulin Author-id: 7119753 MR-id: 7209164 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 问题修复, Merge remote-tracking branch 'origin/develop' into feature-wyl, 数据修改, 1, 修改数据时创建主键, 修改数据修复, 数据结构变更, 1 See merge request: openGaussythcs00001/openGauss-workbench!122, 修改index的sql方法, merge feature-wgb-0505 into develop merge "feature-wgb-0505" into "develop" 修改index的sql方法 Created-by: wuguobiao Author-id: 7157987 MR-id: 7209341 Commit-by: user Merged-by: wuguobiao Description: merge "feature-wgb-0505" into "develop" 修改index的sql方法 See merge request: openGaussythcs00001/openGauss-workbench!123, 函数覆盖率：blob下载, 抽取表列语句, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 编辑表数据添加设置唯一键弹窗, 函数覆盖率, 函数覆盖率：blob下载 Created-by: zhangcheng Author-id: 7119759 MR-id: 7209369 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 编辑表数据添加设置唯一键弹窗, 函数覆盖率, 函数覆盖率：blob下载 See merge request: openGaussythcs00001/openGauss-workbench!124, 调整函数覆盖率导出报告功能, merge feature-zwr into develop merge "feature-zwr" into "develop" Merge remote-tracking branch 'origin/develop' into feature-zwr, 调整函数覆盖率导出报告功能 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7209375 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" Merge remote-tracking branch 'origin/develop' into feature-zwr, 调整函数覆盖率导出报告功能 See merge request: openGaussythcs00001/openGauss-workbench!125, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 调整部分编辑表的功能, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 Created-by: zhangcheng Author-id: 7119759 MR-id: 7209563 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 See merge request: openGaussythcs00001/openGauss-workbench!126, 数据更新联调问题修复, merge feature-wyl into develop merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7209762 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 See merge request: openGaussythcs00001/openGauss-workbench!127, 生成函数覆盖率报告, Merge remote-tracking branch 'origin/develop' into feature-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/util/DebugUtils.java # plugins/data-studio/src/main/resources/messages_en_US.properties # plugins/data-studio/src/main/resources/messages_zh_CN.properties, 生成函数覆盖率报告, merge feature-zwr into develop merge "feature-zwr" into "develop" 生成函数覆盖率报告 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7209971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 生成函数覆盖率报告 See merge request: openGaussythcs00001/openGauss-workbench!128 Created-by: luomeng Author-id: 7119743 MR-id: 7210029 Commit-by: zhouwenruo;wuyulin;zhangcheng;张昊宇;wuguobiao;user Merged-by: luomeng Description: merge "develop" into "feature-lm" 问题修复, Merge remote-tracking branch 'origin/develop' into feature-wyl, 编辑表数据添加设置唯一键弹窗, 数据修改, 1, 修改数据时创建主键, 删除多余代码, 调整函数覆盖率相关功能, 调整函数覆盖率接口为post请求, 将函数覆盖率删除接口改成同一个, 调整函数覆盖率返回参数名, 函数覆盖率, 修复 PARTIAL CLUSTER KEY 约束, merge feature-wgb-0505 into develop merge "feature-wgb-0505" into "develop" 修复 PARTIAL CLUSTER KEY 约束 Created-by: wuguobiao Author-id: 7157987 MR-id: 7208837 Commit-by: user Merged-by: wuguobiao Description: merge "feature-wgb-0505" into "develop" 修复 PARTIAL CLUSTER KEY 约束 See merge request: openGaussythcs00001/openGauss-workbench!120, 修改数据修复, 数据结构变更, 1, Merge remote-tracking branch 'origin/develop' into feature-wyl # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/debug/CoverageRateServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/util/DebugUtils.java, 开发导出表DDL和函数DDL功能, merge feature-zwr into develop merge "feature-zwr" into "develop" 删除多余代码, 调整函数覆盖率相关功能, 调整函数覆盖率接口为post请求, 将函数覆盖率删除接口改成同一个, 调整函数覆盖率返回参数名, 开发导出表DDL和函数DDL功能 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7209133 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 删除多余代码, 调整函数覆盖率相关功能, 调整函数覆盖率接口为post请求, 将函数覆盖率删除接口改成同一个, 调整函数覆盖率返回参数名, 开发导出表DDL和函数DDL功能 See merge request: openGaussythcs00001/openGauss-workbench!121, Merge remote-tracking branch 'origin/develop' into feature-zwr, 修改jdk兼容问题, merge feature-wyl into develop merge "feature-wyl" into "develop" 问题修复, Merge remote-tracking branch 'origin/develop' into feature-wyl, 数据修改, 1, 修改数据时创建主键, 修改数据修复, 数据结构变更, 1 Created-by: wuyulin Author-id: 7119753 MR-id: 7209164 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 问题修复, Merge remote-tracking branch 'origin/develop' into feature-wyl, 数据修改, 1, 修改数据时创建主键, 修改数据修复, 数据结构变更, 1 See merge request: openGaussythcs00001/openGauss-workbench!122, 修改index的sql方法, merge feature-wgb-0505 into develop merge "feature-wgb-0505" into "develop" 修改index的sql方法 Created-by: wuguobiao Author-id: 7157987 MR-id: 7209341 Commit-by: user Merged-by: wuguobiao Description: merge "feature-wgb-0505" into "develop" 修改index的sql方法 See merge request: openGaussythcs00001/openGauss-workbench!123, 函数覆盖率：blob下载, 抽取表列语句, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 编辑表数据添加设置唯一键弹窗, 函数覆盖率, 函数覆盖率：blob下载 Created-by: zhangcheng Author-id: 7119759 MR-id: 7209369 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 编辑表数据添加设置唯一键弹窗, 函数覆盖率, 函数覆盖率：blob下载 See merge request: openGaussythcs00001/openGauss-workbench!124, 调整函数覆盖率导出报告功能, merge feature-zwr into develop merge "feature-zwr" into "develop" Merge remote-tracking branch 'origin/develop' into feature-zwr, 调整函数覆盖率导出报告功能 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7209375 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" Merge remote-tracking branch 'origin/develop' into feature-zwr, 调整函数覆盖率导出报告功能 See merge request: openGaussythcs00001/openGauss-workbench!125, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 调整部分编辑表的功能, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 Created-by: zhangcheng Author-id: 7119759 MR-id: 7209563 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 See merge request: openGaussythcs00001/openGauss-workbench!126, 数据更新联调问题修复, merge feature-wyl into develop merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7209762 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 See merge request: openGaussythcs00001/openGauss-workbench!127, 生成函数覆盖率报告, Merge remote-tracking branch 'origin/develop' into feature-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/util/DebugUtils.java # plugins/data-studio/src/main/resources/messages_en_US.properties # plugins/data-studio/src/main/resources/messages_zh_CN.properties, 生成函数覆盖率报告, merge feature-zwr into develop merge "feature-zwr" into "develop" 生成函数覆盖率报告 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7209971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 生成函数覆盖率报告 See merge request: openGaussythcs00001/openGauss-workbench!128 See merge request: openGaussythcs00001/openGauss-workbench!129 commit f76a5ffa29bd514f6c99e4c065ebcd644ef4a795 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Thu May 11 16:37:31 2023 +0800 修复编辑表事件循环的一些问题 commit 26ee2920b7cb4c0d6b01ec799f5d2de70d7a316b Merge: c82422dd 22a70b7a Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Thu May 11 16:29:28 2023 +0800 merge feature-zwr into develop merge "feature-zwr" into "develop" 生成函数覆盖率报告 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7209971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 生成函数覆盖率报告 See merge request: openGaussythcs00001/openGauss-workbench!128 commit 22a70b7ad5e36d6092ff7978b180029031f9cbe6 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu May 11 16:28:26 2023 +0800 生成函数覆盖率报告 commit 9068ff9b1031e3f49cef7390f661064e667f74d5 Merge: 61b913bb c82422dd Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu May 11 16:27:36 2023 +0800 Merge remote-tracking branch 'origin/develop' into feature-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/util/DebugUtils.java # plugins/data-studio/src/main/resources/messages_en_US.properties # plugins/data-studio/src/main/resources/messages_zh_CN.properties commit 61b913bb208d29bc3669cd502b7c9fa81b0a736b Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu May 11 16:17:10 2023 +0800 生成函数覆盖率报告 commit c82422dd808e316258eb1a9d9a4fc539df4afb1d Merge: 91859de4 9fab7235 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Thu May 11 10:07:22 2023 +0800 merge feature-wyl into develop merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7209762 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 See merge request: openGaussythcs00001/openGauss-workbench!127 commit 9fab7235bd425672e6c6979f3b5505d897e4a94a Author: wuyulin <wuyulin@ncti-gba.cn> Date: Thu May 11 10:06:22 2023 +0800 数据更新联调问题修复 commit 6e860e4e4e563006a799ee0f24c12321378d8784 Merge: cb996217 ea736f63 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Thu May 11 10:06:12 2023 +0800 Merge branch 'feature-lm' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-lm commit cb996217e23de9cf1c4f1fe7324d25bf691d7948 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Thu May 11 10:05:50 2023 +0800 exporter commit 0490e7d3af9e789a5869bded7db003ae85636ba0 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon May 8 16:08:03 2023 +0800 sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java commit 91859de4fcdf2e09bc23844004af5c43aa8604cd Merge: 7d2280a5 f6321be2 Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Wed May 10 16:39:01 2023 +0800 merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 Created-by: zhangcheng Author-id: 7119759 MR-id: 7209563 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 See merge request: openGaussythcs00001/openGauss-workbench!126 commit f6321be251a38a8b6bbe3a79b8cc65ee00d05d7d Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Wed May 10 16:37:27 2023 +0800 调整部分编辑表的功能 commit 7d2280a55f86e8b1fcb243217e66f9ebd2c6301b Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon May 8 16:08:03 2023 +0800 sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java commit 3ead48436ca02fb4148f5fde6b7d8377ec043821 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon May 8 16:08:03 2023 +0800 sqliteinit commit 3267a8b3983de87d3d4267db035ea22e4881d9ae Author: wuyulin <wuyulin@ncti-gba.cn> Date: Wed May 10 15:25:52 2023 +0800 增加异常提示 commit e8a43b0fda44a62ab0249d9d87c3715d1bb605d2 Merge: 33a676ae 15adbd86 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Wed May 10 11:42:12 2023 +0800 Merge remote-tracking branch 'origin/develop' into feature-wyl commit 33a676aefbb92a6eafaff730a4aec9aadb5efde4 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Wed May 10 11:16:14 2023 +0800 修改数据结构 commit 15adbd862290653c8007a7fbdca1c1b2333b8934 Merge: c476235b b3520de1 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Wed May 10 10:39:34 2023 +0800 merge feature-zwr into develop merge "feature-zwr" into "develop" Merge remote-tracking branch 'origin/develop' into feature-zwr, 调整函数覆盖率导出报告功能 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7209375 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" Merge remote-tracking branch 'origin/develop' into feature-zwr, 调整函数覆盖率导出报告功能 See merge request: openGaussythcs00001/openGauss-workbench!125 commit b3520de188ef8603c6da955a8c9b2bb9409053df Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Wed May 10 10:38:13 2023 +0800 调整函数覆盖率导出报告功能 commit c476235b8d56ed618ccdb734a64d34bdb57e42b6 Merge: fc34f678 88c47ed8 Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Wed May 10 10:34:35 2023 +0800 merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 编辑表数据添加设置唯一键弹窗, 函数覆盖率, 函数覆盖率：blob下载 Created-by: zhangcheng Author-id: 7119759 MR-id: 7209369 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 编辑表数据添加设置唯一键弹窗, 函数覆盖率, 函数覆盖率：blob下载 See merge request: openGaussythcs00001/openGauss-workbench!124 commit ac1176a63c183215c409550f7ac834e2caa35271 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Wed May 10 10:34:06 2023 +0800 抽取表列语句 commit 88c47ed881fb9f219a082872b7876e890e6db01d Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Wed May 10 10:31:02 2023 +0800 函数覆盖率：blob下载 commit fc34f67833afa877fff3283d109df1d597f1a564 Merge: 43fc9b99 3ed48d50 Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Wed May 10 10:03:57 2023 +0800 merge feature-wgb-0505 into develop merge "feature-wgb-0505" into "develop" 修改index的sql方法 Created-by: wuguobiao Author-id: 7157987 MR-id: 7209341 Commit-by: user Merged-by: wuguobiao Description: merge "feature-wgb-0505" into "develop" 修改index的sql方法 See merge request: openGaussythcs00001/openGauss-workbench!123 commit 3ed48d505f749bac301062c869f6ef4800469e84 Author: user <wuguobiao@ncti-gba.cn> Date: Wed May 10 09:59:35 2023 +0800 修改index的sql方法 commit 43fc9b9986c69c4e96815b29927341b98fd3c4fb Merge: bd953958 c327da9d Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Tue May 9 15:56:17 2023 +0800 merge feature-wyl into develop merge "feature-wyl" into "develop" 问题修复, Merge remote-tracking branch 'origin/develop' into feature-wyl, 数据修改, 1, 修改数据时创建主键, 修改数据修复, 数据结构变更, 1 Created-by: wuyulin Author-id: 7119753 MR-id: 7209164 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 问题修复, Merge remote-tracking branch 'origin/develop' into feature-wyl, 数据修改, 1, 修改数据时创建主键, 修改数据修复, 数据结构变更, 1 See merge request: openGaussythcs00001/openGauss-workbench!122 commit c327da9d8f70e352783581b7e7190c559354297e Author: wuyulin <wuyulin@ncti-gba.cn> Date: Tue May 9 15:55:12 2023 +0800 修改jdk兼容问题 commit 57f2f27dad1cb2b3554ce02c0f19c346ffc5264a Merge: ba3aea95 6173352b Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Tue May 9 15:07:41 2023 +0800 Merge remote-tracking branch 'origin/develop' into feature-zwr commit bd9539588149209fa387bc543414cb0edaa3a432 Merge: 6173352b ba3aea95 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Tue May 9 15:07:29 2023 +0800 merge feature-zwr into develop merge "feature-zwr" into "develop" 删除多余代码, 调整函数覆盖率相关功能, 调整函数覆盖率接口为post请求, 将函数覆盖率删除接口改成同一个, 调整函数覆盖率返回参数名, 开发导出表DDL和函数DDL功能 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7209133 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 删除多余代码, 调整函数覆盖率相关功能, 调整函数覆盖率接口为post请求, 将函数覆盖率删除接口改成同一个, 调整函数覆盖率返回参数名, 开发导出表DDL和函数DDL功能 See merge request: openGaussythcs00001/openGauss-workbench!121 commit ba3aea9519b422afda7f7134c28b2dfc67bee8a9 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Tue May 9 15:06:04 2023 +0800 开发导出表DDL和函数DDL功能 commit ad5347f57453a4deea5ed3376381e421086b5752 Merge: 10a60c4b 6173352b Author: wuyulin <wuyulin@ncti-gba.cn> Date: Tue May 9 11:46:44 2023 +0800 Merge remote-tracking branch 'origin/develop' into feature-wyl # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/debug/CoverageRateServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/util/DebugUtils.java commit 10a60c4bc54c0493a6ac57dcae864b3d3c6bc32b Author: wuyulin <wuyulin@ncti-gba.cn> Date: Tue May 9 11:44:19 2023 +0800 1 commit cfacc4e4c88837eefd64d6ccae944f827dc24eca Author: wuyulin <wuyulin@ncti-gba.cn> Date: Tue May 9 09:42:10 2023 +0800 数据结构变更 commit d06a125c7b30ded984b331e10647ba0978671dac Author: wuyulin <wuyulin@ncti-gba.cn> Date: Mon May 8 16:45:17 2023 +0800 修改数据修复 commit 6173352befef31423cddb6f35d309ee0b000276c Merge: b333d85b 92e663aa Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Mon May 8 16:25:33 2023 +0800 merge feature-wgb-0505 into develop merge "feature-wgb-0505" into "develop" 修复 PARTIAL CLUSTER KEY 约束 Created-by: wuguobiao Author-id: 7157987 MR-id: 7208837 Commit-by: user Merged-by: wuguobiao Description: merge "feature-wgb-0505" into "develop" 修复 PARTIAL CLUSTER KEY 约束 See merge request: openGaussythcs00001/openGauss-workbench!120 commit 92e663aa21a3acd9ccaf389454f16efe91da0315 Author: user <wuguobiao@ncti-gba.cn> Date: Mon May 8 16:19:03 2023 +0800 修复 PARTIAL CLUSTER KEY 约束 commit 8030ccb9e218e3579b3d4e036d6e2c49c0f7b352 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Mon May 8 15:22:30 2023 +0800 Revert "提交代码" This reverts commit e103ff955ec521cc063adca87b25257b28405b0f commit 1f8f708645d2401a3a458925546c03502aa8e637 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Mon May 8 15:20:05 2023 +0800 撤销删除package-lock commit f2344651185f9eb65bf2fc813dc357c0a28e08e8 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Mon May 8 15:17:14 2023 +0800 切换到yarn commit 34fd139481c4437d563a5e65bfb0bc9214c0edc4 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon May 8 14:51:19 2023 +0800 修改sqlite初始化方式 commit 659fd0db03e05daf336f48c8b42cb745e17581e6 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Mon May 8 11:43:58 2023 +0800 实例监控630版本代码0508 commit ea736f63797d9c5df5be47b6c1f953c7555517ff Merge: 85e61b8d b333d85b Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Mon May 8 11:18:51 2023 +0800 merge develop into feature-lm merge "develop" into "feature-lm" 调整函数覆盖率按钮状态, merge feature-zwr into develop merge "feature-zwr" into "develop" 调整函数覆盖率按钮状态 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7207747 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 调整函数覆盖率按钮状态 See merge request: openGaussythcs00001/openGauss-workbench!117, 修复约束bug, merge feature-wgb-0505 into develop merge "feature-wgb-0505" into "develop" 修复约束bug Created-by: wuguobiao Author-id: 7157987 MR-id: 7208260 Commit-by: user Merged-by: wuguobiao Description: merge "feature-wgb-0505" into "develop" 修复约束bug See merge request: openGaussythcs00001/openGauss-workbench!118 Created-by: luomeng Author-id: 7119743 MR-id: 7208624 Commit-by: wuguobiao;user;zhouwenruo Merged-by: luomeng Description: merge "develop" into "feature-lm" 调整函数覆盖率按钮状态, merge feature-zwr into develop merge "feature-zwr" into "develop" 调整函数覆盖率按钮状态 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7207747 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 调整函数覆盖率按钮状态 See merge request: openGaussythcs00001/openGauss-workbench!117, 修复约束bug, merge feature-wgb-0505 into develop merge "feature-wgb-0505" into "develop" 修复约束bug Created-by: wuguobiao Author-id: 7157987 MR-id: 7208260 Commit-by: user Merged-by: wuguobiao Description: merge "feature-wgb-0505" into "develop" 修复约束bug See merge request: openGaussythcs00001/openGauss-workbench!118 See merge request: openGaussythcs00001/openGauss-workbench!119 commit 0daa0a3e3e6de74f3b32ecea1b73edff9d97d62d Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Sat May 6 17:44:44 2023 +0800 函数覆盖率 commit e103ff955ec521cc063adca87b25257b28405b0f Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Sat May 6 17:37:58 2023 +0800 提交代码 commit 6ff94f314b0fc5b360d63be0aac7a198d807d2e6 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Sat May 6 16:03:54 2023 +0800 调整函数覆盖率返回参数名 commit c6644c63eaf7a14fa6599da65d2e9579a2df162f Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Sat May 6 15:28:15 2023 +0800 将函数覆盖率删除接口改成同一个 commit 6d50cae3a6b963f9a97b4fff1f47e5714e710d11 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Sat May 6 11:50:12 2023 +0800 调整函数覆盖率接口为post请求 commit 5fcee2b9c40ee1563daf12a51441b32edfb1e14e Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Sat May 6 10:00:29 2023 +0800 调整函数覆盖率相关功能 commit b333d85b3509895adbfb6bdb097f627894adbfb7 Merge: fff054a8 d9fb7e90 Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Fri May 5 21:15:44 2023 +0800 merge feature-wgb-0505 into develop merge "feature-wgb-0505" into "develop" 修复约束bug Created-by: wuguobiao Author-id: 7157987 MR-id: 7208260 Commit-by: user Merged-by: wuguobiao Description: merge "feature-wgb-0505" into "develop" 修复约束bug See merge request: openGaussythcs00001/openGauss-workbench!118 commit d9fb7e903706c472d1865c37f73faef2bd31638d Author: user <wuguobiao@ncti-gba.cn> Date: Fri May 5 21:10:31 2023 +0800 修复约束bug commit 62bd8a8f512008608a3c89ebc15836f241ece75c Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Fri May 5 15:01:42 2023 +0800 删除多余代码 commit 88cf65166a6b499646b5118b7883f870c974860a Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri May 5 10:19:26 2023 +0800 修改数据时创建主键 commit 8035ba312af32fc05d6f1f4ffae4c634e33c364a Author: wuyulin <wuyulin@ncti-gba.cn> Date: Thu May 4 16:04:33 2023 +0800 1 commit 26abb516cf323cdb29e74e1f01f25cb0162b89fa Author: wuyulin <wuyulin@ncti-gba.cn> Date: Thu May 4 15:38:20 2023 +0800 数据修改 commit 334c0717c5470a007dd0ac2727ac5115e8fdb805 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Thu May 4 10:52:52 2023 +0800 编辑表数据添加设置唯一键弹窗 commit fff054a80405c9ed793c23b09dc4758f5e4c24ce Merge: 8b0d1cf0 905d2fd1 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Thu May 4 09:49:14 2023 +0800 merge feature-zwr into develop merge "feature-zwr" into "develop" 调整函数覆盖率按钮状态 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7207747 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 调整函数覆盖率按钮状态 See merge request: openGaussythcs00001/openGauss-workbench!117 commit 905d2fd1adff2c127a887cd6b5487bdce146e32d Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu May 4 09:47:07 2023 +0800 调整函数覆盖率按钮状态 commit 85e61b8d2824e85bc8cd90b6001b6fc3b69de1dc Merge: 7509abec 8b0d1cf0 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Thu Apr 27 18:54:46 2023 +0800 merge develop into feature-lm merge "develop" into "feature-lm" 移除多余空行, 调整代码规范以及格式化, 完成编辑表格的列、约束、索引, 修改.env的IP信息, Merge branch 'feature-zhangcheng' into develop, 修改iconfont本身的样式, Merge branch 'feature-zhangcheng' into develop, 超时, 调整函数覆盖率相关功能代码, merge feature-zwr into develop merge "feature-zwr" into "develop" 调整代码规范以及格式化, 调整函数覆盖率相关功能代码 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7207250 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 调整代码规范以及格式化, 调整函数覆盖率相关功能代码 See merge request: openGaussythcs00001/openGauss-workbench!115 Created-by: luomeng Author-id: 7119743 MR-id: 7207384 Commit-by: zhouwenruo;张昊宇;zhangcheng Merged-by: luomeng Description: merge "develop" into "feature-lm" 移除多余空行, 调整代码规范以及格式化, 完成编辑表格的列、约束、索引, 修改.env的IP信息, Merge branch 'feature-zhangcheng' into develop, 修改iconfont本身的样式, Merge branch 'feature-zhangcheng' into develop, 超时, 调整函数覆盖率相关功能代码, merge feature-zwr into develop merge "feature-zwr" into "develop" 调整代码规范以及格式化, 调整函数覆盖率相关功能代码 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7207250 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 调整代码规范以及格式化, 调整函数覆盖率相关功能代码 See merge request: openGaussythcs00001/openGauss-workbench!115 See merge request: openGaussythcs00001/openGauss-workbench!116 commit 8b0d1cf014c02be676f0d4c9c20c8518773c1e10 Merge: d81606b0 126ff100 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Thu Apr 27 15:19:14 2023 +0800 merge feature-zwr into develop merge "feature-zwr" into "develop" 调整代码规范以及格式化, 调整函数覆盖率相关功能代码 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7207250 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 调整代码规范以及格式化, 调整函数覆盖率相关功能代码 See merge request: openGaussythcs00001/openGauss-workbench!115 commit 126ff100d68880e9227282654870f29a82153062 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu Apr 27 15:17:53 2023 +0800 调整函数覆盖率相关功能代码 commit d81606b09fc1628677d73527b2da78053f1ebec5 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Apr 26 14:51:38 2023 +0800 超时 commit 773127a9f1b7788af1cd11e8d5ff62767800a5d8 Merge: 59affdfe 2991d6da Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Wed Apr 26 11:54:36 2023 +0800 Merge branch 'feature-zhangcheng' into develop commit 2991d6da9c350da2ec387cc41fb072b24fd45b97 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Wed Apr 26 11:52:03 2023 +0800 修改iconfont本身的样式 commit 59affdfe722894059fb75d2c5b9c8f1beeff15d5 Merge: 2eb77e88 74a65d13 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Wed Apr 26 11:40:07 2023 +0800 Merge branch 'feature-zhangcheng' into develop commit 2eb77e88e66fb3a1c105b5de738064488b1f6086 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Wed Apr 26 11:39:23 2023 +0800 修改.env的IP信息 commit 74a65d1318dd1a7316792ed7254a74888b3d01cf Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Wed Apr 26 11:32:05 2023 +0800 完成编辑表格的列、约束、索引 commit 4530875183e886710a6bad466fc74d7f1afb554d Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Wed Apr 26 10:22:14 2023 +0800 调整代码规范以及格式化 commit d4d6135f9c5721f8b22cb173b98169c9547bc5e2 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Apr 26 10:05:54 2023 +0800 移除多余空行 commit 7509abec06f6e7b99cf512c486dafa3f6045ac00 Merge: 3c9c1216 86185286 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Wed Apr 26 09:16:52 2023 +0800 merge develop into feature-lm merge "develop" into "feature-lm" 文件分片上传和断点续传优化, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, promethues、es、exports、filebeat、agent安装优化, merge feature-wyb into develop merge "feature-wyb" into "develop" 文件分片上传和断点续传优化, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, promethues、es、exports、filebeat、agent安装优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7206095 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 文件分片上传和断点续传优化, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, promethues、es、exports、filebeat、agent安装优化 See merge request: openGaussythcs00001/openGauss-workbench!106, 多数据库配置, filebeat列表, filebeat卸载, 多agent安装, merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" 修改index, 修改index, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" 冲突, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205550 Commit-by: 罗梦;luomeng Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" m Created-by: luomeng Author-id: 7119743 MR-id: 7206645 Commit-by: wuyuebin;张昊宇;luomeng;罗梦;zhouwenruo Merged-by: luomeng Description: merge "develop" into "feature-lm" 文件分片上传和断点续传优化, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, promethues、es、exports、filebeat、agent安装优化, merge feature-wyb into develop merge "feature-wyb" into "develop" 文件分片上传和断点续传优化, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, promethues、es、exports、filebeat、agent安装优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7206095 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 文件分片上传和断点续传优化, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, promethues、es、exports、filebeat、agent安装优化 See merge request: openGaussythcs00001/openGauss-workbench!106, 多数据库配置, filebeat列表, filebeat卸载, 多agent安装, merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" 修改index, 修改index, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" 冲突, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205550 Commit-by: 罗梦;luomeng Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" m See merge request: openGaussythcs00001/openGauss-workbench!114 commit 8618528663924d5825cbc5da5e604fb796cb56f1 Merge: b3f740b6 f92f6ce4 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Tue Apr 25 18:03:26 2023 +0800 merge bugfix-wyb-issue into develop merge "bugfix-wyb-issue" into "develop" 中英文问题 Created-by: wuyuebin Author-id: 7158405 MR-id: 7206560 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "bugfix-wyb-issue" into "develop" 中英文问题 See merge request: openGaussythcs00001/openGauss-workbench!113 commit f92f6ce4dfd0669dc5f4594cb67946985ec059d4 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Apr 25 18:01:47 2023 +0800 中英文问题 commit b3f740b6e5f30e657ac0de6467136b590356062c Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Apr 25 17:58:21 2023 +0800 移除无效 commit f033bda76637931107c17dd6e1d1ce3c837f7307 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Sun Apr 23 14:32:20 2023 +0800 实例监控增加断点续传功能 commit 90212c7902d7266c05be6ea00e9c3aac682245f2 Merge: 5552d4cb 7eba5b03 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Tue Apr 25 16:49:17 2023 +0800 merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" 修改index, 修改index, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" 冲突, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205550 Commit-by: 罗梦;luomeng Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!92, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, merge feature-wyb into develop merge "feature-wyb" into "develop" 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205559 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录 See merge request: openGaussythcs00001/openGauss-workbench!93, 数据更新，表字段更新, 冲突, 多数据库环境安装, 冲突修复, merge feature-wyl into develop merge "feature-wyl" into "develop" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, 数据更新，表字段更新, 冲突, 冲突修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7205661 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/da Created-by: luomeng Author-id: 7119743 MR-id: 7206509 Commit-by: 罗梦;luomeng Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" 修改index, 修改index, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" 冲突, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205550 Commit-by: 罗梦;luomeng Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!92, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, merge feature-wyb into develop merge "feature-wyb" into "develop" 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205559 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录 See merge request: openGaussythcs00001/openGauss-workbench!93, 数据更新，表字段更新, 冲突, 多数据库环境安装, 冲突修复, merge feature-wyl into develop merge "feature-wyl" into "develop" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, 数据更新，表字段更新, 冲突, 冲突修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7205661 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/da See merge request: openGaussythcs00001/openGauss-workbench!112 commit 7eba5b0376e4a17997ac44130abe9acadd02a311 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Tue Apr 25 16:48:17 2023 +0800 agent修改存放文件的创建方式 commit 4ed32751d5644eecfc38e5f1f371b416aa2a0b62 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Tue Apr 25 16:45:24 2023 +0800 agent修改存放文件的创建方式 commit 5552d4cb43dc942ce89c9cf45b46378a0f0f6bac Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Apr 25 16:37:35 2023 +0800 faq commit 810a03cf4341080c9da01be477abca1b78e7c39f Merge: 2cc3e13b f398bddb Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Tue Apr 25 16:02:31 2023 +0800 merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" 新增函数覆盖率相关功能, 新增函数覆盖率相关功能, merge feature-zwr into develop merge "feature-zwr" into "develop" 新增函数覆盖率相关功能, 新增函数覆盖率相关功能 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7206418 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 新增函数覆盖率相关功能, 新增函数覆盖率相关功能 See merge request: openGaussythcs00001/openGauss-workbench!110, 兼容旧版采集器 Created-by: luomeng Author-id: 7119743 MR-id: 7206486 Commit-by: 张昊宇;zhouwenruo Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" 新增函数覆盖率相关功能, 新增函数覆盖率相关功能, merge feature-zwr into develop merge "feature-zwr" into "develop" 新增函数覆盖率相关功能, 新增函数覆盖率相关功能 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7206418 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 新增函数覆盖率相关功能, 新增函数覆盖率相关功能 See merge request: openGaussythcs00001/openGauss-workbench!110, 兼容旧版采集器 See merge request: openGaussythcs00001/openGauss-workbench!111 commit f398bddbf4a667f19d4927a6e7adff463e32da74 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Apr 25 16:00:33 2023 +0800 兼容旧版采集器 commit b246c981cc5ecd4a26c796c5c0efe01fb1ada2cc Merge: 2f0da5c4 e23aa78d Author: wuyulin <wuyulin@ncti-gba.cn> Date: Tue Apr 25 15:11:01 2023 +0800 Merge remote-tracking branch 'origin/develop' into feature-wyl commit e23aa78dc99258f99be0c5797b35394d6bb7c78b Merge: 0d718e01 27e55451 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Tue Apr 25 14:21:01 2023 +0800 merge feature-zwr into develop merge "feature-zwr" into "develop" 新增函数覆盖率相关功能, 新增函数覆盖率相关功能 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7206418 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 新增函数覆盖率相关功能, 新增函数覆盖率相关功能 See merge request: openGaussythcs00001/openGauss-workbench!110 commit 27e5545103b2f46fb71b472fb3ab70d4c1ab5746 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Tue Apr 25 14:17:08 2023 +0800 新增函数覆盖率相关功能 commit ef7d637a4be1a0e22f0f364c47cd46b1f49dbd46 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Tue Apr 25 14:15:22 2023 +0800 新增函数覆盖率相关功能 commit 2cc3e13bcdafec84441bd5caf9fcd2e3216adad1 Merge: 7a65a00e 0d718e01 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Tue Apr 25 11:13:54 2023 +0800 merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" 诊断调用 Created-by: luomeng Author-id: 7119743 MR-id: 7206370 Commit-by: 张昊宇 Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" 诊断调用 See merge request: openGaussythcs00001/openGauss-workbench!109 commit 0d718e01acdb00c510e2e446e428ae2c8caffed4 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Apr 25 11:12:36 2023 +0800 诊断调用 commit 7a65a00e9a96db965f574cdf0aa428a5e8ef4e2f Merge: c0bce1e8 7d03fcdb Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Tue Apr 25 10:21:56 2023 +0800 merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" 移除 Created-by: luomeng Author-id: 7119743 MR-id: 7206347 Commit-by: 张昊宇 Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" 移除 See merge request: openGaussythcs00001/openGauss-workbench!108 commit 7d03fcdbde28e38b90b26543307e8fa88a9d8f91 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Apr 25 10:08:09 2023 +0800 移除 commit c0bce1e8bcc907d30155b9c8eb39aa80f79852a5 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Tue Apr 25 09:59:35 2023 +0800 agent添加启动端口自定义配置 commit c8e749702d261b3525c00182ebea5f754caff5ad Merge: 49d8d42a e00587f2 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Tue Apr 25 09:48:29 2023 +0800 merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" 修改index, 修改index, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" 冲突, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205550 Commit-by: 罗梦;luomeng Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!92, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, merge feature-wyb into develop merge "feature-wyb" into "develop" 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205559 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录 See merge request: openGaussythcs00001/openGauss-workbench!93, 数据更新，表字段更新, 冲突, 多数据库环境安装, 冲突修复, merge feature-wyl into develop merge "feature-wyl" into "develop" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, 数据更新，表字段更新, 冲突, 冲突修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7205661 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceI Created-by: luomeng Author-id: 7119743 MR-id: 7206324 Commit-by: 张昊宇;wuyuebin;wuguobiao;user;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" 修改index, 修改index, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" 冲突, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205550 Commit-by: 罗梦;luomeng Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!92, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, merge feature-wyb into develop merge "feature-wyb" into "develop" 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205559 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录 See merge request: openGaussythcs00001/openGauss-workbench!93, 数据更新，表字段更新, 冲突, 多数据库环境安装, 冲突修复, merge feature-wyl into develop merge "feature-wyl" into "develop" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, 数据更新，表字段更新, 冲突, 冲突修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7205661 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceI See merge request: openGaussythcs00001/openGauss-workbench!107 commit e00587f237273e8572d6c270c4ff31a0bc8bd57c Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Apr 25 09:47:03 2023 +0800 多agent安装 commit 3d296cff29e0e247f816ae1f095ffe42811895e6 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon Apr 24 18:14:34 2023 +0800 filebeat卸载 commit 7f53615510b74329726eeef862be11de263457a0 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon Apr 24 17:56:53 2023 +0800 filebeat列表 commit c6ea04357d835eae6c3a7496972fac015199e031 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon Apr 24 17:28:56 2023 +0800 多数据库配置 commit 2f0da5c4f252dc663effdbdddb028503c581f11f Author: wuyulin <wuyulin@ncti-gba.cn> Date: Mon Apr 24 16:38:34 2023 +0800 问题修复 commit d08ba619f084c7cb42369c799343a27a47865629 Merge: 3c9c1216 fc212a37 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Mon Apr 24 14:54:22 2023 +0800 merge feature-wyb into develop merge "feature-wyb" into "develop" 文件分片上传和断点续传优化, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, promethues、es、exports、filebeat、agent安装优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7206095 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 文件分片上传和断点续传优化, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, promethues、es、exports、filebeat、agent安装优化 See merge request: openGaussythcs00001/openGauss-workbench!106 commit fc212a3709d31c06f24cac370c5af7471fb6d739 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Apr 24 14:47:53 2023 +0800 promethues、es、exports、filebeat、agent安装优化 commit 6e80fc4e2379088dd5346e737d22e0da4e5b22c3 Merge: 31f37dae 3c9c1216 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Apr 24 12:37:52 2023 +0800 Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb commit 3c9c1216d01a1c77974fd5984b0c2a4b08542bdf Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon Apr 24 12:07:15 2023 +0800 路径 commit a7ed084f8cce02c5d9f77660d669c8629dfc0c63 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon Apr 24 12:06:47 2023 +0800 添加路径配置 commit 31f37dae80e74c860a2dc9d322032bd0b1b5591b Merge: 1448797d c63b8f27 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Apr 24 12:04:57 2023 +0800 Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb commit c63b8f2750ce811b5a5b5be9502a635a6e9245b7 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon Apr 24 12:01:53 2023 +0800 路径 commit 1448797d5fa10bd037b39224b58815f57b6cf27f Merge: 8ee92b0d 60ebc96d Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Apr 24 11:37:56 2023 +0800 Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb commit 60ebc96d5d54761dd827f9b723f0d05167a7d90c Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon Apr 24 11:36:03 2023 +0800 创建文件夹 commit 8ee92b0df0918947297734ddfc627a917056df68 Merge: 733eaca6 cbabbcdd Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Apr 24 10:47:06 2023 +0800 Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb commit cbabbcdd813c7daa5715f2486ab7f55df441592b Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon Apr 24 10:27:58 2023 +0800 日志/实例安装 commit f9926366acfeaea166b67430f935a07f42b840e2 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Sun Apr 23 20:37:51 2023 +0800 安装 commit 733eaca619712b3a3afc21954b2d20d3da997aec Merge: 3e31dc98 d4d4c2b6 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Sun Apr 23 19:32:41 2023 +0800 Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb commit 3e31dc9888a83d8434eca4be55c8ed1603c8e758 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Sun Apr 23 19:31:24 2023 +0800 文件分片上传和断点续传优化 commit d4d4c2b6613cce276c33384f005d5aadad6c98e6 Merge: 811d7186 bd81575a Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Sun Apr 23 19:02:42 2023 +0800 merge feature-wgb-20230423-index1 into develop merge "feature-wgb-20230423-index1" into "develop" 修改index Created-by: wuguobiao Author-id: 7157987 MR-id: 7205934 Commit-by: user Merged-by: wuguobiao Description: merge "feature-wgb-20230423-index1" into "develop" 修改index See merge request: openGaussythcs00001/openGauss-workbench!105 commit bd81575a48ff38e268300aeeeca272a0bb241579 Author: user <wuguobiao@ncti-gba.cn> Date: Sun Apr 23 18:58:59 2023 +0800 修改index commit 811d7186ece3509902d4c082f1be0027d51e81c6 Merge: 4903127a e4231e9c Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Sun Apr 23 18:41:47 2023 +0800 merge feature-wyb into develop merge "feature-wyb" into "develop" 文件分片上传和断点续传，以及添加安装用户和安装目录 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205924 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 文件分片上传和断点续传，以及添加安装用户和安装目录 See merge request: openGaussythcs00001/openGauss-workbench!104 commit e4231e9cb04399816c1f1d45591e65e20c7f642a Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Sun Apr 23 18:40:25 2023 +0800 文件分片上传和断点续传，以及添加安装用户和安装目录 commit 4903127abc4a76def71436f1f776c5f4e4c65c5c Merge: 4c7c04cf 0aa17574 Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Sun Apr 23 17:59:47 2023 +0800 merge feature-wgb-20230423-index1 into develop merge "feature-wgb-20230423-index1" into "develop" 修改index, 修改index Created-by: wuguobiao Author-id: 7157987 MR-id: 7205905 Commit-by: user Merged-by: wuguobiao Description: merge "feature-wgb-20230423-index1" into "develop" 修改index, 修改index See merge request: openGaussythcs00001/openGauss-workbench!103 commit 4c7c04cfd652b5da89737d5d2f3bea548e6932e0 Merge: b2fb1ec9 49d8d42a Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Sun Apr 23 17:58:55 2023 +0800 merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" 冲突, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205550 Commit-by: 罗梦;luomeng Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!92, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, merge feature-wyb into develop merge "feature-wyb" into "develop" 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205559 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录 See merge request: openGaussythcs00001/openGauss-workbench!93, 数据更新，表字段更新, 冲突, 多数据库环境安装, 冲突修复, merge feature-wyl into develop merge "feature-wyl" into "develop" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, 数据更新，表字段更新, 冲突, 冲突修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7205661 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, 数据更新，表字段更新, 冲突, 冲突修复 See merge request: openGaussythcs00001/openGauss- Created-by: luomeng Author-id: 7119743 MR-id: 7205904 Commit-by: 罗梦;luomeng Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" 冲突, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205550 Commit-by: 罗梦;luomeng Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!92, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, merge feature-wyb into develop merge "feature-wyb" into "develop" 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205559 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录 See merge request: openGaussythcs00001/openGauss-workbench!93, 数据更新，表字段更新, 冲突, 多数据库环境安装, 冲突修复, merge feature-wyl into develop merge "feature-wyl" into "develop" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, 数据更新，表字段更新, 冲突, 冲突修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7205661 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, 数据更新，表字段更新, 冲突, 冲突修复 See merge request: openGaussythcs00001/openGauss- See merge request: openGaussythcs00001/openGauss-workbench!102 commit 0aa17574635806372cf65b359c61a40a18e6e539 Author: user <wuguobiao@ncti-gba.cn> Date: Sun Apr 23 17:58:28 2023 +0800 修改index commit 49d8d42a6e772158fdbc0047744f655f99796819 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Sun Apr 23 17:58:12 2023 +0800 安装部署上传增加返回信息 commit bdadae4a3259b451fa73165fd7bcb89a57933e44 Merge: 29493845 b2fb1ec9 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Sun Apr 23 17:50:21 2023 +0800 merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" 冲突, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205550 Commit-by: 罗梦;luomeng Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!92, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, merge feature-wyb into develop merge "feature-wyb" into "develop" 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205559 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录 See merge request: openGaussythcs00001/openGauss-workbench!93, 数据更新，表字段更新, 冲突, 多数据库环境安装, 冲突修复, merge feature-wyl into develop merge "feature-wyl" into "develop" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, 数据更新，表字段更新, 冲突, 冲突修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7205661 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, 数据更新，表字段更新, 冲突, 冲突修复 See merge request: openGaussythcs00001/openGauss-workbench!96 Created-by: luomeng Author-id: 7119743 MR-id: 7205780 Commit-by: wu Created-by: luomeng Author-id: 7119743 MR-id: 7205900 Commit-by: wuyulin;张昊宇;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" 冲突, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205550 Commit-by: 罗梦;luomeng Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!92, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, merge feature-wyb into develop merge "feature-wyb" into "develop" 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205559 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录 See merge request: openGaussythcs00001/openGauss-workbench!93, 数据更新，表字段更新, 冲突, 多数据库环境安装, 冲突修复, merge feature-wyl into develop merge "feature-wyl" into "develop" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, 数据更新，表字段更新, 冲突, 冲突修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7205661 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, 数据更新，表字段更新, 冲突, 冲突修复 See merge request: openGaussythcs00001/openGauss-workbench!96 Created-by: luomeng Author-id: 7119743 MR-id: 7205780 Commit-by: wu See merge request: openGaussythcs00001/openGauss-workbench!101 commit 4d611284b40bd8116b96ee3abba8927564e9bd31 Author: user <wuguobiao@ncti-gba.cn> Date: Sun Apr 23 17:01:44 2023 +0800 修改index commit b2fb1ec9a566f97be5727c95951e4c92f64e4c8d Merge: 57180c40 8bb016a5 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Sun Apr 23 16:24:03 2023 +0800 merge feature-wyl into develop merge "feature-wyl" into "develop" 冲突, 修改问题 Created-by: wuyulin Author-id: 7119753 MR-id: 7205849 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 冲突, 修改问题 See merge request: openGaussythcs00001/openGauss-workbench!100 commit 8bb016a5d652c772f34a8eaafadb2288dd95fa29 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Sun Apr 23 16:23:18 2023 +0800 修改问题 commit 57180c40da2255ed6d1325cdffea6a938cf40d91 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Sun Apr 23 15:42:34 2023 +0800 user commit 0f6c6d88d7c88c1f4fd0993c17e66fbc48357fae Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Sun Apr 23 15:37:38 2023 +0800 添加user commit eb1f47118b726d10ebfbd8f9a4322ee813daeb23 Merge: 5cd156a9 29493845 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Sun Apr 23 14:33:43 2023 +0800 merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205550 Commit-by: 罗梦;luomeng Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!92, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, merge feature-wyb into develop merge "feature-wyb" into "develop" 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205559 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录 See merge request: openGaussythcs00001/openGauss-workbench!93, 数据更新，表字段更新, 冲突, 多数据库环境安装, 冲突修复, merge feature-wyl into develop merge "feature-wyl" into "develop" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, 数据更新，表字段更新, 冲突, 冲突修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7205661 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, 数据更新，表字段更新, 冲突, 冲突修复 See merge request: openGaussythcs00001/openGauss-workbench!96 Created-by: luomeng Author-id: 7119743 MR-id: 7205780 Commit-by: wuyulin;张昊宇;wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugf Created-by: luomeng Author-id: 7119743 MR-id: 7205783 Commit-by: 罗梦;luomeng Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205550 Commit-by: 罗梦;luomeng Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!92, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, merge feature-wyb into develop merge "feature-wyb" into "develop" 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205559 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录 See merge request: openGaussythcs00001/openGauss-workbench!93, 数据更新，表字段更新, 冲突, 多数据库环境安装, 冲突修复, merge feature-wyl into develop merge "feature-wyl" into "develop" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, 数据更新，表字段更新, 冲突, 冲突修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7205661 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, 数据更新，表字段更新, 冲突, 冲突修复 See merge request: openGaussythcs00001/openGauss-workbench!96 Created-by: luomeng Author-id: 7119743 MR-id: 7205780 Commit-by: wuyulin;张昊宇;wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugf See merge request: openGaussythcs00001/openGauss-workbench!99 commit 2949384566d0b1d24b9739a44bba8307726cb417 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Sun Apr 23 14:32:20 2023 +0800 实例监控增加断点续传功能 commit aad6fd629ebebbdf9d57fd8eb2acd4273885ba1e Merge: 33278756 5cd156a9 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Sun Apr 23 14:26:53 2023 +0800 merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205550 Commit-by: 罗梦;luomeng Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!92, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, merge feature-wyb into develop merge "feature-wyb" into "develop" 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205559 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录 See merge request: openGaussythcs00001/openGauss-workbench!93, 数据更新，表字段更新, 冲突, 多数据库环境安装, 冲突修复, merge feature-wyl into develop merge "feature-wyl" into "develop" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, 数据更新，表字段更新, 冲突, 冲突修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7205661 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, 数据更新，表字段更新, 冲突, 冲突修复 See merge request: openGaussythcs00001/openGauss-workbench!96 Created-by: luomeng Author-id: 7119743 MR-id: 7205780 Commit-by: wuyulin;张昊宇;wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205550 Commit-by: 罗梦;luomeng Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!92, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, merge feature-wyb into develop merge "feature-wyb" into "develop" 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205559 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录 See merge request: openGaussythcs00001/openGauss-workbench!93, 数据更新，表字段更新, 冲突, 多数据库环境安装, 冲突修复, merge feature-wyl into develop merge "feature-wyl" into "develop" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, 数据更新，表字段更新, 冲突, 冲突修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7205661 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, 数据更新，表字段更新, 冲突, 冲突修复 See merge request: openGaussythcs00001/openGauss-workbench!96 See merge request: openGaussythcs00001/openGauss-workbench!98 commit 171bbdcbcc065b4f0d28c60db108ed3d90535886 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Sun Apr 23 10:42:18 2023 +0800 冲突 commit a5b2466bac134a5d58dec9d180796d0c85860c35 Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Sun Apr 23 09:45:21 2023 +0800 Revert "merge develop into master" This reverts merge request !97 commit c677aed30dfca459f7e21e0258cbfa556408492d Merge: fd1bb144 5cd156a9 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Sun Apr 23 09:41:47 2023 +0800 merge develop into master merge "develop" into "master" 多数据库环境安装, 冲突修复, merge feature-wyl into develop merge "feature-wyl" into "develop" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, 数据更新，表字段更新, 冲突, 冲突修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7205661 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, 数据更新，表字段更新, 冲突, 冲突修复 See merge request: openGaussythcs00001/openGauss-workbench!96 Created-by: wuyulin Author-id: 7119753 MR-id: 7205663 Commit-by: wuyulin;张昊宇 Merged-by: wuyulin Description: merge "develop" into "master" 多数据库环境安装, 冲突修复, merge feature-wyl into develop merge "feature-wyl" into "develop" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, 数据更新，表字段更新, 冲突, 冲突修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7205661 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, 数据更新，表字段更新, 冲突, 冲突修复 See merge request: openGaussythcs00001/openGauss-workbench!96 See merge request: openGaussythcs00001/openGauss-workbench!97 commit 5cd156a9ad52486f91cc51a5b7a65f4dd58e4cda Merge: 8ff3ba8e a921b437 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Sun Apr 23 09:40:28 2023 +0800 merge feature-wyl into develop merge "feature-wyl" into "develop" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, 数据更新，表字段更新, 冲突, 冲突修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7205661 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, 数据更新，表字段更新, 冲突, 冲突修复 See merge request: openGaussythcs00001/openGauss-workbench!96 commit a921b437add53eb8042b1e38e45728f958cd71b1 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Sun Apr 23 09:39:29 2023 +0800 冲突修复 commit 8ff3ba8e957bb7df2591b670c2e5a476b09436f4 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Sun Apr 23 09:36:56 2023 +0800 多数据库环境安装 commit fd1bb14426a9b6d0b172a022ccf541ffcb23079d Merge: 562cbc9f 994abf6a Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Sun Apr 23 09:34:25 2023 +0800 merge feature-wyl into master merge "feature-wyl" into "master" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, 修改约束框架设计, 索引接口开发, 索引接口开发, merge feature-wuguobiao-index-20230417 into develop merge "feature-wuguobiao-index-20230417" into "develop" 修改约束框架设计, 索引接口开发, 索引接口开发 Created-by: wuguobiao Author-id: 7157987 MR-id: 7204799 Commit-by: user Merged-by: wuguobiao Description: merge "feature-wuguobiao-index-20230417" into "develop" 修改约束框架设计, 索引接口开发, 索引接口开发 See merge request: openGaussythcs00001/openGauss-workbench!87, 索引,约束接口开发, merge feature-wuguobiao-index-20230417 into develop merge "feature-wuguobiao-index-20230417" into "develop" 索引,约束接口开发 Created-by: wuguobiao Author-id: 7157987 MR-id: 7205042 Commit-by: user Merged-by: wuguobiao Description: merge "feature-wuguobiao-index-20230417" into "develop" 索引,约束接口开发 See merge request: openGaussythcs00001/openGauss-workbench!88, SQL诊断任务选择数据库执行报错,更改sql调用库, 索引,约束接口开发, Merge remote-tracking branch 'origin/develop' into develop, 增加断点续传功能, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90, merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205550 Commit-by: 罗梦;luomeng Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" merge develo Created-by: wuyulin Author-id: 7119753 MR-id: 7205657 Commit-by: wuyulin;wuyuebin;luomeng;罗梦;user;张昊宇;wuguobiao Merged-by: wuyulin Description: merge "feature-wyl" into "master" WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java, 字段增删改查, 数据类型问题修改, 修改约束框架设计, 索引接口开发, 索引接口开发, merge feature-wuguobiao-index-20230417 into develop merge "feature-wuguobiao-index-20230417" into "develop" 修改约束框架设计, 索引接口开发, 索引接口开发 Created-by: wuguobiao Author-id: 7157987 MR-id: 7204799 Commit-by: user Merged-by: wuguobiao Description: merge "feature-wuguobiao-index-20230417" into "develop" 修改约束框架设计, 索引接口开发, 索引接口开发 See merge request: openGaussythcs00001/openGauss-workbench!87, 索引,约束接口开发, merge feature-wuguobiao-index-20230417 into develop merge "feature-wuguobiao-index-20230417" into "develop" 索引,约束接口开发 Created-by: wuguobiao Author-id: 7157987 MR-id: 7205042 Commit-by: user Merged-by: wuguobiao Description: merge "feature-wuguobiao-index-20230417" into "develop" 索引,约束接口开发 See merge request: openGaussythcs00001/openGauss-workbench!88, SQL诊断任务选择数据库执行报错,更改sql调用库, 索引,约束接口开发, Merge remote-tracking branch 'origin/develop' into develop, 增加断点续传功能, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90, merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能, merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205550 Commit-by: 罗梦;luomeng Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" merge develo See merge request: openGaussythcs00001/openGauss-workbench!95 commit 994abf6a0b1ae3e5eaa29dcde1c8fa4ab02bbf29 Merge: f2fcefd3 bd472eb7 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Sun Apr 23 09:33:05 2023 +0800 冲突 commit f2fcefd3868b0c29cb9be497c69f58b5c3fa79ec Author: wuyulin <wuyulin@ncti-gba.cn> Date: Sun Apr 23 08:53:52 2023 +0800 数据更新，表字段更新 commit bd472eb784f35b5188d133dfcfc08e2111af058c Merge: fb3ab56f c5067eef Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Fri Apr 21 19:53:46 2023 +0800 merge feature-wyb into develop merge "feature-wyb" into "develop" 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205559 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录, 文件分片上传和断点续传，以及添加安装用户和安装目录 See merge request: openGaussythcs00001/openGauss-workbench!93 commit c5067eef4d2d60da595bbdcdb205b20bb1160b04 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Fri Apr 21 19:51:23 2023 +0800 文件分片上传和断点续传，以及添加安装用户和安装目录 commit 22580a30027d1e3ae811a833785b60b05debc7b9 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Fri Apr 21 19:49:51 2023 +0800 文件分片上传和断点续传，以及添加安装用户和安装目录 commit 17f74e6f3f01523a69c59f883e73d09e4c19a273 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Fri Apr 21 19:46:54 2023 +0800 文件分片上传和断点续传，以及添加安装用户和安装目录 commit fb3ab56f5359dae94d1340ad5c25574984f1649b Merge: c47c35e5 33278756 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Fri Apr 21 18:45:32 2023 +0800 merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205550 Commit-by: 罗梦;luomeng Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91, 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!92 commit 3327875609791e3f614345910af2c7308205fb24 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Fri Apr 21 18:44:14 2023 +0800 增加断点续传功能 commit d3b016e74f1b41a257f663675c1d09156a03f991 Merge: 45b55256 c47c35e5 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Fri Apr 21 17:36:36 2023 +0800 merge develop into bugfix_lm_20230421 merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 Created-by: luomeng Author-id: 7119743 MR-id: 7205522 Commit-by: wuyuebin;luomeng Merged-by: luomeng Description: merge "develop" into "bugfix_lm_20230421" merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89, 日志组件分片上传, merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 See merge request: openGaussythcs00001/openGauss-workbench!91 commit c47c35e5e890ed6888cc7144a2ad0b77dfc3479e Merge: 2bf60755 f4418d14 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Fri Apr 21 17:23:29 2023 +0800 merge feature-wyb into develop merge "feature-wyb" into "develop" 日志组件分片上传 Created-by: wuyuebin Author-id: 7158405 MR-id: 7205515 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "develop" 日志组件分片上传 See merge request: openGaussythcs00001/openGauss-workbench!90 commit f4418d14b39c754fae84056d5957555489f59ffc Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Fri Apr 21 17:13:22 2023 +0800 日志组件分片上传 commit 2bf607554ff5a57cd647cc81aed5454b4185689a Merge: 72df31f1 45b55256 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Fri Apr 21 15:28:18 2023 +0800 merge bugfix_lm_20230421 into develop merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 Created-by: luomeng Author-id: 7119743 MR-id: 7205461 Commit-by: 罗梦 Merged-by: luomeng Description: merge "bugfix_lm_20230421" into "develop" 增加断点续传功能 See merge request: openGaussythcs00001/openGauss-workbench!89 commit 45b55256e1994afbcf050665cf8743384fa3485a Author: 罗梦 <luomeng@ncti-gba.cn> Date: Fri Apr 21 15:26:49 2023 +0800 增加断点续传功能 commit 72df31f1e2caa6457bcb65ff7ec9a072d7e2bcc9 Merge: b86cf87f 950e3952 Author: user <wuguobiao@ncti-gba.cn> Date: Thu Apr 20 17:48:09 2023 +0800 Merge remote-tracking branch 'origin/develop' into develop commit b86cf87fff4377cee809fb51d295289391c2aad6 Author: user <wuguobiao@ncti-gba.cn> Date: Thu Apr 20 17:47:23 2023 +0800 索引,约束接口开发 commit 950e39522200249f8e093ae567d9a8ea20713424 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Thu Apr 20 15:47:57 2023 +0800 SQL诊断任务选择数据库执行报错,更改sql调用库 commit 7c444e75d11ab91c5b09fa80f0bd55526b6a70b9 Merge: 5dc18931 5c759a1a Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Thu Apr 20 10:04:44 2023 +0800 merge feature-wuguobiao-index-20230417 into develop merge "feature-wuguobiao-index-20230417" into "develop" 索引,约束接口开发 Created-by: wuguobiao Author-id: 7157987 MR-id: 7205042 Commit-by: user Merged-by: wuguobiao Description: merge "feature-wuguobiao-index-20230417" into "develop" 索引,约束接口开发 See merge request: openGaussythcs00001/openGauss-workbench!88 commit 5c759a1a5ee8bdee2fe7cc89dfbe24d396a390b6 Author: user <wuguobiao@ncti-gba.cn> Date: Thu Apr 20 10:03:29 2023 +0800 索引,约束接口开发 commit 5dc18931f4732724b89b1e5f81d8fe976ec65e7f Merge: 54fa3137 c8a4735b Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Wed Apr 19 15:51:51 2023 +0800 merge feature-wuguobiao-index-20230417 into develop merge "feature-wuguobiao-index-20230417" into "develop" 修改约束框架设计, 索引接口开发, 索引接口开发 Created-by: wuguobiao Author-id: 7157987 MR-id: 7204799 Commit-by: user Merged-by: wuguobiao Description: merge "feature-wuguobiao-index-20230417" into "develop" 修改约束框架设计, 索引接口开发, 索引接口开发 See merge request: openGaussythcs00001/openGauss-workbench!87 commit c8a4735b7ee6f902874dc242ddfa60a20a3fc4ea Author: user <wuguobiao@ncti-gba.cn> Date: Tue Apr 18 18:21:46 2023 +0800 索引接口开发 commit 1b12087d838c6e1cf3ffa04f68e113a23402b39d Author: user <wuguobiao@ncti-gba.cn> Date: Mon Apr 17 14:47:49 2023 +0800 索引接口开发 commit 6dd155bc20be0e0100f7074d0a8dc6dd2b02be66 Author: user <wuguobiao@ncti-gba.cn> Date: Mon Apr 17 10:37:56 2023 +0800 修改约束框架设计 commit 562cbc9f4f0153d2ff1ea7e10e7163f905c6fff2 Author: zengseliang <zengseliang@ncti-gba.cn> Date: Fri Apr 14 16:38:10 2023 +0800 删除嵌入式数据库demo commit 7a619768245e9bbd20d735a6d201ebe09eee04f6 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri Apr 14 15:46:04 2023 +0800 数据类型问题修改 commit 414ff9cfd69d46417c0df61a5e3d09c3cbb23c34 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri Apr 14 11:36:41 2023 +0800 字段增删改查 commit ff5333a4e312cb1f7800037e52b43d038572e868 Author: zengseliang <zengseliang@ncti-gba.cn> Date: Fri Apr 14 11:30:18 2023 +0800 新增嵌入式数据库插件 commit 8d9c30eaa78db5a2e3d0cfa3fccd6a285bb4c52e Merge: 5fd18a13 54fa3137 Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Thu Apr 13 12:41:47 2023 +0800 merge develop into master merge "develop" into "master" 修复代码扫描问题 See merge request: openGaussythcs00001/openGauss-workbench!79, Created-by: wuguobiao Author-id: 7157987 MR-id: 7203344 Commit-by: wuguobiao;user Merged-by: wuguobiao Description: merge "develop" into "master" 修复代码扫描问题 See merge request: openGaussythcs00001/openGauss-workbench!79, See merge request: openGaussythcs00001/openGauss-workbench!85 commit 54fa31377be199889f59aca38a900c4d0735e19b Merge: 357eee4b 809a34b2 Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Thu Apr 13 12:41:03 2023 +0800 merge feature-wgb-20230411 into develop merge "feature-wgb-20230411" into "develop" 修复代码扫描问题 Created-by: wuguobiao Author-id: 7157987 MR-id: 7203343 Commit-by: user Merged-by: wuguobiao Description: merge "feature-wgb-20230411" into "develop" 修复代码扫描问题 See merge request: openGaussythcs00001/openGauss-workbench!84 commit 809a34b29c65d2ccc7667359d95dd380c7a9824e Author: user <wuguobiao@ncti-gba.cn> Date: Thu Apr 13 12:40:55 2023 +0800 修复代码扫描问题 commit fc2d0882ce2a7cf9e80337f46f0a2ac34762bac6 Author: user <wuguobiao@ncti-gba.cn> Date: Thu Apr 13 11:36:51 2023 +0800 修复代码扫描问题 commit 357eee4bb9eaadc8c171303d1fb1ada14d782ec2 Merge: 3ce60015 fc2d0882 Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Thu Apr 13 11:36:47 2023 +0800 merge feature-wgb-20230411 into develop merge "feature-wgb-20230411" into "develop" 修复代码扫描问题, 修复代码扫描问题 Created-by: wuguobiao Author-id: 7157987 MR-id: 7203322 Commit-by: user Merged-by: wuguobiao Description: merge "feature-wgb-20230411" into "develop" 修复代码扫描问题, 修复代码扫描问题 See merge request: openGaussythcs00001/openGauss-workbench!83 commit 15cced8dd2786120b9999d1e123c59d5bc9ca2a8 Author: user <wuguobiao@ncti-gba.cn> Date: Thu Apr 13 11:10:05 2023 +0800 修复代码扫描问题 commit ab5773f3e61900ad7fbd990b02bbfc1c60f7919b Author: user <wuguobiao@ncti-gba.cn> Date: Thu Apr 13 10:54:45 2023 +0800 修复代码扫描问题 commit 3ce600157da4b2ea612a2d1bfc7f62661fb6d2cf Merge: ac78bbca ab5773f3 Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Thu Apr 13 10:54:31 2023 +0800 merge feature-wgb-20230411 into develop merge "feature-wgb-20230411" into "develop" 修复代码扫描问题, 修复代码扫描问题 Created-by: wuguobiao Author-id: 7157987 MR-id: 7203305 Commit-by: user Merged-by: wuguobiao Description: merge "feature-wgb-20230411" into "develop" 修复代码扫描问题, 修复代码扫描问题 See merge request: openGaussythcs00001/openGauss-workbench!82 commit ec1763a490033f41f5e97551c4b326e09d08e3b5 Author: user <wuguobiao@ncti-gba.cn> Date: Thu Apr 13 10:54:11 2023 +0800 修复代码扫描问题 commit 55ac528cb9621a371332d92e42601eede6d42428 Author: user <wuguobiao@ncti-gba.cn> Date: Thu Apr 13 10:46:37 2023 +0800 修复代码扫描问题 commit ac78bbcadabe5fec24e912000e3c1ca4226ea432 Merge: dc75cc2d 55ac528c Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Thu Apr 13 10:46:22 2023 +0800 merge feature-wgb-20230411 into develop merge "feature-wgb-20230411" into "develop" 修复代码扫描问题 Created-by: wuguobiao Author-id: 7157987 MR-id: 7203302 Commit-by: user Merged-by: wuguobiao Description: merge "feature-wgb-20230411" into "develop" 修复代码扫描问题 See merge request: openGaussythcs00001/openGauss-workbench!81 commit 95ccf33306f51f3713cde7e03edc2f9a2389a2c7 Author: user <wuguobiao@ncti-gba.cn> Date: Thu Apr 13 09:25:16 2023 +0800 修复代码扫描问题 commit dc75cc2da5d2e817dc5009492c93a3d0e57a13de Merge: 4a3df538 95ccf333 Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Thu Apr 13 09:25:04 2023 +0800 merge feature-wgb-20230411 into develop merge "feature-wgb-20230411" into "develop" 修复代码扫描问题 Created-by: wuguobiao Author-id: 7157987 MR-id: 7203251 Commit-by: user Merged-by: wuguobiao Description: merge "feature-wgb-20230411" into "develop" 修复代码扫描问题 See merge request: openGaussythcs00001/openGauss-workbench!80 commit 80d1a01dd6ce99a3578fc857fb67a3dc90ba50f9 Author: user <wuguobiao@ncti-gba.cn> Date: Thu Apr 13 09:06:32 2023 +0800 修复代码扫描问题 commit 4a3df538fa8d42b36739d95aed88cdbc43be84cf Merge: bf02bc3a 80d1a01d Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Thu Apr 13 09:06:30 2023 +0800 merge feature-wgb-20230411 into develop merge "feature-wgb-20230411" into "develop" 修复代码扫描问题, 修复代码扫描问题 Created-by: wuguobiao Author-id: 7157987 MR-id: 7203246 Commit-by: user Merged-by: wuguobiao Description: merge "feature-wgb-20230411" into "develop" 修复代码扫描问题, 修复代码扫描问题 See merge request: openGaussythcs00001/openGauss-workbench!79 commit bd37e0715653ea7c0236c14ce47acd311d59f66b Author: user <wuguobiao@ncti-gba.cn> Date: Thu Apr 13 08:53:06 2023 +0800 修复代码扫描问题 commit bf02bc3aaec373f58565a0b0b8663422546b086f Merge: c9d42b8a ce14c989 Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Thu Apr 13 08:27:28 2023 +0800 merge feature-wgb-20230411 into develop merge "feature-wgb-20230411" into "develop" 修复代码扫描问题 Created-by: wuguobiao Author-id: 7157987 MR-id: 7203240 Commit-by: user Merged-by: wuguobiao Description: merge "feature-wgb-20230411" into "develop" 修复代码扫描问题 See merge request: openGaussythcs00001/openGauss-workbench!78 commit ce14c98984b68ffd4bd48dd3d6a4cb404a459202 Author: user <wuguobiao@ncti-gba.cn> Date: Thu Apr 13 08:25:06 2023 +0800 修复代码扫描问题 commit c9d42b8aad4ad75bab7c49d5ee9087595d20e571 Merge: e4f6431f 43c2021b Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Wed Apr 12 18:38:24 2023 +0800 merge feature-wgb-20230411 into develop merge "feature-wgb-20230411" into "develop" 修复代码扫描问题 Created-by: wuguobiao Author-id: 7157987 MR-id: 7203114 Commit-by: user Merged-by: wuguobiao Description: merge "feature-wgb-20230411" into "develop" 修复代码扫描问题 See merge request: openGaussythcs00001/openGauss-workbench!77 commit 43c2021bcd689da6b36b3df272bf2d8c5a842421 Author: user <wuguobiao@ncti-gba.cn> Date: Wed Apr 12 18:37:54 2023 +0800 修复代码扫描问题 commit e4f6431f2b0124b1d7579c45fd9f21e0b26be19b Merge: 447e7fce 814c3340 Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Wed Apr 12 17:53:02 2023 +0800 merge feature-wgb-20230411 into develop merge "feature-wgb-20230411" into "develop" 修复代码扫描问题 Created-by: wuguobiao Author-id: 7157987 MR-id: 7203085 Commit-by: user Merged-by: wuguobiao Description: merge "feature-wgb-20230411" into "develop" 修复代码扫描问题 See merge request: openGaussythcs00001/openGauss-workbench!76 commit 814c3340641533071b17b557f1f88061aacb9495 Author: user <wuguobiao@ncti-gba.cn> Date: Wed Apr 12 17:44:48 2023 +0800 修复代码扫描问题 commit 447e7fce86f9fb6fdf7e82a40e716a1d9adaf025 Merge: 90e5d091 14dd1bcd Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Wed Apr 12 17:38:41 2023 +0800 merge feature-wgb-20230411 into develop merge "feature-wgb-20230411" into "develop" 修复代码扫描问题 Created-by: wuguobiao Author-id: 7157987 MR-id: 7203079 Commit-by: user Merged-by: wuguobiao Description: merge "feature-wgb-20230411" into "develop" 修复代码扫描问题 See merge request: openGaussythcs00001/openGauss-workbench!75 commit 14dd1bcdbcba562a5113a993302a007f6361a47c Author: user <wuguobiao@ncti-gba.cn> Date: Wed Apr 12 17:37:25 2023 +0800 修复代码扫描问题 commit 90e5d091929feeb8b7b708961e297d1264dd83cf Merge: 0d6612e0 344955a9 Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Wed Apr 12 17:18:29 2023 +0800 merge feature-wgb-20230411 into develop merge "feature-wgb-20230411" into "develop" 修复代码扫描问题 Created-by: wuguobiao Author-id: 7157987 MR-id: 7203054 Commit-by: user Merged-by: wuguobiao Description: merge "feature-wgb-20230411" into "develop" 修复代码扫描问题 See merge request: openGaussythcs00001/openGauss-workbench!74 commit 344955a96ed42478d38b676e8ee31da8c88aa69d Author: user <wuguobiao@ncti-gba.cn> Date: Wed Apr 12 17:12:23 2023 +0800 修复代码扫描问题 commit 0d6612e0c8af97377f811ca67ed33067defb4dec Merge: 67dfc4d3 fd765451 Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Wed Apr 12 16:11:44 2023 +0800 merge feature-wgb-20230411 into develop merge "feature-wgb-20230411" into "develop" 修复代码扫描问题 Created-by: wuguobiao Author-id: 7157987 MR-id: 7203002 Commit-by: user Merged-by: wuguobiao Description: merge "feature-wgb-20230411" into "develop" 修复代码扫描问题 See merge request: openGaussythcs00001/openGauss-workbench!73 commit fd7654510d7433edfda7d1956a5d89b8fdbc5a15 Author: user <wuguobiao@ncti-gba.cn> Date: Wed Apr 12 16:11:27 2023 +0800 修复代码扫描问题 commit 67dfc4d39dd26a4e2c08e7f41f17de291a505ce4 Merge: 5e83ed29 73c73694 Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Wed Apr 12 15:48:27 2023 +0800 merge feature-wgb-20230411 into develop merge "feature-wgb-20230411" into "develop" 修复代码扫描问题 Created-by: wuguobiao Author-id: 7157987 MR-id: 7202983 Commit-by: user Merged-by: wuguobiao Description: merge "feature-wgb-20230411" into "develop" 修复代码扫描问题 See merge request: openGaussythcs00001/openGauss-workbench!72 commit 73c73694d9ac07eabc550e4a0b2df5d17593b812 Author: user <wuguobiao@ncti-gba.cn> Date: Wed Apr 12 15:47:25 2023 +0800 修复代码扫描问题 commit 5e83ed29abc5a06a485713f75a818ff2a8558cd3 Merge: cef09edd c19bbe26 Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Wed Apr 12 15:34:37 2023 +0800 merge feature-wgb-20230411 into develop merge "feature-wgb-20230411" into "develop" 修复代码扫描问题 Created-by: wuguobiao Author-id: 7157987 MR-id: 7202973 Commit-by: user Merged-by: wuguobiao Description: merge "feature-wgb-20230411" into "develop" 修复代码扫描问题 See merge request: openGaussythcs00001/openGauss-workbench!71 commit c19bbe261ea47c94e94cb448c0a87a061ba1db48 Author: user <wuguobiao@ncti-gba.cn> Date: Wed Apr 12 15:34:19 2023 +0800 修复代码扫描问题 commit cef09eddf6d8f98b901a0bf73accbcff875976a3 Merge: 56882b08 f8e5a550 Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Wed Apr 12 15:22:19 2023 +0800 merge feature-wgb-20230411 into develop merge "feature-wgb-20230411" into "develop" 修复代码扫描问题 Created-by: wuguobiao Author-id: 7157987 MR-id: 7202964 Commit-by: user Merged-by: wuguobiao Description: merge "feature-wgb-20230411" into "develop" 修复代码扫描问题 See merge request: openGaussythcs00001/openGauss-workbench!70 commit f8e5a5509653d9ad0e48559d147c5b76c1be9bd9 Author: user <wuguobiao@ncti-gba.cn> Date: Wed Apr 12 15:22:04 2023 +0800 修复代码扫描问题 commit 56882b08880d0b2388aeaea09e34a25b7a55b8e9 Merge: 47509728 8be8e6fd Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Wed Apr 12 15:09:36 2023 +0800 merge feature-wgb-20230411 into develop merge "feature-wgb-20230411" into "develop" 修复代码扫描问题 Created-by: wuguobiao Author-id: 7157987 MR-id: 7202957 Commit-by: user Merged-by: wuguobiao Description: merge "feature-wgb-20230411" into "develop" 修复代码扫描问题 See merge request: openGaussythcs00001/openGauss-workbench!69 commit 8be8e6fd156cc9838c2f862577bb0a6f70e12413 Author: user <wuguobiao@ncti-gba.cn> Date: Wed Apr 12 15:05:56 2023 +0800 修复代码扫描问题 commit 47509728ecb1ea423a21057c05c8c84f9935ed48 Merge: a62adcce 20cc4a4a Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Wed Apr 12 11:59:46 2023 +0800 merge feature-wgb-20230411 into develop merge "feature-wgb-20230411" into "develop" 修复代码扫描问题 Created-by: wuguobiao Author-id: 7157987 MR-id: 7202898 Commit-by: user Merged-by: wuguobiao Description: merge "feature-wgb-20230411" into "develop" 修复代码扫描问题 See merge request: openGaussythcs00001/openGauss-workbench!68 commit 20cc4a4a608878b1bc1330f4732d53e123b411aa Author: user <wuguobiao@ncti-gba.cn> Date: Wed Apr 12 11:59:43 2023 +0800 修复代码扫描问题 commit a62adccece6e9180ebfb562e05284fde9ec33151 Merge: 72f1a660 1002a88d Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Wed Apr 12 11:53:57 2023 +0800 merge feature-wgb-20230411 into develop merge "feature-wgb-20230411" into "develop" 修复代码扫描问题 Created-by: wuguobiao Author-id: 7157987 MR-id: 7202892 Commit-by: user Merged-by: wuguobiao Description: merge "feature-wgb-20230411" into "develop" 修复代码扫描问题 See merge request: openGaussythcs00001/openGauss-workbench!67 commit 1002a88d8d08f6136f6bd155b1626d2dd1dc63fb Author: user <wuguobiao@ncti-gba.cn> Date: Wed Apr 12 11:52:57 2023 +0800 修复代码扫描问题 commit 72f1a6609ce9bb6c8edd261443cdfa9d22f545fd Merge: d37ad2cd 238e2c93 Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Wed Apr 12 11:46:02 2023 +0800 merge feature-wgb-20230411 into develop merge "feature-wgb-20230411" into "develop" 修复代码扫描问题 Created-by: wuguobiao Author-id: 7157987 MR-id: 7202889 Commit-by: user Merged-by: wuguobiao Description: merge "feature-wgb-20230411" into "develop" 修复代码扫描问题 See merge request: openGaussythcs00001/openGauss-workbench!66 commit 238e2c93cabeec929b430c2f362876d1876543d1 Author: user <wuguobiao@ncti-gba.cn> Date: Wed Apr 12 11:45:04 2023 +0800 修复代码扫描问题 commit d37ad2cdf43dbea99c0f587dd0a9ed09ae166828 Merge: df823a8f f4923e3a Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Wed Apr 12 11:36:30 2023 +0800 merge feature-wgb-20230411 into develop merge "feature-wgb-20230411" into "develop" 修复代码扫描问题, 修复代码扫描问题 Created-by: wuguobiao Author-id: 7157987 MR-id: 7202884 Commit-by: user Merged-by: wuguobiao Description: merge "feature-wgb-20230411" into "develop" 修复代码扫描问题, 修复代码扫描问题 See merge request: openGaussythcs00001/openGauss-workbench!65 commit f4923e3a7522da422c67af7b907d406f940521b8 Author: user <wuguobiao@ncti-gba.cn> Date: Wed Apr 12 11:36:11 2023 +0800 修复代码扫描问题 commit 681dcb4da6f8da019390c7895471658c5eeec6d6 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Wed Apr 12 10:46:14 2023 +0800 WIP on feature-zwr-wyl: db52e5d 常量修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java commit 025a536ecfabaee781c99868f7539d8f5d4994f3 Author: user <wuguobiao@ncti-gba.cn> Date: Wed Apr 12 09:28:49 2023 +0800 修复代码扫描问题 commit 5fd18a133a8afe81ea926be1c8433ecdf33a4c4f Merge: 91bf11df df823a8f Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Wed Apr 12 09:23:51 2023 +0800 merge develop into master merge "develop" into "master" 调整多层子函数功能, 迁代码：修复父子窗口关闭时联动的问题 (cherry picked from commit 065ad437e04fb3b309ffa2d18fdd747523cf973a), 创建编辑模式功能ui, 函数/过程功能重构, 调整无用代码, terminal：主窗口调试oldWindowName应该为空，父子函数按钮控制由后端控制, Merge branch 'feature-zhangcheng-模式' into feature-zhangcheng, 添加FAQ, 添加FAQ # Conflicts: # plugins/observability-sql-diagnosis/README.md # Conflicts: # plugins/observability-sql-diagnosis/README.md, FAQ修改, FAQ修改, 调整函数/过程参数处理, 新增模式管理功能模块, 模式接口联调, 恢复pom文件, 函数/过程调整, 修复sonar，华为云上报的致命和严重问题, 修复sonar，华为云上报的致命和严重问题, merge "develop-wuguobiao-fix-sonar-20230406" into "develop" 修复sonar，华为云上报的致命和严重问题,, 兼容修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/DatabaseFunctionSPServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/DbConnectionServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/SqlWindowByJdbcServiceImpl.java, 兼容修改, 冲突, 冲突, 1, 更新, Merge branch 'feature-zwr-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-zwr-wyl, merge "feature-zwr-wyl" into "feature-zwr" 兼容修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/DatabaseFunctionSPServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/DbConnectionServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/SqlWindowByJdbcServiceImpl.java, 兼容修改, 冲突, 冲突, 修复sonar，华为云上报的致命和严重问题, 函数/过程调整解析行号和页面行号对比, 修改社区包版本号, merge "feature-zwr" into "develop" 函数/过程功能重构, 调整无用代码, 调整函数/过程参数处理, 新增模式管理功能模块, 恢复pom文件, 函数/过程调整, 兼容修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/DatabaseFunctionSPServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/DbConnectionServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/SqlWindowByJdbcServiceImpl.java, 兼容修改, 冲突, 冲突, 1, 更新, Merge branch 'feature-zwr-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-zwr-wyl, merge "feature-zwr-wyl" into "feature-zwr" 兼容修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/DatabaseFunctionSPServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/DbConnectionServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/SqlWindowByJdbcServiceImpl.java, 兼容修改, 冲突, 冲突, 函数/过程调整解析行号和页面行号对比, 修改社区包版本号, merge "develop-wuguobiao-fixsonar-202030407" into "develop" 修复sonar，华为云上报的致命和严重问题, 修复sonar，华为云上报的致命和严重问题, merge "develop-wuguobiao-fixsonar-202030407" into "develop" 修复sonar，华为云上报的致命和严重问题, Merge remote-tracking branch 'origin/develop' into feature-zhangcheng, 关闭标签保存功能；调整连接刷新/跳转首页逻辑, 修复sonar，华为云上报的致命和严重问题, merge "develop-wuguobiao-fixsonar-202030407" into "develop" 修复sonar，华为云上报的致命和严重问题, 修复sonar，华为云上报的致命和严重问题, merge "develop-wuguobiao-fixsonar-202030407" into "develop" 修复sonar，华为云上报的致命和严重问题, 修复sonar，华为云上报的致命和严重问题, merge "develop-wuguobiao-fixsonar-202030407" into "develop" 修复sonar，华为云上报的致命和严重问题, 修复sonar，华为云上报的致命和严重问题, merge develop-wuguobiao-fixsonar-202030407 into develop merge "develop-wuguobiao-fixsonar-202030407" into "develop" 修复sonar，华为云上报的致命和严重问题 Created-by: wuguobiao Author-id: 7157987 MR-id: 7202040 Commit-by: user Merged-by: wuguobiao Description: merge "develop-wuguobiao-fixsonar-202030407" into "develop" 修复sonar，华为云上报的致命和严重问题 See merge request: openGaussythcs00001/openGauss-workbench!54, 修复sonar，华为云上报的致命和严重问题, merge develop-wuguobiao-fixsonar-202030407 into develop merge "develop-wuguobiao-fixsonar-202030407" into "develop" 修复sonar，华为云上报的致命和严重问题 Created-by: wuguobiao Author-id: 7157987 MR-id: 7202041 Commit-by: user Merged-by: wuguobiao Description: merge "develop-wuguobiao-fixsonar-202030407" into "develop" 修复sonar，华为云上报的致命和严重问题 See merge request: openGaussythcs00001/openGauss-workbench!55, 修复sonar，华为云上报的致命和严重问题, merge develop-wuguobiao-fixsonar-202030407 into develop merge "develop-wuguobiao-fixsonar-202030407" into "develop" 修复sonar，华为云上报的致命和严重问题 Created-by: wuguobiao Author-id: 7157987 MR-id: 7202042 Commit-by: user Merged-by: wuguobiao Description: merge "develop-wuguobiao-fixsonar-202030407" into "develop" 修复sonar，华为云上报的致命和严重问题 See merge request: openGaussythcs00001/openGauss-workbench!56, 调整连接刷新/跳转首页逻辑2：删除连接后再新建连接的bug, 约束管理开发, 约束管理开发, 用最新的分支代码, merge develop-wuguobiao-fixsonar-202030407 into develop merge "develop-wuguobiao-fixsonar-202030407" into "develop" 约束管理开发, 约束管理开发, 用最新的分支代码 Created-by: wuguobiao Author-id: 7157987 MR-id: 7202142 Commit-by: wuguobiao;user Merged-by: wuguobiao Description: merge "develop-wuguobiao-fixsonar-202030407" into "develop" 约束管理开发, 约束管理开发, 用最新的分支代码 See merge request: openGaussythcs00001/openGauss-workbench!58, oid问题修改, merge feature-zwr-wyl into feature-zwr merge "feature-zwr-wyl" int Created-by: wuguobiao Author-id: 7157987 MR-id: 7202785 Commit-by: user;zhouwenruo;wuyulin;wuguobiao;zhangcheng;张昊宇 Merged-by: wuguobiao Description: merge "develop" into "master" 调整多层子函数功能, 迁代码：修复父子窗口关闭时联动的问题 (cherry picked from commit 065ad437e04fb3b309ffa2d18fdd747523cf973a), 创建编辑模式功能ui, 函数/过程功能重构, 调整无用代码, terminal：主窗口调试oldWindowName应该为空，父子函数按钮控制由后端控制, Merge branch 'feature-zhangcheng-模式' into feature-zhangcheng, 添加FAQ, 添加FAQ # Conflicts: # plugins/observability-sql-diagnosis/README.md # Conflicts: # plugins/observability-sql-diagnosis/README.md, FAQ修改, FAQ修改, 调整函数/过程参数处理, 新增模式管理功能模块, 模式接口联调, 恢复pom文件, 函数/过程调整, 修复sonar，华为云上报的致命和严重问题, 修复sonar，华为云上报的致命和严重问题, merge "develop-wuguobiao-fix-sonar-20230406" into "develop" 修复sonar，华为云上报的致命和严重问题,, 兼容修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/DatabaseFunctionSPServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/DbConnectionServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/SqlWindowByJdbcServiceImpl.java, 兼容修改, 冲突, 冲突, 1, 更新, Merge branch 'feature-zwr-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-zwr-wyl, merge "feature-zwr-wyl" into "feature-zwr" 兼容修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/DatabaseFunctionSPServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/DbConnectionServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/SqlWindowByJdbcServiceImpl.java, 兼容修改, 冲突, 冲突, 修复sonar，华为云上报的致命和严重问题, 函数/过程调整解析行号和页面行号对比, 修改社区包版本号, merge "feature-zwr" into "develop" 函数/过程功能重构, 调整无用代码, 调整函数/过程参数处理, 新增模式管理功能模块, 恢复pom文件, 函数/过程调整, 兼容修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/DatabaseFunctionSPServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/DbConnectionServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/SqlWindowByJdbcServiceImpl.java, 兼容修改, 冲突, 冲突, 1, 更新, Merge branch 'feature-zwr-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-zwr-wyl, merge "feature-zwr-wyl" into "feature-zwr" 兼容修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/DatabaseFunctionSPServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/DbConnectionServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/SqlWindowByJdbcServiceImpl.java, 兼容修改, 冲突, 冲突, 函数/过程调整解析行号和页面行号对比, 修改社区包版本号, merge "develop-wuguobiao-fixsonar-202030407" into "develop" 修复sonar，华为云上报的致命和严重问题, 修复sonar，华为云上报的致命和严重问题, merge "develop-wuguobiao-fixsonar-202030407" into "develop" 修复sonar，华为云上报的致命和严重问题, Merge remote-tracking branch 'origin/develop' into feature-zhangcheng, 关闭标签保存功能；调整连接刷新/跳转首页逻辑, 修复sonar，华为云上报的致命和严重问题, merge "develop-wuguobiao-fixsonar-202030407" into "develop" 修复sonar，华为云上报的致命和严重问题, 修复sonar，华为云上报的致命和严重问题, merge "develop-wuguobiao-fixsonar-202030407" into "develop" 修复sonar，华为云上报的致命和严重问题, 修复sonar，华为云上报的致命和严重问题, merge "develop-wuguobiao-fixsonar-202030407" into "develop" 修复sonar，华为云上报的致命和严重问题, 修复sonar，华为云上报的致命和严重问题, merge develop-wuguobiao-fixsonar-202030407 into develop merge "develop-wuguobiao-fixsonar-202030407" into "develop" 修复sonar，华为云上报的致命和严重问题 Created-by: wuguobiao Author-id: 7157987 MR-id: 7202040 Commit-by: user Merged-by: wuguobiao Description: merge "develop-wuguobiao-fixsonar-202030407" into "develop" 修复sonar，华为云上报的致命和严重问题 See merge request: openGaussythcs00001/openGauss-workbench!54, 修复sonar，华为云上报的致命和严重问题, merge develop-wuguobiao-fixsonar-202030407 into develop merge "develop-wuguobiao-fixsonar-202030407" into "develop" 修复sonar，华为云上报的致命和严重问题 Created-by: wuguobiao Author-id: 7157987 MR-id: 7202041 Commit-by: user Merged-by: wuguobiao Description: merge "develop-wuguobiao-fixsonar-202030407" into "develop" 修复sonar，华为云上报的致命和严重问题 See merge request: openGaussythcs00001/openGauss-workbench!55, 修复sonar，华为云上报的致命和严重问题, merge develop-wuguobiao-fixsonar-202030407 into develop merge "develop-wuguobiao-fixsonar-202030407" into "develop" 修复sonar，华为云上报的致命和严重问题 Created-by: wuguobiao Author-id: 7157987 MR-id: 7202042 Commit-by: user Merged-by: wuguobiao Description: merge "develop-wuguobiao-fixsonar-202030407" into "develop" 修复sonar，华为云上报的致命和严重问题 See merge request: openGaussythcs00001/openGauss-workbench!56, 调整连接刷新/跳转首页逻辑2：删除连接后再新建连接的bug, 约束管理开发, 约束管理开发, 用最新的分支代码, merge develop-wuguobiao-fixsonar-202030407 into develop merge "develop-wuguobiao-fixsonar-202030407" into "develop" 约束管理开发, 约束管理开发, 用最新的分支代码 Created-by: wuguobiao Author-id: 7157987 MR-id: 7202142 Commit-by: wuguobiao;user Merged-by: wuguobiao Description: merge "develop-wuguobiao-fixsonar-202030407" into "develop" 约束管理开发, 约束管理开发, 用最新的分支代码 See merge request: openGaussythcs00001/openGauss-workbench!58, oid问题修改, merge feature-zwr-wyl into feature-zwr merge "feature-zwr-wyl" int See merge request: openGaussythcs00001/openGauss-workbench!64 commit df823a8fe1ae0a6548bf920a508e39a54cb04d61 Author: user <wuguobiao@ncti-gba.cn> Date: Tue Apr 11 11:47:21 2023 +0800 约束管理开发 commit 1c59e6c89eb592b4bd3265b61c2fa0d454df5810 Merge: 147518e1 582bd50f Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Mon Apr 10 15:43:27 2023 +0800 merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整多层子函数功能, 迁代码：修复父子窗口关闭时联动的问题 (cherry picked from commit 065ad437e04fb3b309ffa2d18fdd747523cf973a), 创建编辑模式功能ui, terminal：主窗口调试oldWindowName应该为空，父子函数按钮控制由后端控制, Merge branch 'feature-zhangcheng-模式' into feature-zhangcheng, 模式接口联调, Merge remote-tracking branch 'origin/develop' into feature-zhangcheng, 关闭标签保存功能；调整连接刷新/跳转首页逻辑, 调整连接刷新/跳转首页逻辑2：删除连接后再新建连接的bug Created-by: zhouwenruo Author-id: 7119763 MR-id: 7202221 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "feature-zhangcheng" into "develop" 调整多层子函数功能, 迁代码：修复父子窗口关闭时联动的问题 (cherry picked from commit 065ad437e04fb3b309ffa2d18fdd747523cf973a), 创建编辑模式功能ui, terminal：主窗口调试oldWindowName应该为空，父子函数按钮控制由后端控制, Merge branch 'feature-zhangcheng-模式' into feature-zhangcheng, 模式接口联调, Merge remote-tracking branch 'origin/develop' into feature-zhangcheng, 关闭标签保存功能；调整连接刷新/跳转首页逻辑, 调整连接刷新/跳转首页逻辑2：删除连接后再新建连接的bug See merge request: openGaussythcs00001/openGauss-workbench!63 commit 147518e1845eb4e2002f6139d86a8ef4744b8ec8 Merge: bf7fdab6 388c7af6 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Mon Apr 10 15:12:49 2023 +0800 merge feature-zwr into develop merge "feature-zwr" into "develop" 常量修改, merge feature-zwr-wyl into feature-zwr merge "feature-zwr-wyl" into "feature-zwr" 常量修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7202194 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-zwr-wyl" into "feature-zwr" 常量修改 See merge request: openGaussythcs00001/openGauss-workbench!61 Created-by: wuyulin Author-id: 7119753 MR-id: 7202195 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-zwr" into "develop" 常量修改, merge feature-zwr-wyl into feature-zwr merge "feature-zwr-wyl" into "feature-zwr" 常量修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7202194 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-zwr-wyl" into "feature-zwr" 常量修改 See merge request: openGaussythcs00001/openGauss-workbench!61 See merge request: openGaussythcs00001/openGauss-workbench!62 commit 388c7af6596a4a789cffaa5f3ab0a06fd2088834 Merge: 35b13e58 db52e5d0 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Mon Apr 10 15:12:19 2023 +0800 merge feature-zwr-wyl into feature-zwr merge "feature-zwr-wyl" into "feature-zwr" 常量修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7202194 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-zwr-wyl" into "feature-zwr" 常量修改 See merge request: openGaussythcs00001/openGauss-workbench!61 commit db52e5d036007552cd3c998731437dfa4c0b3356 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Mon Apr 10 15:10:15 2023 +0800 常量修改 commit bf7fdab6d90bf5537cd42b4e6ee2b9476d412f6b Merge: dc37ce4d 35b13e58 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Mon Apr 10 14:32:52 2023 +0800 merge feature-zwr into develop merge "feature-zwr" into "develop" oid问题修改, merge feature-zwr-wyl into feature-zwr merge "feature-zwr-wyl" into "feature-zwr" oid问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7202171 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-zwr-wyl" into "feature-zwr" oid问题修改 See merge request: openGaussythcs00001/openGauss-workbench!59 Created-by: wuyulin Author-id: 7119753 MR-id: 7202174 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-zwr" into "develop" oid问题修改, merge feature-zwr-wyl into feature-zwr merge "feature-zwr-wyl" into "feature-zwr" oid问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7202171 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-zwr-wyl" into "feature-zwr" oid问题修改 See merge request: openGaussythcs00001/openGauss-workbench!59 See merge request: openGaussythcs00001/openGauss-workbench!60 commit 35b13e582c5a6c5133707a5f0b9b26f4e058f646 Merge: 4c81dc9e fa585549 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Mon Apr 10 14:31:56 2023 +0800 merge feature-zwr-wyl into feature-zwr merge "feature-zwr-wyl" into "feature-zwr" oid问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7202171 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-zwr-wyl" into "feature-zwr" oid问题修改 See merge request: openGaussythcs00001/openGauss-workbench!59 commit fa5855497c65d5ff01a3573d5099784782a4cb89 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Mon Apr 10 14:04:11 2023 +0800 oid问题修改 commit dc37ce4d523d0511e721233d3da4c82e95309c36 Merge: 9874eaad 0625a42d Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Mon Apr 10 11:48:39 2023 +0800 merge develop-wuguobiao-fixsonar-202030407 into develop merge "develop-wuguobiao-fixsonar-202030407" into "develop" 约束管理开发, 约束管理开发, 用最新的分支代码 Created-by: wuguobiao Author-id: 7157987 MR-id: 7202142 Commit-by: wuguobiao;user Merged-by: wuguobiao Description: merge "develop-wuguobiao-fixsonar-202030407" into "develop" 约束管理开发, 约束管理开发, 用最新的分支代码 See merge request: openGaussythcs00001/openGauss-workbench!58 commit 0625a42de03c8df0e3e4fcee47660e08951f80b2 Merge: 4561f5e8 9874eaad Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Mon Apr 10 11:47:24 2023 +0800 用最新的分支代码 commit 4561f5e80c29298be23f3bd1baa1cd6254834fe1 Author: user <wuguobiao@ncti-gba.cn> Date: Mon Apr 10 11:41:18 2023 +0800 约束管理开发 commit 565b305bb595ecc5bc01d71c94cb502ed792ff6c Author: user <wuguobiao@ncti-gba.cn> Date: Mon Apr 10 11:40:42 2023 +0800 约束管理开发 commit 582bd50f1fa0081521235f59dc33f6dca7893c86 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Mon Apr 10 10:19:55 2023 +0800 调整连接刷新/跳转首页逻辑2：删除连接后再新建连接的bug commit 9874eaad525cedfa598ada6919f9eaa0bb4f3332 Merge: 3b22385b a037642b Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Sun Apr 9 11:57:37 2023 +0800 merge develop-wuguobiao-fixsonar-202030407 into develop merge "develop-wuguobiao-fixsonar-202030407" into "develop" 修复sonar，华为云上报的致命和严重问题 Created-by: wuguobiao Author-id: 7157987 MR-id: 7202042 Commit-by: user Merged-by: wuguobiao Description: merge "develop-wuguobiao-fixsonar-202030407" into "develop" 修复sonar，华为云上报的致命和严重问题 See merge request: openGaussythcs00001/openGauss-workbench!56 commit a037642b4babfb0c2b5c90eae126793fe525fef9 Author: user <wuguobiao@ncti-gba.cn> Date: Sun Apr 9 11:55:25 2023 +0800 修复sonar，华为云上报的致命和严重问题 commit 3b22385b30ec7990687a5068c3e6aca485a269b0 Merge: 5842e33d f5c4e0fd Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Sun Apr 9 11:28:54 2023 +0800 merge develop-wuguobiao-fixsonar-202030407 into develop merge "develop-wuguobiao-fixsonar-202030407" into "develop" 修复sonar，华为云上报的致命和严重问题 Created-by: wuguobiao Author-id: 7157987 MR-id: 7202041 Commit-by: user Merged-by: wuguobiao Description: merge "develop-wuguobiao-fixsonar-202030407" into "develop" 修复sonar，华为云上报的致命和严重问题 See merge request: openGaussythcs00001/openGauss-workbench!55 commit f5c4e0fd24398350933d6cd252181093548d9d64 Author: user <wuguobiao@ncti-gba.cn> Date: Sun Apr 9 11:23:27 2023 +0800 修复sonar，华为云上报的致命和严重问题 commit 5842e33df48839ddcd346eca48d805e3df42943d Merge: e0bd0e66 d366ed17 Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Sun Apr 9 11:07:33 2023 +0800 merge develop-wuguobiao-fixsonar-202030407 into develop merge "develop-wuguobiao-fixsonar-202030407" into "develop" 修复sonar，华为云上报的致命和严重问题 Created-by: wuguobiao Author-id: 7157987 MR-id: 7202040 Commit-by: user Merged-by: wuguobiao Description: merge "develop-wuguobiao-fixsonar-202030407" into "develop" 修复sonar，华为云上报的致命和严重问题 See merge request: openGaussythcs00001/openGauss-workbench!54 commit d366ed176f2434c2cb0635856695d3fc02258246 Author: user <wuguobiao@ncti-gba.cn> Date: Sun Apr 9 11:03:51 2023 +0800 修复sonar，华为云上报的致命和严重问题 commit e0bd0e66c14da0a26e25f7db635e06b2dcd299b8 Merge: 52e67796 b4af9de4 Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Fri Apr 7 17:40:11 2023 +0800 merge "develop-wuguobiao-fixsonar-202030407" into "develop" 修复sonar，华为云上报的致命和严重问题 commit b4af9de4070a83334fa1c309c68eb8224855be67 Author: user <wuguobiao@ncti-gba.cn> Date: Fri Apr 7 17:38:39 2023 +0800 修复sonar，华为云上报的致命和严重问题 commit 52e6779621f56e9444e85cecbe71388be327cebc Merge: c7dbf4b7 b70e6036 Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Fri Apr 7 17:02:12 2023 +0800 merge "develop-wuguobiao-fixsonar-202030407" into "develop" 修复sonar，华为云上报的致命和严重问题 commit b70e603638a46c94db55f2ecb1db955dad094d1c Author: user <wuguobiao@ncti-gba.cn> Date: Fri Apr 7 17:01:42 2023 +0800 修复sonar，华为云上报的致命和严重问题 commit c7dbf4b7812f7a6efc0c21815ec9e7e80f0661d1 Merge: fa34bf72 59b0c30b Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Fri Apr 7 17:01:15 2023 +0800 merge "develop-wuguobiao-fixsonar-202030407" into "develop" 修复sonar，华为云上报的致命和严重问题 commit 59b0c30b183f86acbfd11802dc4798b035f1f29b Author: user <wuguobiao@ncti-gba.cn> Date: Fri Apr 7 16:56:36 2023 +0800 修复sonar，华为云上报的致命和严重问题 commit 7deac91fba93ae6d925b54de20364c1ebc87fd03 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Fri Apr 7 16:06:11 2023 +0800 关闭标签保存功能；调整连接刷新/跳转首页逻辑 commit d2bf85f46555cccd06aa43c547e742f5f5cd92a8 Merge: e5064df3 fa34bf72 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Fri Apr 7 15:15:43 2023 +0800 Merge remote-tracking branch 'origin/develop' into feature-zhangcheng commit fa34bf726e2126eac45af252c482d43302f98b85 Merge: e64dcd81 c6ba6098 Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Fri Apr 7 14:35:47 2023 +0800 merge "develop-wuguobiao-fixsonar-202030407" into "develop" 修复sonar，华为云上报的致命和严重问题 commit c6ba6098c4410c465f2b0d5d67856c008823b0e8 Author: user <wuguobiao@ncti-gba.cn> Date: Fri Apr 7 14:33:51 2023 +0800 修复sonar，华为云上报的致命和严重问题 commit e64dcd81777eab6712e3b906c9868c49bfd82d63 Merge: 50c17fa1 fb00aead Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Fri Apr 7 11:47:04 2023 +0800 merge "develop-wuguobiao-fixsonar-202030407" into "develop" 修复sonar，华为云上报的致命和严重问题 commit 50c17fa17cb8ad54b0164fb4140865e93fb2d3bd Merge: ea64a712 4c81dc9e Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Fri Apr 7 11:24:41 2023 +0800 merge "feature-zwr" into "develop" 函数/过程功能重构, 调整无用代码, 调整函数/过程参数处理, 新增模式管理功能模块, 恢复pom文件, 函数/过程调整, 兼容修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/DatabaseFunctionSPServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/DbConnectionServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/SqlWindowByJdbcServiceImpl.java, 兼容修改, 冲突, 冲突, 1, 更新, Merge branch 'feature-zwr-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-zwr-wyl, merge "feature-zwr-wyl" into "feature-zwr" 兼容修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/DatabaseFunctionSPServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/DbConnectionServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/SqlWindowByJdbcServiceImpl.java, 兼容修改, 冲突, 冲突, 函数/过程调整解析行号和页面行号对比, 修改社区包版本号 commit 4c81dc9e7d63b71db8f756071207503700c95514 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Fri Apr 7 11:21:38 2023 +0800 修改社区包版本号 commit 6632c978bff0864cd9af510cd0c8fe42b37d1c7a Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Fri Apr 7 11:13:31 2023 +0800 函数/过程调整解析行号和页面行号对比 commit fb00aeadd1c7c2957990726758624f15d1e3bf74 Author: user <wuguobiao@ncti-gba.cn> Date: Fri Apr 7 11:09:24 2023 +0800 修复sonar，华为云上报的致命和严重问题 commit e4ba9b6393b53886f88140a77c86ffeaaade5a2c Merge: c15a89f5 a5d52dfa Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Fri Apr 7 10:21:38 2023 +0800 merge "feature-zwr-wyl" into "feature-zwr" 兼容修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/DatabaseFunctionSPServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/DbConnectionServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/SqlWindowByJdbcServiceImpl.java, 兼容修改, 冲突, 冲突 commit a5d52dfa66d5d93f57496d28ddcbed9d1682c8cb Merge: 2d9234c2 122d89f3 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri Apr 7 10:20:06 2023 +0800 Merge branch 'feature-zwr-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-zwr-wyl commit 2d9234c2fe20f5b91d0def0a6f3f10124105954e Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri Apr 7 10:19:47 2023 +0800 更新 commit 122d89f3f0f893a04b5a794571106616b6abb8bf Merge: 9bd5aede c15a89f5 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Fri Apr 7 10:19:13 2023 +0800 1 commit 9bd5aede6065191dc2d2e7ea15e9157f5ffee0fe Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri Apr 7 10:11:43 2023 +0800 冲突 commit 00c7f180cee65eaabbec2b713e98b568333e4ee9 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri Apr 7 09:56:58 2023 +0800 冲突 commit c9e663b0fc283b4ade66e2753aab42499e71f5b8 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri Apr 7 09:54:59 2023 +0800 兼容修改 commit d0f52729cbe64a5d3679a7905b36e3704036bb0b Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri Apr 7 09:16:41 2023 +0800 兼容修改 # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/DatabaseFunctionSPServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/DbConnectionServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/SqlWindowByJdbcServiceImpl.java commit ea64a712ffbbdcf12998c5f12e6d6408fcfdbb1c Merge: a1eac350 b91d1b49 Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Thu Apr 6 19:46:57 2023 +0800 merge "develop-wuguobiao-fix-sonar-20230406" into "develop" 修复sonar，华为云上报的致命和严重问题, commit b91d1b496adf66340c445d9ee3d00fa9a02f6d93 Author: user <wuguobiao@ncti-gba.cn> Date: Thu Apr 6 19:34:00 2023 +0800 修复sonar，华为云上报的致命和严重问题 commit 926b2c0e5c4fd0a88e00fc404aeb1438f2040851 Author: user <wuguobiao@ncti-gba.cn> Date: Thu Apr 6 19:12:56 2023 +0800 修复sonar，华为云上报的致命和严重问题 commit c15a89f5675e10fe41a00b1bd54f628eebb56bf3 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Tue Apr 4 16:41:42 2023 +0800 函数/过程调整 commit f0b60eb11bdcac33cd57425ae1f487a4a55d8506 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Tue Apr 4 11:39:46 2023 +0800 恢复pom文件 commit e5064df34465de15263bf18350e79cbe76983307 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Mon Apr 3 14:33:16 2023 +0800 模式接口联调 commit c2fe6638e62c493182aece1d5e1e3ba9af13287e Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Mon Apr 3 14:24:19 2023 +0800 新增模式管理功能模块 commit f33c7d0a56fee45d32231a4b6de9c2b4666c2d7e Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Mon Apr 3 14:22:45 2023 +0800 调整函数/过程参数处理 commit a1eac3508197936fcd330e68132d575383fb9a1f Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Mar 31 16:49:12 2023 +0800 FAQ修改 commit 3da78f071cdf9ede14bbca440d243120e1359a94 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Mar 31 16:49:12 2023 +0800 FAQ修改 commit 91bf11df8b22c63b56a1b030de6a9bfbb1059db3 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Mar 31 16:49:12 2023 +0800 FAQ修改 commit ef2fd4c4b560c1e8191363cfa4c12521022bbee6 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Mar 31 16:49:12 2023 +0800 FAQ修改 commit 24d0e22e14e175682b42c3dc8a54259d6463242e Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Mar 31 16:39:26 2023 +0800 添加FAQ # Conflicts: # plugins/observability-sql-diagnosis/README.md # Conflicts: # plugins/observability-sql-diagnosis/README.md commit 824a3777a776affbcbba5afbca1e8c520c4927b8 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Mar 31 16:39:26 2023 +0800 添加FAQ # Conflicts: # plugins/observability-sql-diagnosis/README.md commit 82398699813f70406766e5683d19142e151df5a8 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Mar 31 16:39:26 2023 +0800 添加FAQ commit 96f53259f196cd41763262559c58eee4154ad9cf Merge: bda196c2 21b0ead4 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Fri Mar 31 15:29:23 2023 +0800 commit 21b0ead4e103097eea11bfc7ff78172cff8bfd0d Merge: faf9735f 1069f5d9 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Fri Mar 31 15:26:51 2023 +0800 commit 3bd48bda41a54832a1f965aacaeffd71dfad2896 Merge: ecd74467 58f393a2 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Fri Mar 31 09:59:02 2023 +0800 Merge branch 'feature-zhangcheng-模式' into feature-zhangcheng commit ecd74467fa500420b5ec7c78bf1064092d7bd03d Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Fri Mar 31 09:55:22 2023 +0800 terminal：主窗口调试oldWindowName应该为空，父子函数按钮控制由后端控制 commit 060a80516f0f358481d3aee89c9c204cebd85824 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu Mar 30 11:28:45 2023 +0800 调整无用代码 commit 1069f5d98b946e22b8f6ee78d33aa96075d34098 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Thu Mar 30 10:00:14 2023 +0800 pom文件中visualtool-framework依赖包版本号更改 commit b9dd071f471b444eb799f57c67c45ae595cf326c Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Wed Mar 29 11:06:26 2023 +0800 函数/过程功能重构 commit bda196c21c6f571e2f78a4baa280a6c885d5da20 Merge: 2d019a2d faf9735f Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Tue Mar 28 18:07:28 2023 +0800 merge "develop" into "master" agent-修复onCpu和offCpu原始文件为空的判断逻辑, merge "bugfix_lm_20230328" into "develop" agent-修复onCpu和offCpu原始文件为空的判断逻辑 commit faf9735f3051daea380c6380fc508d398a1cf8c3 Merge: 850f8715 76c86e50 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Tue Mar 28 18:06:41 2023 +0800 merge "bugfix_lm_20230328" into "develop" agent-修复onCpu和offCpu原始文件为空的判断逻辑 commit 76c86e506a86743b76aa1f790bc92c3fd6987843 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Tue Mar 28 18:05:23 2023 +0800 agent-修复onCpu和offCpu原始文件为空的判断逻辑 commit 2d019a2d431742c78bc33b01debc4568ead283e3 Merge: 874a69be 850f8715 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Tue Mar 28 17:24:12 2023 +0800 commit 850f8715a23cd28051f42a33e33e994865cb8dd9 Merge: cdd1e960 051f3605 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Tue Mar 28 17:23:26 2023 +0800 commit 051f3605f1ade1645062e3964f1aadedac267e8e Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Mar 28 17:22:12 2023 +0800 上传失败提示 commit 874a69be6c60cb57d41398876ded26d58ed3ec05 Merge: b1a09b6d cdd1e960 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Tue Mar 28 17:03:32 2023 +0800 commit cdd1e960251fc246b59bcad2ad1b2f93bf7e894e Merge: 2a34ca02 35dea644 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Tue Mar 28 17:02:38 2023 +0800 commit 35dea6440127465f058d5b844e90b3a1dbcd1919 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Mar 28 17:00:45 2023 +0800 上传失败提示 commit b1a09b6d6e0ec521bb309a38e45ce6223442b394 Merge: 470a704d 2a34ca02 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Tue Mar 28 14:26:37 2023 +0800 实例监控_离线安装_上传包界面显示上传的包名不正确 commit 2a34ca02032b81621c1264da1e521cf042f88a73 Merge: 2d12c179 e016c845 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Tue Mar 28 14:25:01 2023 +0800 实例监控_离线安装_上传包界面显示上传的包名不正确 commit e016c845191b32ef3759952a1e97822de187b48c Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Mar 28 14:21:03 2023 +0800 实例监控_离线安装_上传包界面显示上传的包名不正确 commit 470a704d39f6a52fe544b1523c73b698d193f9dc Merge: 59f7f1b8 2d12c179 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Mon Mar 27 17:32:03 2023 +0800 诊断_执行计划图未显示及数据问题 commit 2d12c179dd1375f59e5a246b1e7a0376f652363d Merge: 72b52324 1ec65e24 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Mon Mar 27 17:30:22 2023 +0800 诊断_执行计划图未显示及数据问题 commit 1ec65e242dcdd021b5bc93555461dddc3a519e11 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Mar 27 17:28:32 2023 +0800 诊断_执行计划图未显示及数据问题 commit 58f393a202a2f0a7af66f45d08b9e43806c189bc Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Mon Mar 27 16:43:47 2023 +0800 创建编辑模式功能ui commit 72b5232494f883792d693acc591e110f34ae7e0c Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon Mar 27 16:11:25 2023 +0800 数据库线程池校验 commit 59f7f1b883a715a05e822354867c9a77d5acd06d Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon Mar 27 16:11:25 2023 +0800 数据库线程池校验 commit 8da9d1d62227bd30905b87caded53001bfcfdbf2 Merge: d7bca132 7036dd53 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon Mar 27 15:46:48 2023 +0800 Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench commit f856ceaa512873266c2a851590d5b946249a3a88 Merge: a233d191 528c68e7 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon Mar 27 15:45:17 2023 +0800 Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop commit a233d1916f5112b08ded21701a55ebbdd090fef4 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon Mar 27 15:43:51 2023 +0800 filebeat修改权限 commit d7bca132fdf08f3a52d9dce4759c33450a625a9a Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon Mar 27 15:43:51 2023 +0800 filebeat修改权限 commit 7036dd53f1b933908feac88c1bf31f8871296775 Merge: 55cba754 528c68e7 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Mon Mar 27 14:46:05 2023 +0800 修复readme有些图片无法显示的问题 commit 528c68e7c26d0eef6abc62d787a5543877f1abad Merge: ce79e4fe 89c3dc9c Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Mon Mar 27 14:44:46 2023 +0800 修复readme有些图片无法显示的问题 commit 89c3dc9c863ef72a90a88f7e3df4e8c3858d14ba Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Mar 27 14:43:00 2023 +0800 修复readme有些图片无法显示的问题 commit ce79e4feae02022cb0492596b6f6f6eecbb5e999 Author: opengauss-bot <xiangxinyong@huawei.com> Date: Fri Mar 24 03:19:24 2023 +0000 !157 执行SQL诊断任务报错,卸载代理exporter_初始化失败 Merge pull request !157 from 板栗/master # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/ExporterService.java commit 55cba7540e88b69cc0b71d993abf152cc51a9b97 Author: opengauss-bot <xiangxinyong@huawei.com> Date: Fri Mar 24 03:19:24 2023 +0000 !157 执行SQL诊断任务报错,卸载代理exporter_初始化失败 Merge pull request !157 from 板栗/master # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/ExporterService.java commit 0e9c4f58b7d314885d1f9fd62aad6894a0f2c0ca Merge: 63d6ea9e 12fe8990 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Mon Mar 27 11:27:43 2023 +0800 filebeat配置移除尾部/, 修复离线上传文件后，再次查看文件上传组件时，没有显示上传文件名的bug, 修复无法新增sql诊断的问题, 修复离线上传文件后，再次查看文件上传组件时，没有显示上传文件名的bug, 修复无法新增sql诊断的问题 commit 12fe89909c59f0b20e2d742ca667c1791cfa56ef Merge: 0c1d91cf bea7403c Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Mon Mar 27 11:22:39 2023 +0800 修复离线上传文件后，再次查看文件上传组件时，没有显示上传文件名的bug, 修复无法新增sql诊断的问题 commit bea7403c15e95a6a7e9f499aa235d2ebe173aabb Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Mar 27 11:19:59 2023 +0800 修复无法新增sql诊断的问题 commit 7fa9064b69f23a19a00fa6a5761fa38b8181cdf6 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Mar 27 11:02:10 2023 +0800 修复离线上传文件后，再次查看文件上传组件时，没有显示上传文件名的bug commit 0c1d91cf4e953f2729abce6d8c0c846e7ea0262c Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon Mar 27 09:47:39 2023 +0800 filebeat配置移除尾部/ commit 63d6ea9ea54d341010e1912cad9bcfd8a9a097e2 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon Mar 27 09:47:39 2023 +0800 filebeat配置移除尾部/ commit 2c84c11d938dadef1a1d9747692b27b8cc6e78a5 Merge: 980524ab 32f021ff Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Sat Mar 25 21:19:35 2023 +0800 merge "develop" into "master" 移除pid后设置结果, 日志检索离线安装服务elasticsearch的bug, 日志检索离线安装服务elasticsearch的bug, 日志检索离线安装服务elasticsearch的bug, 日志检索离线安装服务elasticsearch的bug commit 32f021ffeb849789217060db471ced82c5876939 Merge: 1641815f 665ddd64 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Sat Mar 25 21:18:19 2023 +0800 日志检索离线安装服务elasticsearch的bug commit 665ddd64e2327918a688650d4f0ec05094c5f270 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Sat Mar 25 21:16:36 2023 +0800 日志检索离线安装服务elasticsearch的bug commit 1641815f0b6243e0bc2358ff661d527d0bcd8f0c Merge: 935043b6 e93a89ae Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Sat Mar 25 20:41:28 2023 +0800 日志检索离线安装服务elasticsearch的bug commit e93a89aede686fe1f42ca67ac1576ca3a6b70008 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Sat Mar 25 20:38:02 2023 +0800 日志检索离线安装服务elasticsearch的bug commit 980524ab7c40b2fdb4eabd2663ac009b2b072ab9 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Mar 24 17:39:08 2023 +0800 移除pid后设置结果 commit 935043b6bf3302c62c58d87e07168fc0f9b4673a Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Mar 24 17:39:08 2023 +0800 移除pid后设置结果 commit 13f58ac92bca6179f42b3b32a6081941882b0414 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Fri Mar 24 16:59:09 2023 +0800 迁代码：修复父子窗口关闭时联动的问题 (cherry picked from commit 065ad437e04fb3b309ffa2d18fdd747523cf973a) commit 5a243ddda61d7756cc8cfd1d2692eb32be9e852e Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Fri Mar 24 16:49:32 2023 +0800 调整多层子函数功能 commit 98b204f4475c446cf45f33b6632a51cb8c30a038 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Fri Mar 24 11:33:29 2023 +0800 补充DSreadme审核人 commit a2aa026739113d2c73bb8190c2a73af7db8271e4 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Fri Mar 24 11:33:27 2023 +0800 补充DSreadme审核人 commit eaa44c1092c61bc062c1a9c7bc2e563c6a48006a Merge: c4c7f5e7 065ad437 Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Fri Mar 24 10:21:28 2023 +0800 merge "develop" into "master" exporter环境防空,bcc校验sql修改, 迁代码：修复父子窗口关闭时联动的问题 commit 065ad437e04fb3b309ffa2d18fdd747523cf973a Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Fri Mar 24 10:18:34 2023 +0800 迁代码：修复父子窗口关闭时联动的问题 commit 29f409a706c7c90368b71795d3ce96e9d4e72dd5 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Mar 24 10:00:25 2023 +0800 exporter环境防空,bcc校验sql修改 commit c4c7f5e750957f218713dc9a25f71d4cf4354a35 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Thu Mar 23 11:04:39 2023 +0800 更新 README.md commit 98276a9ff27c3e05e141c090236a0437855998b2 Merge: 9a43d295 f321826f Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Thu Mar 23 10:40:36 2023 +0800 merge "develop" into "master" 修改长度, merge "develop_wyl" into "develop" 修改长度 commit f321826f194044ed808fb3759f41c492e6542849 Merge: 36fbe3b2 5b295918 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Thu Mar 23 10:35:55 2023 +0800 merge "develop_wyl" into "develop" 修改长度 commit 5b295918525d53143cc1d718a62c7f7654dc0e32 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Thu Mar 23 10:30:52 2023 +0800 修改长度 commit 9a43d295c4be870dcb7ac94306c6d92c89d0867b Merge: d5227055 36fbe3b2 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Wed Mar 22 18:36:22 2023 +0800 merge "develop" into "master" 修复日志分布图无法收起问题, merge "feature-wyb" into "develop" 修复日志分布图无法收起问题, 添加诊断预校验,多进程不调用bcc.ssh添加异常信息.TCPTOP格式修改 commit 36fbe3b2446f204c9233cf625f188f6de6c72257 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Mar 22 17:38:19 2023 +0800 添加诊断预校验,多进程不调用bcc.ssh添加异常信息.TCPTOP格式修改 commit c616c1d6a102231fbb6f1b77f7faf1efd0b3f9a4 Merge: f25ddcf6 f83162ad Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Wed Mar 22 17:41:59 2023 +0800 merge "feature-wyb" into "develop" 修复日志分布图无法收起问题 commit d5227055cdcb0b8914cf06a515d2d4eb3766c174 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Mar 22 17:38:19 2023 +0800 添加诊断预校验,多进程不调用bcc.ssh添加异常信息.TCPTOP格式修改 commit f83162ad882ccc494ea3b727a731c5fdf7ac9cf7 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Mar 22 17:38:56 2023 +0800 修复日志分布图无法收起问题 commit 94faaeb82fe035d169b6fed8d46a237d22dec2d8 Merge: d44fa6c9 f25ddcf6 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Wed Mar 22 17:05:45 2023 +0800 修复日志分布图自适应问题 commit f25ddcf6d8126624cb22064f36a97bedb99e6734 Merge: 13b98c42 ad9a7c34 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Wed Mar 22 17:04:39 2023 +0800 修复日志分布图自适应问题 commit ad9a7c346b72195c5696df9c5d6ef907d7b67789 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Mar 22 17:03:04 2023 +0800 修复日志分布图自适应问题 commit 13b98c426bc0014afe35b9f7abce2e2925197817 Merge: e7bad04c 0f22c399 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Wed Mar 22 16:05:18 2023 +0800 Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop commit e7bad04c29c601d2bb29a9bfd908ecdc1d5e4797 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Wed Mar 22 16:05:05 2023 +0800 可视化自动刷新功能 commit d44fa6c96f5a6cc001b5ec6ac2f707079a6d4778 Merge: 65172150 0f22c399 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Wed Mar 22 14:27:30 2023 +0800 merge "develop" into "master" agent-修改TCP取数时间周期, 日志检索-修改中文备注, merge "bugfix_lm_20230321" into "develop" agent-修改TCP取数时间周期, 日志检索-修改中文备注 commit 0f22c399e5d8666c659499287599e8dba03c5417 Merge: 67c1afbf 45bf205f Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Wed Mar 22 14:25:54 2023 +0800 merge "bugfix_lm_20230321" into "develop" agent-修改TCP取数时间周期, 日志检索-修改中文备注 commit 45bf205f958905ca79d68e8b07d2e3621c9ab697 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Wed Mar 22 14:24:46 2023 +0800 日志检索-修改中文备注 commit e6cdc2fb7716e8f7f4ab769b64a88702c2e4bb24 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Wed Mar 22 14:23:57 2023 +0800 agent-修改TCP取数时间周期 commit 65172150ad4148491c438d336bb174dd1187eb21 Merge: e2871473 67c1afbf Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Wed Mar 22 12:43:34 2023 +0800 el-table移除key=“Math.random()”属性, commit 67c1afbfc8461483616fabd538195f9023f9f49f Merge: 1039286c 8615924f Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Wed Mar 22 12:38:50 2023 +0800 merge "feature-wyb" into "develop" el-table移除key=“Math.random()”属性 commit 8615924fe1460193e8bf8c2fc1b3f45d8fdc3b78 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Mar 22 12:35:25 2023 +0800 el-table移除key=“Math.random()”属性 commit e28714731cb75d7ff2b0569976e559cfb7fa63ec Merge: 1039286c 7bf3d569 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Mar 22 10:59:03 2023 +0800 Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench commit 1039286c01cbf45526b57874f2fab1aa408eb006 Merge: f9b6d421 cc1ebfa9 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Mar 22 10:40:35 2023 +0800 Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop commit f9b6d42148ead69a64b93fdb23ad33a2dc9a8db4 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Mar 22 10:40:21 2023 +0800 移除多余数据存储 commit 7bf3d569cb2d366e51fd3f5f8735e1cf4b30dce8 Merge: 0e11eb0e cc1ebfa9 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Wed Mar 22 10:32:25 2023 +0800 merge "develop" into "master" 日志检索-修复日志内容解析问题, merge "bugfix_lm_20230321" into "develop" 日志检索-修复日志内容解析问题, 添加unzip安装/校验, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, 添加旧数据处理, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, merge "feature-wyb" into "develop" merge "develop" into "master" 连接信息删除后重置, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, sql诊断_%IOWait高-分布图_数据显示被遮挡, sql诊断_%IOWait高-分布图_数据显示被遮挡, 重新设计AppStore的lastestConnectDatabase, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, merge "bugfix_lm_20230321" into "develop" 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "feature-wyb" into "develop" 修改文案,添加历史数据源, 添加压缩包, SQL诊断-国际化参数诊断, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "develop" into "master" 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, merge "feature-wyb" into "develop" 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动 commit cc1ebfa943bbc30b457d55ccd1dfa6964746ad77 Merge: 67b27045 4d646808 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Wed Mar 22 10:31:19 2023 +0800 merge "feature-wyb" into "develop" merge "develop" into "master" 连接信息删除后重置, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, sql诊断_%IOWait高-分布图_数据显示被遮挡, sql诊断_%IOWait高-分布图_数据显示被遮挡, 重新设计AppStore的lastestConnectDatabase, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, merge "bugfix_lm_20230321" into "develop" 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "feature-wyb" into "develop" 修改文案,添加历史数据源, 添加压缩包, SQL诊断-国际化参数诊断, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "develop" into "master" 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, merge "feature-wyb" into "develop" 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动 commit 4d6468081b569d825c0434431c0384dfba583ae2 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Mar 22 10:29:33 2023 +0800 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动 commit 2be342d45593d7ea713e63796cd479c783ae03e7 Merge: 0e11eb0e 67b27045 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Mar 22 10:28:55 2023 +0800 Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb commit 67b27045f2dfb32565402f312518bee7cc3d250d Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Mar 22 10:11:28 2023 +0800 添加旧数据处理 commit e0ba05971a7a33e2afe4d1cf8b1efbef61310a73 Merge: 426a9baa 9da64cdb Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Mar 22 10:06:34 2023 +0800 Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop commit 426a9baaddef0e31f7f1962a088e993909c67a6e Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Mar 22 10:06:24 2023 +0800 添加unzip安装/校验 commit 9da64cdb921bea2ac314d8f85724be1b23af75bb Merge: 776774fc 3dfbe6aa Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Wed Mar 22 09:57:34 2023 +0800 merge "bugfix_lm_20230321" into "develop" 日志检索-修复日志内容解析问题 commit 3dfbe6aa88eceaf146a1f047c6891a5504aea855 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Wed Mar 22 09:55:23 2023 +0800 日志检索-修复日志内容解析问题 commit 0e11eb0e3f9e0dc69e99127cc3e75826b480e348 Merge: 8ad8d1f9 776774fc Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Tue Mar 21 20:36:40 2023 +0800 merge "develop" into "master" 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, merge "feature-wyb" into "develop" 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动 commit 776774fc2ed7b862d55f91ea1adc1b2b9b164e91 Merge: c4d30c28 6f1f4a13 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Tue Mar 21 20:35:46 2023 +0800 merge "feature-wyb" into "develop" 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动 commit 6f1f4a133f36d540f4b03fb17e5ecf1500671e04 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Mar 21 20:33:15 2023 +0800 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动 commit 8ad8d1f9a9c65168f3220a24ba9e3fd52ab6d545 Merge: 451fc30a c4d30c28 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Tue Mar 21 20:01:19 2023 +0800 merge "develop" into "master" 连接信息删除后重置, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, sql诊断_%IOWait高-分布图_数据显示被遮挡, sql诊断_%IOWait高-分布图_数据显示被遮挡, 重新设计AppStore的lastestConnectDatabase, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, merge "bugfix_lm_20230321" into "develop" 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "feature-wyb" into "develop" 修改文案,添加历史数据源, 添加压缩包, SQL诊断-国际化参数诊断, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb commit c4d30c282b750d1d7ae427c0d8c385237ee59767 Merge: 7e05b4d0 96260ad1 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Tue Mar 21 19:57:58 2023 +0800 merge "feature-wyb" into "develop" 修改文案,添加历史数据源, 添加压缩包, SQL诊断-国际化参数诊断, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb commit 96260ad178d469a54ad7cfe70601ade68caae87c Merge: 5f4b21b9 7e05b4d0 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Mar 21 19:53:13 2023 +0800 Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb commit 5f4b21b9ab10a44c33c3700a412cdf6b1efbe1b4 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Mar 21 19:52:26 2023 +0800 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对 commit 7e05b4d0075b3702ca81bbaec226aee66263c885 Merge: 52e38918 7a0cc2fc Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Tue Mar 21 19:49:09 2023 +0800 merge "bugfix_lm_20230321" into "develop" 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷 commit 7a0cc2fcfdda21998675e427c25997c27fd0ef7d Author: 罗梦 <luomeng@ncti-gba.cn> Date: Tue Mar 21 19:45:44 2023 +0800 日志检索-修复定时任务、上下文检索缺陷 commit a8c6a21912238162b5fb239e34e8c39e8403fc95 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Tue Mar 21 19:43:44 2023 +0800 实例监控-国际化系统配置参数 commit 6c97e8d24dd0feb8acd2b018d88ae3335aef6e60 Merge: 17ce2c97 451fc30a Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Mar 21 19:43:36 2023 +0800 Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb commit 451fc30a5c56e828913e46c48427d384ab560180 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Tue Mar 21 19:27:39 2023 +0800 SQL诊断-国际化参数诊断 commit f5c624c862b301efb9bffdb843a28633795420d5 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Mar 21 17:56:17 2023 +0800 添加压缩包 commit 638af1318b66293eff987f7f1863f99172728d2f Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Mar 21 17:39:06 2023 +0800 修改文案,添加历史数据源 commit 52e3891881928e9be6dee133cbcdfc8926aac64d Merge: dd0caa9e efe7b51e Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Tue Mar 21 16:26:33 2023 +0800 Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop commit dd0caa9efd7895bb443e2daafe6d3c833dbdb415 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Tue Mar 21 16:26:21 2023 +0800 重新设计AppStore的lastestConnectDatabase commit efe7b51e9d3087a636099d988fa56508b1427d39 Merge: e4f00b0d 17ce2c97 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Tue Mar 21 16:16:14 2023 +0800 sql诊断_%IOWait高-分布图_数据显示被遮挡 commit 17ce2c97618b79d8842fc2c36546b474e676f879 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Mar 21 15:52:16 2023 +0800 sql诊断_%IOWait高-分布图_数据显示被遮挡 commit b3a41854eab4dd51938776819e4a2c4a3ed4432c Merge: f9218ef4 e4f00b0d Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Mar 21 15:50:10 2023 +0800 Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb commit e4f00b0dbf7bb7e89b5c4bedb8dc932950641504 Merge: eb70525f 7be37eda Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Tue Mar 21 14:09:35 2023 +0800 Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop commit eb70525f4cbdb2e7627cd26925996a93b3d1bcfb Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Tue Mar 21 14:09:15 2023 +0800 连接信息删除后重置 commit f9218ef4a4e741e70b4238023b467346c69c577e Merge: 105e76a3 7be37eda Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Tue Mar 21 11:09:59 2023 +0800 merge "develop" into "master" 测试, merge "feature_wgb_test" into "develop" 测试, 测试, merge "feature_wgb_test" into "develop" 测试, 修改加长连接名称长度限制, merge "develop_wyl" into "develop" 修改加长连接名称长度限制 commit 7be37eda8ee6da8d78aa0a9e62fceadc56454f49 Merge: 5260ba01 f77470c0 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Tue Mar 21 10:42:18 2023 +0800 merge "develop_wyl" into "develop" 修改加长连接名称长度限制 commit f77470c058320acf721b7b53b96956ae3a832a44 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Tue Mar 21 10:40:53 2023 +0800 修改加长连接名称长度限制 commit 5260ba01fdc87945d9e86bffa58fdcc2fac58524 Merge: 10aad58a 8275f4b3 Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Tue Mar 21 09:54:09 2023 +0800 merge "feature_wgb_test" into "develop" 测试 commit 8275f4b373838c96242ca27ad2392a4c9137b6b9 Author: user <wuguobiao@ncti-gba.cn> Date: Tue Mar 21 09:48:21 2023 +0800 测试 commit 10aad58a9380ea283ba1783f31a3ee50f249ff76 Merge: 045c3e23 bb021ffa Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Tue Mar 21 09:47:35 2023 +0800 merge "feature_wgb_test" into "develop" 测试 commit bb021ffa6607ed5f6a1ecff759b9d5d546166ada Author: user <wuguobiao@ncti-gba.cn> Date: Tue Mar 21 09:43:30 2023 +0800 测试 commit d3b0386edcd891102947d71021d8c884faa2dcaa Merge: db13da1c c3991cee Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Mon Aug 28 18:45:36 2023 +0800 merge develop into release merge "develop" into "release" 解决yml配置问题, merge brench into develop merge "brench" into "develop" 解决yml配置问题 Created-by: zhanghaoyu Author-id: 7119760 MR-id: 7238461 Commit-by: 张昊宇 Merged-by: zhanghaoyu Description: merge "brench" into "develop" 解决yml配置问题 See merge request: openGaussythcs00001/openGauss-workbench!597, wdr前端优化, codecheck, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" wdr前端优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7238531 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" wdr前端优化 See merge request: openGaussythcs00001/openGauss-workbench!598, elasticsearch安装命令修改, merge Branch_develop into develop merge "Branch_develop" into "develop" codecheck Created-by: zhanghaoyu Author-id: 7119760 MR-id: 7238534 Commit-by: 张昊宇 Merged-by: zhanghaoyu Description: merge "Branch_develop" into "develop" codecheck See merge request: openGaussythcs00001/openGauss-workbench!599, codecheck, codecheck, codecheck, 实例监控bug修复, merge Branch_develop into develop merge "Branch_develop" into "develop" codecheck, 实例监控bug修复 Created-by: zhanghaoyu Author-id: 7119760 MR-id: 7238709 Commit-by: 张昊宇 Merged-by: zhanghaoyu Description: merge "Branch_develop" into "develop" codecheck, 实例监控bug修复 See merge request: openGaussythcs00001/openGauss-workbench!607, es安装修改, merge Branch_develop into develop merge "Branch_develop" into "develop" es安装修改 Created-by: zhanghaoyu Author-id: 7119760 MR-id: 7238728 Commit-by: 张昊宇 Merged-by: wuyuebin Description: merge "Branch_develop" into "develop" es安装修改 See merge request: openGaussythcs00001/openGauss-workbench!608, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, codecheck, codecheck, merge develop into develop-930-lm merge "develop" into "develop-930-lm" 修正sql, 实例详情bug修改, 集群配置测试, Merge branch 'feature-instance-lpf' into feature-instance, topsql排序, 集群监控bug, cpu指标, 查找snapshot, 集群监控添加字段, Merge branch 'feature-instance-lpf' into feature-instance, 分离状态接口, 添加fullcommand,ssh采集本地指标, 首页等待事件, 更新事件类型sql, 内存数据更新, 端口号,线程会话/sqlid, 内存配置更新, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, 修改asp接口, exporter改用ssh连接, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'remotes/origin/feature-yangzihao-develop-930' into feature-instance, 修复exporter重启bug, 指标修改,修改等待事件接口,添加详情-系统资源, CPU部分指标修正,sqlid修改,topsql指标修改, 等待事件修改,top结果修改, 新版集群监控-首页接口, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 修改节点属性, 线程号,系统日志路径, 新版集群监控-集群详情, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, wdr接口, WDR版权, 集群监控, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, test, 集群监控, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 集群监控修改变量类型, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, wdr分析, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, wdr分析 Created-by: wuyuebin Author-id: 7158405 MR-id: 7237993 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, wdr分析 See merge request: openGaussythcs00001/openGauss-workbench!584, 移除旧metric,精简包, 移除无效测试, 提测前修复问题, merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" 提测前修复问题 Created-by: zhangcheng Author-id: 7119759 MR-id: 7238092 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "develop-zhangcheng-0930" into "develop" 提测前修复问题 See merge request: openGaussythcs00001/openGauss-workbench!585, session修改,代码清理, Merge remote-tracking branch 'remotes/origin/develop' into Branch_feature-instance # Conflicts: # plugins/observability-instance/InstanceExporter/src/main/resources/og_exporter.yml, merge Branch_feature-instance into develop merge "Branch_feature-instance" into "develop" 修正sql, 实例详情bug修改, 集群配置测试, Merge branch 'feature-instance-lpf' into feature-instance, topsql排序, 集群监控bug, cpu指标, 查找snapshot, 集群监控添加字段, Merge branch 'feature-instance-lpf' into feature-instance, 分离状态接口, 添加fullcommand,ssh采集本地指标, 首页等待事件, 更新事件类型sql, 内存数据 Created-by: zhanghaoyu Author-id: 7119760 MR-id: 7239169 Commit-by: liupengfei;张昊宇;luomeng;罗梦;yangzihao;wuyuebin;zhanghaoyu Merged-by: yangzihao Description: merge "develop" into "release" 解决yml配置问题, merge brench into develop merge "brench" into "develop" 解决yml配置问题 Created-by: zhanghaoyu Author-id: 7119760 MR-id: 7238461 Commit-by: 张昊宇 Merged-by: zhanghaoyu Description: merge "brench" into "develop" 解决yml配置问题 See merge request: openGaussythcs00001/openGauss-workbench!597, wdr前端优化, codecheck, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" wdr前端优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7238531 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" wdr前端优化 See merge request: openGaussythcs00001/openGauss-workbench!598, elasticsearch安装命令修改, merge Branch_develop into develop merge "Branch_develop" into "develop" codecheck Created-by: zhanghaoyu Author-id: 7119760 MR-id: 7238534 Commit-by: 张昊宇 Merged-by: zhanghaoyu Description: merge "Branch_develop" into "develop" codecheck See merge request: openGaussythcs00001/openGauss-workbench!599, codecheck, codecheck, codecheck, 实例监控bug修复, merge Branch_develop into develop merge "Branch_develop" into "develop" codecheck, 实例监控bug修复 Created-by: zhanghaoyu Author-id: 7119760 MR-id: 7238709 Commit-by: 张昊宇 Merged-by: zhanghaoyu Description: merge "Branch_develop" into "develop" codecheck, 实例监控bug修复 See merge request: openGaussythcs00001/openGauss-workbench!607, es安装修改, merge Branch_develop into develop merge "Branch_develop" into "develop" es安装修改 Created-by: zhanghaoyu Author-id: 7119760 MR-id: 7238728 Commit-by: 张昊宇 Merged-by: wuyuebin Description: merge "Branch_develop" into "develop" es安装修改 See merge request: openGaussythcs00001/openGauss-workbench!608, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, codecheck, codecheck, merge develop into develop-930-lm merge "develop" into "develop-930-lm" 修正sql, 实例详情bug修改, 集群配置测试, Merge branch 'feature-instance-lpf' into feature-instance, topsql排序, 集群监控bug, cpu指标, 查找snapshot, 集群监控添加字段, Merge branch 'feature-instance-lpf' into feature-instance, 分离状态接口, 添加fullcommand,ssh采集本地指标, 首页等待事件, 更新事件类型sql, 内存数据更新, 端口号,线程会话/sqlid, 内存配置更新, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, 修改asp接口, exporter改用ssh连接, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'remotes/origin/feature-yangzihao-develop-930' into feature-instance, 修复exporter重启bug, 指标修改,修改等待事件接口,添加详情-系统资源, CPU部分指标修正,sqlid修改,topsql指标修改, 等待事件修改,top结果修改, 新版集群监控-首页接口, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 修改节点属性, 线程号,系统日志路径, 新版集群监控-集群详情, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, wdr接口, WDR版权, 集群监控, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, test, 集群监控, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 集群监控修改变量类型, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, wdr分析, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, wdr分析 Created-by: wuyuebin Author-id: 7158405 MR-id: 7237993 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, wdr分析 See merge request: openGaussythcs00001/openGauss-workbench!584, 移除旧metric,精简包, 移除无效测试, 提测前修复问题, merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" 提测前修复问题 Created-by: zhangcheng Author-id: 7119759 MR-id: 7238092 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "develop-zhangcheng-0930" into "develop" 提测前修复问题 See merge request: openGaussythcs00001/openGauss-workbench!585, session修改,代码清理, Merge remote-tracking branch 'remotes/origin/develop' into Branch_feature-instance # Conflicts: # plugins/observability-instance/InstanceExporter/src/main/resources/og_exporter.yml, merge Branch_feature-instance into develop merge "Branch_feature-instance" into "develop" 修正sql, 实例详情bug修改, 集群配置测试, Merge branch 'feature-instance-lpf' into feature-instance, topsql排序, 集群监控bug, cpu指标, 查找snapshot, 集群监控添加字段, Merge branch 'feature-instance-lpf' into feature-instance, 分离状态接口, 添加fullcommand,ssh采集本地指标, 首页等待事件, 更新事件类型sql, 内存数据 See merge request: openGaussythcs00001/openGauss-workbench!619 commit c3991cee89a9607fa76a2ab8d57cd0e6c025cfaf Merge: b66bb250 d21e304b Author: liupengfei <433218b6b32a4df9a4af133bc89b98e5@example.com> Date: Mon Aug 28 18:39:27 2023 +0800 merge develop-codecheck into develop merge "develop-codecheck" into "develop" codecheck Created-by: zhanghaoyu Author-id: 7119760 MR-id: 7239163 Commit-by: 张昊宇 Merged-by: liupengfei Description: merge "develop-codecheck" into "develop" codecheck See merge request: openGaussythcs00001/openGauss-workbench!618 commit d21e304b6e592cd5b7de72c9c2fe27815201c2c4 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon Aug 28 18:30:56 2023 +0800 codecheck commit b66bb250689e0115c550df7f830ed096dd1ab3dd Merge: 9cc968cf 085330d3 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Mon Aug 28 17:50:22 2023 +0800 merge develop-930-lm into develop merge "develop-930-lm" into "develop" merge develop into develop-930-lm merge "develop" into "develop-930-lm" 修正sql, 实例详情bug修改, 集群配置测试, Merge branch 'feature-instance-lpf' into feature-instance, topsql排序, 集群监控bug, cpu指标, 查找snapshot, 集群监控添加字段, Merge branch 'feature-instance-lpf' into feature-instance, 分离状态接口, 添加fullcommand,ssh采集本地指标, 首页等待事件, 更新事件类型sql, 内存数据更新, 端口号,线程会话/sqlid, 内存配置更新, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, 修改asp接口, exporter改用ssh连接, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'remotes/origin/feature-yangzihao-develop-930' into feature-instance, 修复exporter重启bug, 指标修改,修改等待事件接口,添加详情-系统资源, CPU部分指标修正,sqlid修改,topsql指标修改, 等待事件修改,top结果修改, 新版集群监控-首页接口, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 修改节点属性, 线程号,系统日志路径, 新版集群监控-集群详情, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, wdr接口, WDR版权, 集群监控, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, test, 集群监控, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 集群监控修改变量类型, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, wdr分析, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, wdr分析 Created-by: wuyuebin Author-id: 7158405 MR-id: 7237993 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, wdr分析 See merge request: openGaussythcs00001/openGauss-workbench!584, 移除旧metric,精简包, 移除无效测试, 提测前修复问题, merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" 提测前修复问题 Created-by: zhangcheng Author-id: 7119759 MR-id: 7238092 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "develop-zhangcheng-0930" into "develop" 提测前修复问题 See merge request: openGaussythcs00001/openGauss-workbench!585, session修改,代码清理, Merge remote-tracking branch 'remotes/origin/develop' into Branch_feature-instance # Conflicts: # plugins/observability-instance/InstanceExporter/src/main/resources/og_exporter.yml, merge Branch_feature-instance into develop merge "Branch_feature-instance" into "develop" 修正sql, 实例详情bug修改, 集群配置测试, Merge branch 'feature-instance-lpf' into feature-instance, topsql排序, 集群监控bug, cpu指标, 查找snapshot, 集群监控添加字段, Merge branch 'feature-instance-lpf' into feature-instance, 分离状态接口, 添加fullcommand,ssh采集本地指标, 首页等待事件, 更新事件类型sql, 内存数据更新, 端口号,线程会话/sqlid, 内存配置更新, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, 修改asp接口, exporter改用ssh连接, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'remotes/origin/feature-yangzihao-develop-930' into feature-instance, 修复exporter重启bug, 指标修改,修改等待事件接口,添加详情-系统资源, CPU部分指标修正,sqlid修改,topsql指标修改, 等待事件修改,top结果修改, 新版集群监控-首页接口, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 修改节点属性, 线程号,系统日志路径, 新版集群监控-集群详情, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, wdr接口, WDR版权, 集群监控, test, 集群监控, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 集群监控修改变量类型, 移除旧metric,精简包, 移除无效测试, session修改,代码清理, Merge remote-tracking branch 'remotes/origin/develop' into Branch_feature-instance # Conflicts: # plugins/observability-instance/InstanceExporter/src/main/resources/og_exporter.yml Created-by: zhanghaoyu Author-id: 7119760 MR-id: 7238124 Commit-by: 张昊宇;liupengfei Merged-by: zhanghaoyu Description: merge "Branch_feature-instance" into "develop" 修正sql, 实例详情bug修改, 集群配置测试, Merge branch 'feature-instance-lpf' into feature-instance, topsql排序, 集群监控bug, cpu指标, 查找snapshot, 集群监控添加字段, Merge branch 'feature-instance-lpf' into feature-instance, 分离状态接口, 添加fullcommand,ssh采集本地指标, 首页等待事件, 更新事件类型sql, 内存数据更新, 端口号,线程会话/sqlid, 内存配置更新, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, 修改asp接口, exporter改用ssh连接, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'remotes/origin/feature-yangzihao-develop-930' into feature-instance, 修复exporter重启bug, 指标修改,修改等待事 Created-by: luomeng Author-id: 7119743 MR-id: 7239076 Commit-by: 罗梦;luomeng Merged-by: luomeng Description: merge "develop-930-lm" into "develop" merge develop into develop-930-lm merge "develop" into "develop-930-lm" 修正sql, 实例详情bug修改, 集群配置测试, Merge branch 'feature-instance-lpf' into feature-instance, topsql排序, 集群监控bug, cpu指标, 查找snapshot, 集群监控添加字段, Merge branch 'feature-instance-lpf' into feature-instance, 分离状态接口, 添加fullcommand,ssh采集本地指标, 首页等待事件, 更新事件类型sql, 内存数据更新, 端口号,线程会话/sqlid, 内存配置更新, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, 修改asp接口, exporter改用ssh连接, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'remotes/origin/feature-yangzihao-develop-930' into feature-instance, 修复exporter重启bug, 指标修改,修改等待事件接口,添加详情-系统资源, CPU部分指标修正,sqlid修改,topsql指标修改, 等待事件修改,top结果修改, 新版集群监控-首页接口, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 修改节点属性, 线程号,系统日志路径, 新版集群监控-集群详情, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, wdr接口, WDR版权, 集群监控, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, test, 集群监控, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 集群监控修改变量类型, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, wdr分析, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, wdr分析 Created-by: wuyuebin Author-id: 7158405 MR-id: 7237993 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, wdr分析 See merge request: openGaussythcs00001/openGauss-workbench!584, 移除旧metric,精简包, 移除无效测试, 提测前修复问题, merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" 提测前修复问题 Created-by: zhangcheng Author-id: 7119759 MR-id: 7238092 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "develop-zhangcheng-0930" into "develop" 提测前修复问题 See merge request: openGaussythcs00001/openGauss-workbench!585, session修改,代码清理, Merge remote-tracking branch 'remotes/origin/develop' into Branch_feature-instance # Conflicts: # plugins/observability-instance/InstanceExporter/src/main/resources/og_exporter.yml, merge Branch_feature-instance into develop merge "Branch_feature-instance" into "develop" 修正sql, 实例详情bug修改, 集群配置测试, Merge branch 'feature-instance-lpf' into feature-instance, topsql排序, 集群监控bug, cpu指标, 查找snapshot, 集群监控添加字段, Merge branch 'feature-instance-lpf' into feature-instance, 分离状态接口, 添加fullcommand,ssh采集本地指标, 首页等待事件, 更新事件类型sql, 内存数据更新, 端口号,线程会话/sqlid, 内存配置更新, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, 修改asp接口, exporter改用ssh连接, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'remotes/origin/feature-yangzihao-develop-930' into feature-instance, 修复exporter重启bug, 指标修改,修改等待事件接口,添加详情-系统资源, CPU部分指标修正,sqlid修改,topsql指标修改, 等待事件修改,top结果修改, 新版集群监控-首页接口, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 修改节点属性, 线程号,系统日志路径, 新版集群监控-集群详情, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, wdr接口, WDR版权, 集群监控, test, 集群监控, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 集群监控修改变量类型, 移除旧metric,精简包, 移除无效测试, session修改,代码清理, Merge remote-tracking branch 'remotes/origin/develop' into Branch_feature-instance # Conflicts: # plugins/observability-instance/InstanceExporter/src/main/resources/og_exporter.yml Created-by: zhanghaoyu Author-id: 7119760 MR-id: 7238124 Commit-by: 张昊宇;liupengfei Merged-by: zhanghaoyu Description: merge "Branch_feature-instance" into "develop" 修正sql, 实例详情bug修改, 集群配置测试, Merge branch 'feature-instance-lpf' into feature-instance, topsql排序, 集群监控bug, cpu指标, 查找snapshot, 集群监控添加字段, Merge branch 'feature-instance-lpf' into feature-instance, 分离状态接口, 添加fullcommand,ssh采集本地指标, 首页等待事件, 更新事件类型sql, 内存数据更新, 端口号,线程会话/sqlid, 内存配置更新, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, 修改asp接口, exporter改用ssh连接, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'remotes/origin/feature-yangzihao-develop-930' into feature-instance, 修复exporter重启bug, 指标修改,修改等待事 See merge request: openGaussythcs00001/openGauss-workbench!617 commit 085330d3c9c69781168b9e29fd8de8ea6d0d3675 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Mon Aug 28 16:58:08 2023 +0800 智能诊断930版本代码 commit f98c726e5991a91fbb165a309398e0d2d7050a5e Author: 罗梦 <luomeng@ncti-gba.cn> Date: Mon Aug 28 16:43:08 2023 +0800 智能诊断930版本代码 commit c803245c809704b5546f44832941171b5cd4e128 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Mon Aug 28 16:36:56 2023 +0800 智能诊断930版本代码 commit 9cc968cfb0cadb8be2c06f5aacd4096da1630376 Merge: dc62a65a 77917560 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Mon Aug 28 15:59:03 2023 +0800 merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" codecheck, codecheck, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, codecheck, codecheck, 单元测试, codecheck, codecheck, codecheck, codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7239034 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" codecheck, codecheck, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, codecheck, codecheck, 单元测试, codecheck, codecheck, codecheck, codecheck See merge request: openGaussythcs00001/openGauss-workbench!614 commit db13da1c8dded77899b5aa3ef39390bf247231f5 Merge: 904a5211 bfda4a64 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Mon Aug 28 15:50:40 2023 +0800 merge release-zwr into release merge "release-zwr" into "release" Merge remote-tracking branch 'origin/release' into release-zwr, Merge remote-tracking branch 'origin/release' into release-zwr, 单元测试编写 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7239040 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" Merge remote-tracking branch 'origin/release' into release-zwr, Merge remote-tracking branch 'origin/release' into release-zwr, 单元测试编写 See merge request: openGaussythcs00001/openGauss-workbench!615 commit bfda4a64f38ce14f5de7443f5e6f0866f64c32d1 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Mon Aug 28 15:49:43 2023 +0800 单元测试编写 commit 779175605bfbbae968b30dc6d7b60847e87ac9a1 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Aug 28 15:25:25 2023 +0800 codecheck commit 90d66a4880b38c169d9e0e7101e497d1900bc9b2 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Aug 28 15:15:15 2023 +0800 codecheck commit 1760072f1e2910d5c3d34f40686896fcf9616157 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Aug 28 14:34:03 2023 +0800 codecheck commit 904a521137afa22bd82f27d9772edfe37f150d10 Merge: 7f503a48 6482ff6a Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Mon Aug 28 14:12:10 2023 +0800 merge release-wyl into release merge "release-wyl" into "release" bug修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7238939 Commit-by: wuyulin Merged-by: zhouwenruo Description: merge "release-wyl" into "release" bug修复 See merge request: openGaussythcs00001/openGauss-workbench!612 commit 7c35e2c27875367ae45e426c2af49e4b8186c807 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Aug 28 11:38:18 2023 +0800 codecheck commit 2038a98c0da4583ad8df753406a10bbe5fc8f79c Merge: cd7f9ab3 7f503a48 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Mon Aug 28 11:33:39 2023 +0800 Merge remote-tracking branch 'origin/release' into release-zwr commit 7f503a482d79c0efb6f298978b1773de0219c2f7 Merge: fb8d5599 0066de28 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Mon Aug 28 11:31:24 2023 +0800 merge release-zhangcheng-2309 into release merge "release-zhangcheng-2309" into "release" codeCheck Created-by: zhangcheng Author-id: 7119759 MR-id: 7238945 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "release-zhangcheng-2309" into "release" codeCheck See merge request: openGaussythcs00001/openGauss-workbench!613 commit 0066de28da62c2c7839daeac7d309ee6603c5def Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Mon Aug 28 11:27:01 2023 +0800 codeCheck commit 6482ff6a3db199a41812802f1b15b77cdfce67a2 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Mon Aug 28 11:22:15 2023 +0800 bug修复 commit 790342e593a193893b99377eacea6aecdf222968 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Aug 28 11:21:41 2023 +0800 单元测试 commit fb8d5599e9aa6f579369eba3e5c8d80edf629593 Merge: f20445a5 7a28b209 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Mon Aug 28 11:12:29 2023 +0800 merge release-zhangcheng-2309 into release merge "release-zhangcheng-2309" into "release" 改bug Created-by: zhangcheng Author-id: 7119759 MR-id: 7238931 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "release-zhangcheng-2309" into "release" 改bug See merge request: openGaussythcs00001/openGauss-workbench!611 commit 7a28b2095e425587584bdb12372ae666ac6f96da Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Mon Aug 28 11:11:02 2023 +0800 改bug commit cd7f9ab3fb4fee8e0bb0d27058ea72a6224fe8c7 Merge: 4e5a437e 8bb63c89 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Mon Aug 28 10:52:18 2023 +0800 Merge remote-tracking branch 'origin/release' into release-zwr commit f20445a54eebf9933856c6664903f1b08dc16faa Merge: 8bb63c89 4e5a437e Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Mon Aug 28 10:52:09 2023 +0800 merge release-zwr into release merge "release-zwr" into "release" code check 修改 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7238923 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" code check 修改 See merge request: openGaussythcs00001/openGauss-workbench!610 commit 4e5a437e6ee284847655cb41d3b8dda67ce6ce9b Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Mon Aug 28 10:48:53 2023 +0800 code check 修改 commit e4fd7a13a396a5d6a495500793a49a2b35195c54 Merge: 64c848d5 dc62a65a Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Mon Aug 28 08:52:09 2023 +0800 merge develop into develop-930-lm merge "develop" into "develop-930-lm" 修正sql, 实例详情bug修改, 集群配置测试, Merge branch 'feature-instance-lpf' into feature-instance, topsql排序, 集群监控bug, cpu指标, 查找snapshot, 集群监控添加字段, Merge branch 'feature-instance-lpf' into feature-instance, 分离状态接口, 添加fullcommand,ssh采集本地指标, 首页等待事件, 更新事件类型sql, 内存数据更新, 端口号,线程会话/sqlid, 内存配置更新, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, 修改asp接口, exporter改用ssh连接, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'remotes/origin/feature-yangzihao-develop-930' into feature-instance, 修复exporter重启bug, 指标修改,修改等待事件接口,添加详情-系统资源, CPU部分指标修正,sqlid修改,topsql指标修改, 等待事件修改,top结果修改, 新版集群监控-首页接口, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 修改节点属性, 线程号,系统日志路径, 新版集群监控-集群详情, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, wdr接口, WDR版权, 集群监控, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, test, 集群监控, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 集群监控修改变量类型, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, wdr分析, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, wdr分析 Created-by: wuyuebin Author-id: 7158405 MR-id: 7237993 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, wdr分析 See merge request: openGaussythcs00001/openGauss-workbench!584, 移除旧metric,精简包, 移除无效测试, 提测前修复问题, merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" 提测前修复问题 Created-by: zhangcheng Author-id: 7119759 MR-id: 7238092 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "develop-zhangcheng-0930" into "develop" 提测前修复问题 See merge request: openGaussythcs00001/openGauss-workbench!585, session修改,代码清理, Merge remote-tracking branch 'remotes/origin/develop' into Branch_feature-instance # Conflicts: # plugins/observability-instance/InstanceExporter/src/main/resources/og_exporter.yml, merge Branch_feature-instance into develop merge "Branch_feature-instance" into "develop" 修正sql, 实例详情bug修改, 集群配置测试, Merge branch 'feature-instance-lpf' into feature-instance, topsql排序, 集群监控bug, cpu指标, 查找snapshot, 集群监控添加字段, Merge branch 'feature-instance-lpf' into feature-instance, 分离状态接口, 添加fullcommand,ssh采集本地指标, 首页等待事件, 更新事件类型sql, 内存数据更新, 端口号,线程会话/sqlid, 内存配置更新, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, 修改asp接口, exporter改用ssh连接, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'remotes/origin/feature-yangzihao-develop-930' into feature-instance, 修复exporter重启bug, 指标修改,修改等待事件接口,添加详情-系统资源, CPU部分指标修正,sqlid修改,topsql指标修改, 等待事件修改,top结果修改, 新版集群监控-首页接口, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 修改节点属性, 线程号,系统日志路径, 新版集群监控-集群详情, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, wdr接口, WDR版权, 集群监控, test, 集群监控, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 集群监控修改变量类型, 移除旧metric,精简包, 移除无效测试, session修改,代码清理, Merge remote-tracking branch 'remotes/origin/develop' into Branch_feature-instance # Conflicts: # plugins/observability-instance/InstanceExporter/src/main/resources/og_exporter.yml Created-by: zhanghaoyu Author-id: 7119760 MR-id: 7238124 Commit-by: 张昊宇;liupengfei Merged-by: zhanghaoyu Description: merge "Branch_feature-instance" into "develop" 修正sql, 实例详情bug修改, 集群配置测试, Merge branch 'feature-instance-lpf' into feature-instance, topsql排序, 集群监控bug, cpu指标, 查找snapshot, 集群监控添加字段, Merge branch 'feature-instance-lpf' into feature-instance, 分离状态接口, 添加fullcommand,ssh采集本地指标, 首页等待事件, 更新事件类型sql, 内存数据更新, 端口号,线程会话/sqlid, 内存配置更新, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, 修改asp接口, exporter改用ssh连接, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'remotes/origin/feature-yangzihao-develop-930' into feature-instance, 修复exporter重启bug, 指标修改,修改等待事件接口,添加详情-系统资源, CPU部分指标修正,sqlid修改,topsql指标修改, 等待事件修改,top结果修改, 新版集群监控-首页接口, Created-by: luomeng Author-id: 7119743 MR-id: 7238868 Commit-by: wuyuebin;张昊宇;zhanghaoyu;yangzihao;Zihao Yang;liupengfei;zhouwenruo;zhangcheng Merged-by: luomeng Description: merge "develop" into "develop-930-lm" 修正sql, 实例详情bug修改, 集群配置测试, Merge branch 'feature-instance-lpf' into feature-instance, topsql排序, 集群监控bug, cpu指标, 查找snapshot, 集群监控添加字段, Merge branch 'feature-instance-lpf' into feature-instance, 分离状态接口, 添加fullcommand,ssh采集本地指标, 首页等待事件, 更新事件类型sql, 内存数据更新, 端口号,线程会话/sqlid, 内存配置更新, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, 修改asp接口, exporter改用ssh连接, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'remotes/origin/feature-yangzihao-develop-930' into feature-instance, 修复exporter重启bug, 指标修改,修改等待事件接口,添加详情-系统资源, CPU部分指标修正,sqlid修改,topsql指标修改, 等待事件修改,top结果修改, 新版集群监控-首页接口, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 修改节点属性, 线程号,系统日志路径, 新版集群监控-集群详情, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, wdr接口, WDR版权, 集群监控, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, test, 集群监控, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 集群监控修改变量类型, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, wdr分析, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, wdr分析 Created-by: wuyuebin Author-id: 7158405 MR-id: 7237993 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, wdr分析 See merge request: openGaussythcs00001/openGauss-workbench!584, 移除旧metric,精简包, 移除无效测试, 提测前修复问题, merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" 提测前修复问题 Created-by: zhangcheng Author-id: 7119759 MR-id: 7238092 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "develop-zhangcheng-0930" into "develop" 提测前修复问题 See merge request: openGaussythcs00001/openGauss-workbench!585, session修改,代码清理, Merge remote-tracking branch 'remotes/origin/develop' into Branch_feature-instance # Conflicts: # plugins/observability-instance/InstanceExporter/src/main/resources/og_exporter.yml, merge Branch_feature-instance into develop merge "Branch_feature-instance" into "develop" 修正sql, 实例详情bug修改, 集群配置测试, Merge branch 'feature-instance-lpf' into feature-instance, topsql排序, 集群监控bug, cpu指标, 查找snapshot, 集群监控添加字段, Merge branch 'feature-instance-lpf' into feature-instance, 分离状态接口, 添加fullcommand,ssh采集本地指标, 首页等待事件, 更新事件类型sql, 内存数据更新, 端口号,线程会话/sqlid, 内存配置更新, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, 修改asp接口, exporter改用ssh连接, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'remotes/origin/feature-yangzihao-develop-930' into feature-instance, 修复exporter重启bug, 指标修改,修改等待事件接口,添加详情-系统资源, CPU部分指标修正,sqlid修改,topsql指标修改, 等待事件修改,top结果修改, 新版集群监控-首页接口, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 修改节点属性, 线程号,系统日志路径, 新版集群监控-集群详情, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, wdr接口, WDR版权, 集群监控, test, 集群监控, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 集群监控修改变量类型, 移除旧metric,精简包, 移除无效测试, session修改,代码清理, Merge remote-tracking branch 'remotes/origin/develop' into Branch_feature-instance # Conflicts: # plugins/observability-instance/InstanceExporter/src/main/resources/og_exporter.yml Created-by: zhanghaoyu Author-id: 7119760 MR-id: 7238124 Commit-by: 张昊宇;liupengfei Merged-by: zhanghaoyu Description: merge "Branch_feature-instance" into "develop" 修正sql, 实例详情bug修改, 集群配置测试, Merge branch 'feature-instance-lpf' into feature-instance, topsql排序, 集群监控bug, cpu指标, 查找snapshot, 集群监控添加字段, Merge branch 'feature-instance-lpf' into feature-instance, 分离状态接口, 添加fullcommand,ssh采集本地指标, 首页等待事件, 更新事件类型sql, 内存数据更新, 端口号,线程会话/sqlid, 内存配置更新, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, 修改asp接口, exporter改用ssh连接, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'remotes/origin/feature-yangzihao-develop-930' into feature-instance, 修复exporter重启bug, 指标修改,修改等待事件接口,添加详情-系统资源, CPU部分指标修正,sqlid修改,topsql指标修改, 等待事件修改,top结果修改, 新版集群监控-首页接口, See merge request: openGaussythcs00001/openGauss-workbench!609 commit 0ba4d3dbe809c1612391924d92ac13db318334b2 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Fri Aug 25 18:17:44 2023 +0800 codecheck commit bf4920b6141500782d2217f468a3fea31d50656c Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Fri Aug 25 17:58:28 2023 +0800 codecheck commit e844792c73e356f757b9d947908f127cefdb5b4d Merge: 794034ea dc62a65a Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Fri Aug 25 17:56:59 2023 +0800 Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930 commit dc62a65ac72fded4a0eb30f635f1bd075e9b9960 Merge: dbccad37 54cddd66 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Fri Aug 25 17:43:30 2023 +0800 merge Branch_develop into develop merge "Branch_develop" into "develop" es安装修改 Created-by: zhanghaoyu Author-id: 7119760 MR-id: 7238728 Commit-by: 张昊宇 Merged-by: wuyuebin Description: merge "Branch_develop" into "develop" es安装修改 See merge request: openGaussythcs00001/openGauss-workbench!608 commit 54cddd66686de40fa0577e1873228e281fc46552 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Aug 25 17:39:11 2023 +0800 es安装修改 commit dbccad37ffc5054113ddce63a0ba27f491d842be Merge: da604137 cff37893 Author: zhanghaoyu <e9a6a9f516404feeabca273d60808c07@example.com> Date: Fri Aug 25 17:20:57 2023 +0800 merge Branch_develop into develop merge "Branch_develop" into "develop" codecheck, 实例监控bug修复 Created-by: zhanghaoyu Author-id: 7119760 MR-id: 7238709 Commit-by: 张昊宇 Merged-by: zhanghaoyu Description: merge "Branch_develop" into "develop" codecheck, 实例监控bug修复 See merge request: openGaussythcs00001/openGauss-workbench!607 commit cff378935664570eef589081414d0fa2fad43ab2 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Aug 25 17:12:42 2023 +0800 codecheck, 实例监控bug修复 commit 794034ea61b3e729a2a359240ba48bae6d539efd Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Fri Aug 25 16:13:29 2023 +0800 codecheck commit 8bb63c89cbf3390503723d0488ab2103b21a4876 Merge: 3fc0da01 1d422e3a Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Fri Aug 25 16:10:27 2023 +0800 merge release-zhangcheng-2309 into release merge "release-zhangcheng-2309" into "release" 排序多选，修bug Created-by: zhangcheng Author-id: 7119759 MR-id: 7238666 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "release-zhangcheng-2309" into "release" 排序多选，修bug See merge request: openGaussythcs00001/openGauss-workbench!606 commit 1d422e3a5de2856b25c6ccc20dff3dbfec2f6d8c Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Fri Aug 25 16:07:57 2023 +0800 排序多选，修bug commit 3fc0da012f66ac63750cdff946dd8cc7bc20c2dc Merge: 55771cea 95f09cca Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Fri Aug 25 16:03:26 2023 +0800 merge release-zwr into release merge "release-zwr" into "release" code check 修改 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7238660 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" code check 修改 See merge request: openGaussythcs00001/openGauss-workbench!605 commit 95f09ccaeeabbdc06f0b0d85b59f4de78060e159 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Fri Aug 25 16:02:56 2023 +0800 code check 修改 commit 55771ceaf09718e45f3b1d9d94a575e86dfcaa71 Merge: 2df73d62 5e84533f Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Fri Aug 25 15:50:29 2023 +0800 merge release-zwr into release merge "release-zwr" into "release" code check 修改 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7238648 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" code check 修改 See merge request: openGaussythcs00001/openGauss-workbench!604 commit 5e84533f36373f9c5bc9ee130465b9ba0137a6ee Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Fri Aug 25 15:49:16 2023 +0800 code check 修改 commit 2df73d629906c34813678fcddfc63cf9b5e7986c Merge: 91cce720 7461b234 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Fri Aug 25 15:42:47 2023 +0800 merge release-zwr into release merge "release-zwr" into "release" code check 修改 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7238638 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" code check 修改 See merge request: openGaussythcs00001/openGauss-workbench!603 commit 7461b2348aca7a4c680237878c111f0efb5c4fad Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Fri Aug 25 15:41:16 2023 +0800 code check 修改 commit 88e904c14e01bcff8fba0442536b43c8866d9fdd Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Fri Aug 25 15:01:26 2023 +0800 codecheck commit 91cce720f5e5166e75d96875059d3132693c85be Merge: 99052d44 1f16be84 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Fri Aug 25 14:33:27 2023 +0800 merge release-zwr into release merge "release-zwr" into "release" code check 修改 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7238589 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" code check 修改 See merge request: openGaussythcs00001/openGauss-workbench!601 commit 1f16be8409d49f2ef6ddda0abac2cfc80d5beb1a Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Fri Aug 25 14:29:09 2023 +0800 code check 修改 commit da604137b8264cd7654c53f560605d7101404b7c Merge: 6b1dab63 9e479014 Author: zhanghaoyu <e9a6a9f516404feeabca273d60808c07@example.com> Date: Fri Aug 25 14:07:22 2023 +0800 merge Branch_develop into develop merge "Branch_develop" into "develop" codecheck Created-by: zhanghaoyu Author-id: 7119760 MR-id: 7238534 Commit-by: 张昊宇 Merged-by: zhanghaoyu Description: merge "Branch_develop" into "develop" codecheck See merge request: openGaussythcs00001/openGauss-workbench!599 commit 99052d44e1d1e29b97a0bd73d5e6dd3614444d85 Merge: 95dd7bae 06cb1ee9 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Fri Aug 25 11:50:44 2023 +0800 merge release-zwr into release merge "release-zwr" into "release" code check 修改 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7238553 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" code check 修改 See merge request: openGaussythcs00001/openGauss-workbench!600 commit 9e4790143f54cadcd8e613e2499aa4c7161621a6 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Aug 25 11:48:08 2023 +0800 elasticsearch安装命令修改 commit 06cb1ee98d28c44baf1b9c96afa548d2f4fc619e Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Fri Aug 25 11:47:20 2023 +0800 code check 修改 commit 6b1dab63700222ee7f403b9c044d90bfed063b2f Merge: 9020f7da 29606d97 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Fri Aug 25 11:23:56 2023 +0800 merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" wdr前端优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7238531 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" wdr前端优化 See merge request: openGaussythcs00001/openGauss-workbench!598 commit 2d712d6a11894afbdf5a781feb3d9a9e1947c443 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Aug 25 10:43:37 2023 +0800 codecheck commit 29606d9723efa5d0f0d506b906cf2c9457e23444 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Fri Aug 25 11:21:20 2023 +0800 wdr前端优化 commit 9020f7dadc88ef9ee5e01787484ab190e591b280 Merge: 23957578 cd4ca4d4 Author: zhanghaoyu <e9a6a9f516404feeabca273d60808c07@example.com> Date: Fri Aug 25 09:55:57 2023 +0800 merge brench into develop merge "brench" into "develop" 解决yml配置问题 Created-by: zhanghaoyu Author-id: 7119760 MR-id: 7238461 Commit-by: 张昊宇 Merged-by: zhanghaoyu Description: merge "brench" into "develop" 解决yml配置问题 See merge request: openGaussythcs00001/openGauss-workbench!597 commit cd4ca4d4f426fb237b31c2a48084d436297e458e Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Aug 25 09:37:44 2023 +0800 解决yml配置问题 commit 95dd7bae89cb180573a63f7bb60ef8bcd556a816 Merge: e89c31f7 23957578 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Fri Aug 25 09:02:37 2023 +0800 merge develop into release merge "develop" into "release" merge develop into develop-930-lm merge "develop" into "develop-930-lm" repair data-studio, Merge remote-tracking branch 'origin/master', Merge remote-tracking branch 'origin/master', !369 业务开发-列问题回滚 Merge pull request !369 from 吴雨霖/master, 增加websocket默认消息大小，取消正则表达式判断条件, !370 增加websocket消息大小，取消迁移正则表达式文本限制 Merge pull request !370 from 王亚龙/master, 修改正则表达式判断条件, !371 修改正则表达式判断条件 Merge pull request !371 from 王亚龙/master, 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off, !373 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off Merge pull request !373 from 王亚龙/master, 杨子浩 930 实例监控前端代码, 第三方通知——snmp通知方式, Merge branch 'master' of https://gitee.com/opengauss/openGauss-workbench, repair druid config, !377 [bugfix] 修复druid没有检查直接使用线程池链接的问题 Merge pull request !377 from 周斌/master, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 屏蔽部分单元测试, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" 第三方通知——snmp通知方式, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 屏蔽部分单元测试 Created-by: wuyuebin Author-id: 7158405 MR-id: 7236880 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" 第三方通知——snmp通知方式, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 屏蔽部分单元测试 See merge request: openGaussythcs00001/openGauss-workbench!569, web-ds支持匿名块调试, 单元测试及代码优化, 调整查看用户角色功能, 视图、新增角色、删除角色, 匿名块调试readme修改, !372 web-ds支持匿名块调试 Merge pull request !372 from 李秦朗/master, !379 web-ds匿名块调试readme修改 Merge pull request !379 from 李秦朗/readme, Test覆盖率, merge develop-zwr into develop merge "develop-zwr" into "develop" 调整查看用户角色功能 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7237663 Commit-by: zhouwenruo Merged-by: zhangcheng Description: merge "develop-zwr" into "develop" 调整查看用户角色功能 See merge request: openGaussythcs00001/openGauss-workbench!571, 社区pr代码修改, 合并社区代码, merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" 视图、新增角色、删除角色, 社区pr代码修改 Created-by: zhangcheng Author-id: 7119759 MR-id: 7237720 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "develop-zhangcheng-0930" into "develop" 视图、新增角色、删除角色, 社区pr代码修改 See merge request: openGaussythcs00001/openGauss-workbench!573, merge develop-zwr into develop merge "develop-zwr" into "develop" 合并社区代码 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7237730 Commit-by: zhouwenruo Merged-by: zhangcheng Description: merge "develop-zwr" into "develop" 合并社区代码 See merge request: openGaussythcs00001/openGauss-workbench!574, merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 实例监控前端代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7237690 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 实例监控前端代码 See merge request: openGaussythcs00001/openGauss-workbench!572, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" 单元测试及代码优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7237184 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" 单元测试及代码优化 See merge request: openGaussythcs00001/openGauss-workbench!570, 杨子浩 930 集群监控代码, 杨子浩 930 集群监控 增加刷新按钮, Merge remote-tracking branch 'origin/release' into develop-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/debug/AsyncHelper.java # plugins/data-studio/web-ui/src/components/terminal-editor/createTemplate.ts # plugins/data-studio/web-ui/src/layout/Sidebar/index.vue, merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 集群监控代码, 杨子浩 930 集群监控 增加刷新按钮 Created-by: yangzihao Author-id: 7119754 MR-id: 7237763 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 集群监控代码, 杨子浩 930 集群监控 增加刷新按钮 See merge request: openGaussythcs00001/openGauss-workbench!579, merge develop-zwr into develop merge "develop-zwr" into "develop" repair data-studio, Merge remote-tracking branch 'origin/master', Merge remote-tracking branch 'origin/master', !369 业务开发-列问题回滚 Merge pull request !369 from 吴雨霖/master, 增加websocket默认消息大小，取消正则表达式判断条件, !370 增加websocket消息大小，取消迁移正则表达式文本限制 Merge pull request !370 from 王亚龙/master, 修改正则表达式判断条件, !371 修改正则表达式判断条件 Merge pull request !371 from 王亚龙/master, 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off, !373 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off Merge pull request !373 from 王亚龙/master, Merge branch 'master' of https://gitee.com/opengauss/openGauss-workbench, repair druid config, !377 [bugfix] 修复druid没有检查直接使用线程池链接的问题 Merge pull request !377 from 周斌/master, web-ds支持匿名块调试, 匿名块调试readme修改, !372 web-ds支持匿名块调试 Merge pull request !372 from 李秦朗/master, !379 web-ds匿名块 Created-by: wuyuebin Author-id: 7158405 MR-id: 7238437 Commit-by: wuyuebin;yangzihao;Zihao Yang;liupengfei;罗梦;luomeng Merged-by: yangzihao Description: merge "develop" into "release" merge develop into develop-930-lm merge "develop" into "develop-930-lm" repair data-studio, Merge remote-tracking branch 'origin/master', Merge remote-tracking branch 'origin/master', !369 业务开发-列问题回滚 Merge pull request !369 from 吴雨霖/master, 增加websocket默认消息大小，取消正则表达式判断条件, !370 增加websocket消息大小，取消迁移正则表达式文本限制 Merge pull request !370 from 王亚龙/master, 修改正则表达式判断条件, !371 修改正则表达式判断条件 Merge pull request !371 from 王亚龙/master, 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off, !373 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off Merge pull request !373 from 王亚龙/master, 杨子浩 930 实例监控前端代码, 第三方通知——snmp通知方式, Merge branch 'master' of https://gitee.com/opengauss/openGauss-workbench, repair druid config, !377 [bugfix] 修复druid没有检查直接使用线程池链接的问题 Merge pull request !377 from 周斌/master, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 屏蔽部分单元测试, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" 第三方通知——snmp通知方式, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 屏蔽部分单元测试 Created-by: wuyuebin Author-id: 7158405 MR-id: 7236880 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" 第三方通知——snmp通知方式, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 屏蔽部分单元测试 See merge request: openGaussythcs00001/openGauss-workbench!569, web-ds支持匿名块调试, 单元测试及代码优化, 调整查看用户角色功能, 视图、新增角色、删除角色, 匿名块调试readme修改, !372 web-ds支持匿名块调试 Merge pull request !372 from 李秦朗/master, !379 web-ds匿名块调试readme修改 Merge pull request !379 from 李秦朗/readme, Test覆盖率, merge develop-zwr into develop merge "develop-zwr" into "develop" 调整查看用户角色功能 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7237663 Commit-by: zhouwenruo Merged-by: zhangcheng Description: merge "develop-zwr" into "develop" 调整查看用户角色功能 See merge request: openGaussythcs00001/openGauss-workbench!571, 社区pr代码修改, 合并社区代码, merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" 视图、新增角色、删除角色, 社区pr代码修改 Created-by: zhangcheng Author-id: 7119759 MR-id: 7237720 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "develop-zhangcheng-0930" into "develop" 视图、新增角色、删除角色, 社区pr代码修改 See merge request: openGaussythcs00001/openGauss-workbench!573, merge develop-zwr into develop merge "develop-zwr" into "develop" 合并社区代码 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7237730 Commit-by: zhouwenruo Merged-by: zhangcheng Description: merge "develop-zwr" into "develop" 合并社区代码 See merge request: openGaussythcs00001/openGauss-workbench!574, merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 实例监控前端代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7237690 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 实例监控前端代码 See merge request: openGaussythcs00001/openGauss-workbench!572, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" 单元测试及代码优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7237184 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" 单元测试及代码优化 See merge request: openGaussythcs00001/openGauss-workbench!570, 杨子浩 930 集群监控代码, 杨子浩 930 集群监控 增加刷新按钮, Merge remote-tracking branch 'origin/release' into develop-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/debug/AsyncHelper.java # plugins/data-studio/web-ui/src/components/terminal-editor/createTemplate.ts # plugins/data-studio/web-ui/src/layout/Sidebar/index.vue, merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 集群监控代码, 杨子浩 930 集群监控 增加刷新按钮 Created-by: yangzihao Author-id: 7119754 MR-id: 7237763 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 集群监控代码, 杨子浩 930 集群监控 增加刷新按钮 See merge request: openGaussythcs00001/openGauss-workbench!579, merge develop-zwr into develop merge "develop-zwr" into "develop" repair data-studio, Merge remote-tracking branch 'origin/master', Merge remote-tracking branch 'origin/master', !369 业务开发-列问题回滚 Merge pull request !369 from 吴雨霖/master, 增加websocket默认消息大小，取消正则表达式判断条件, !370 增加websocket消息大小，取消迁移正则表达式文本限制 Merge pull request !370 from 王亚龙/master, 修改正则表达式判断条件, !371 修改正则表达式判断条件 Merge pull request !371 from 王亚龙/master, 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off, !373 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off Merge pull request !373 from 王亚龙/master, Merge branch 'master' of https://gitee.com/opengauss/openGauss-workbench, repair druid config, !377 [bugfix] 修复druid没有检查直接使用线程池链接的问题 Merge pull request !377 from 周斌/master, web-ds支持匿名块调试, 匿名块调试readme修改, !372 web-ds支持匿名块调试 Merge pull request !372 from 李秦朗/master, !379 web-ds匿名块 See merge request: openGaussythcs00001/openGauss-workbench!596 commit 23957578177011badc6444d4932dc199653ac1a0 Merge: 04f1b6fb 8c8973ac Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Fri Aug 25 08:49:58 2023 +0800 merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" 单元测试, 单元测试 Created-by: wuyuebin Author-id: 7158405 MR-id: 7238436 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "develop-wyb-930" into "develop" 单元测试, 单元测试 See merge request: openGaussythcs00001/openGauss-workbench!595 commit 8c8973aca9c413d9e7416645eff1db0d60696e42 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Thu Aug 24 19:46:24 2023 +0800 单元测试 commit a87c46a05034f0c170ca3831cf2907ef5fdeb41e Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Thu Aug 24 19:44:57 2023 +0800 单元测试 commit 04f1b6fbb9898103b964a0578d20262a9fb72ba6 Merge: 8ddf9d5a bc2338b6 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Thu Aug 24 17:43:33 2023 +0800 merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 集群监控前端代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7238317 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 集群监控前端代码 See merge request: openGaussythcs00001/openGauss-workbench!594 commit bc2338b61bfa257c2a4971d060320a21439fc668 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Thu Aug 24 17:41:13 2023 +0800 杨子浩 930 集群监控前端代码 commit e89c31f7140d468a40efeb803fbbaefc5b650273 Merge: b9519de2 78d0120c Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Thu Aug 24 17:06:21 2023 +0800 merge release-zwr into release merge "release-zwr" into "release" 修改bug Created-by: zhouwenruo Author-id: 7119763 MR-id: 7238291 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 修改bug See merge request: openGaussythcs00001/openGauss-workbench!593 commit 78d0120cf62729d1c52629148bdc3ec3427cf637 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu Aug 24 17:05:21 2023 +0800 修改bug commit 8ddf9d5a6201c01e664667a7c8d5c5b1fcc71e28 Merge: bed75f72 1e2cc736 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Thu Aug 24 16:48:42 2023 +0800 merge feature-instance into develop merge "feature-instance" into "develop" 集群监控--WAL增长量, Merge branch 'feature-instance-lpf' into feature-instance Created-by: liupengfei Author-id: 7158026 MR-id: 7238241 Commit-by: liupengfei Merged-by: yangzihao Description: merge "feature-instance" into "develop" 集群监控--WAL增长量, Merge branch 'feature-instance-lpf' into feature-instance See merge request: openGaussythcs00001/openGauss-workbench!592 commit 1e2cc7363207c5fa174b9a318db2327c1db89c43 Merge: 274c200a 955ec76c Author: liupengfei <liupengfei@ncti-gba.cn> Date: Thu Aug 24 15:59:34 2023 +0800 Merge branch 'feature-instance-lpf' into feature-instance commit 955ec76c678098ec56fefbd2755713539f4fe770 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Thu Aug 24 15:56:50 2023 +0800 集群监控--WAL增长量 commit bed75f72fb61124d9288f26ad07ef3e914a0f5eb Merge: 49282e5a 96cb2017 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Thu Aug 24 15:53:04 2023 +0800 merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 SQL诊断提交 Created-by: yangzihao Author-id: 7119754 MR-id: 7238228 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 SQL诊断提交 See merge request: openGaussythcs00001/openGauss-workbench!591 commit 49282e5aa0a263c17ab58fadd425f1f12d2c5813 Merge: 6322a01d 64c848d5 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Thu Aug 24 15:52:10 2023 +0800 merge develop-930-lm into develop merge "develop-930-lm" into "develop" merge develop into develop-930-lm merge "develop" into "develop-930-lm" repair data-studio, Merge remote-tracking branch 'origin/master', Merge remote-tracking branch 'origin/master', !369 业务开发-列问题回滚 Merge pull request !369 from 吴雨霖/master, 增加websocket默认消息大小，取消正则表达式判断条件, !370 增加websocket消息大小，取消迁移正则表达式文本限制 Merge pull request !370 from 王亚龙/master, 修改正则表达式判断条件, !371 修改正则表达式判断条件 Merge pull request !371 from 王亚龙/master, 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off, !373 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off Merge pull request !373 from 王亚龙/master, 杨子浩 930 实例监控前端代码, 第三方通知——snmp通知方式, Merge branch 'master' of https://gitee.com/opengauss/openGauss-workbench, repair druid config, !377 [bugfix] 修复druid没有检查直接使用线程池链接的问题 Merge pull request !377 from 周斌/master, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 屏蔽部分单元测试, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" 第三方通知——snmp通知方式, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 屏蔽部分单元测试 Created-by: wuyuebin Author-id: 7158405 MR-id: 7236880 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" 第三方通知——snmp通知方式, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 屏蔽部分单元测试 See merge request: openGaussythcs00001/openGauss-workbench!569, web-ds支持匿名块调试, 单元测试及代码优化, 调整查看用户角色功能, 视图、新增角色、删除角色, 匿名块调试readme修改, !372 web-ds支持匿名块调试 Merge pull request !372 from 李秦朗/master, !379 web-ds匿名块调试readme修改 Merge pull request !379 from 李秦朗/readme, Test覆盖率, merge develop-zwr into develop merge "develop-zwr" into "develop" 调整查看用户角色功能 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7237663 Commit-by: zhouwenruo Merged-by: zhangcheng Description: merge "develop-zwr" into "develop" 调整查看用户角色功能 See merge request: openGaussythcs00001/openGauss-workbench!571, 社区pr代码修改, 合并社区代码, merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" 视图、新增角色、删除角色, 社区pr代码修改 Created-by: zhangcheng Author-id: 7119759 MR-id: 7237720 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "develop-zhangcheng-0930" into "develop" 视图、新增角色、删除角色, 社区pr代码修改 See merge request: openGaussythcs00001/openGauss-workbench!573, merge develop-zwr into develop merge "develop-zwr" into "develop" 合并社区代码 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7237730 Commit-by: zhouwenruo Merged-by: zhangcheng Description: merge "develop-zwr" into "develop" 合并社区代码 See merge request: openGaussythcs00001/openGauss-workbench!574, merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 实例监控前端代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7237690 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 实例监控前端代码 See merge request: openGaussythcs00001/openGauss-workbench!572, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" 单元测试及代码优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7237184 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" 单元测试及代码优化 See merge request: openGaussythcs00001/openGauss-workbench!570, 杨子浩 930 集群监控代码, 杨子浩 930 集群监控 增加刷新按钮, Merge remote-tracking branch 'origin/release' into develop-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/debug/AsyncHelper.java # plugins/data-studio/web-ui/src/components/terminal-editor/createTemplate.ts # plugins/data-studio/web-ui/src/layout/Sidebar/index.vue, merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 集群监控代码, 杨子浩 930 集群监控 增加刷新按钮 Created-by: yangzihao Author-id: 7119754 MR-id: 7237763 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 集群监控代码, 杨子浩 930 集群监控 增加刷新按钮 See merge request: openGaussythcs00001/openGauss-workbench!579, merge develop-zwr into develop merge "develop-zwr" into "develop" repair data-studio, Merge remote-tracking branch 'origin/master', Merge remote-tracking branch 'origin/master', !369 业务开发-列问题回滚 Merge pull request !369 from 吴雨霖/master, 增加websocket默认消息大小，取消正则表达式判断条件, !370 增加websocket消息大小，取消迁移正则表达式文本限制 Merge pull request !370 from 王亚龙/master, 修改正则表达式判断条件, !371 修改正则表达式判断条件 Merge pull request !371 from 王亚龙/master, 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off, !373 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off Merge pull request !373 from 王亚龙/master, Merge branch 'master' of https://gitee.com/opengauss/openGauss-workbench, repair druid config, !377 [bugfix] 修复druid没有检查直接使用线程池链接的问题 Merge pull request !377 from 周斌/master, web-ds支持匿名块调试, 匿名块调试readme修改, !372 web-ds支持匿名块调试 Merge pull request !372 from 李秦朗/master, !379 we Created-by: luomeng Author-id: 7119743 MR-id: 7238148 Commit-by: 罗梦;luomeng Merged-by: yangzihao Description: merge "develop-930-lm" into "develop" merge develop into develop-930-lm merge "develop" into "develop-930-lm" repair data-studio, Merge remote-tracking branch 'origin/master', Merge remote-tracking branch 'origin/master', !369 业务开发-列问题回滚 Merge pull request !369 from 吴雨霖/master, 增加websocket默认消息大小，取消正则表达式判断条件, !370 增加websocket消息大小，取消迁移正则表达式文本限制 Merge pull request !370 from 王亚龙/master, 修改正则表达式判断条件, !371 修改正则表达式判断条件 Merge pull request !371 from 王亚龙/master, 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off, !373 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off Merge pull request !373 from 王亚龙/master, 杨子浩 930 实例监控前端代码, 第三方通知——snmp通知方式, Merge branch 'master' of https://gitee.com/opengauss/openGauss-workbench, repair druid config, !377 [bugfix] 修复druid没有检查直接使用线程池链接的问题 Merge pull request !377 from 周斌/master, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 屏蔽部分单元测试, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" 第三方通知——snmp通知方式, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 屏蔽部分单元测试 Created-by: wuyuebin Author-id: 7158405 MR-id: 7236880 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" 第三方通知——snmp通知方式, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 屏蔽部分单元测试 See merge request: openGaussythcs00001/openGauss-workbench!569, web-ds支持匿名块调试, 单元测试及代码优化, 调整查看用户角色功能, 视图、新增角色、删除角色, 匿名块调试readme修改, !372 web-ds支持匿名块调试 Merge pull request !372 from 李秦朗/master, !379 web-ds匿名块调试readme修改 Merge pull request !379 from 李秦朗/readme, Test覆盖率, merge develop-zwr into develop merge "develop-zwr" into "develop" 调整查看用户角色功能 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7237663 Commit-by: zhouwenruo Merged-by: zhangcheng Description: merge "develop-zwr" into "develop" 调整查看用户角色功能 See merge request: openGaussythcs00001/openGauss-workbench!571, 社区pr代码修改, 合并社区代码, merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" 视图、新增角色、删除角色, 社区pr代码修改 Created-by: zhangcheng Author-id: 7119759 MR-id: 7237720 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "develop-zhangcheng-0930" into "develop" 视图、新增角色、删除角色, 社区pr代码修改 See merge request: openGaussythcs00001/openGauss-workbench!573, merge develop-zwr into develop merge "develop-zwr" into "develop" 合并社区代码 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7237730 Commit-by: zhouwenruo Merged-by: zhangcheng Description: merge "develop-zwr" into "develop" 合并社区代码 See merge request: openGaussythcs00001/openGauss-workbench!574, merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 实例监控前端代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7237690 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 实例监控前端代码 See merge request: openGaussythcs00001/openGauss-workbench!572, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" 单元测试及代码优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7237184 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" 单元测试及代码优化 See merge request: openGaussythcs00001/openGauss-workbench!570, 杨子浩 930 集群监控代码, 杨子浩 930 集群监控 增加刷新按钮, Merge remote-tracking branch 'origin/release' into develop-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/debug/AsyncHelper.java # plugins/data-studio/web-ui/src/components/terminal-editor/createTemplate.ts # plugins/data-studio/web-ui/src/layout/Sidebar/index.vue, merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 集群监控代码, 杨子浩 930 集群监控 增加刷新按钮 Created-by: yangzihao Author-id: 7119754 MR-id: 7237763 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 集群监控代码, 杨子浩 930 集群监控 增加刷新按钮 See merge request: openGaussythcs00001/openGauss-workbench!579, merge develop-zwr into develop merge "develop-zwr" into "develop" repair data-studio, Merge remote-tracking branch 'origin/master', Merge remote-tracking branch 'origin/master', !369 业务开发-列问题回滚 Merge pull request !369 from 吴雨霖/master, 增加websocket默认消息大小，取消正则表达式判断条件, !370 增加websocket消息大小，取消迁移正则表达式文本限制 Merge pull request !370 from 王亚龙/master, 修改正则表达式判断条件, !371 修改正则表达式判断条件 Merge pull request !371 from 王亚龙/master, 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off, !373 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off Merge pull request !373 from 王亚龙/master, Merge branch 'master' of https://gitee.com/opengauss/openGauss-workbench, repair druid config, !377 [bugfix] 修复druid没有检查直接使用线程池链接的问题 Merge pull request !377 from 周斌/master, web-ds支持匿名块调试, 匿名块调试readme修改, !372 web-ds支持匿名块调试 Merge pull request !372 from 李秦朗/master, !379 we See merge request: openGaussythcs00001/openGauss-workbench!589 commit 96cb20172e98589f31633d3011b0c8878b32b12e Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Thu Aug 24 15:50:39 2023 +0800 杨子浩 930 SQL诊断提交 commit b9519de2cbfb5e970ffb2cd37129cfc198e1a59f Merge: 0b556117 6322a01d Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Thu Aug 24 14:38:58 2023 +0800 merge develop into release merge "develop" into "release" merge develop into develop-930-lm merge "develop" into "develop-930-lm" 服务器管理去除多余的代码, 修复连接弹窗重置的逻辑, 完善国际化翻译，增加日志说明, 解决全局配置无法打开的问题, 提交智能运维630代码, 历史数据诊断前端修改, 修复历史数据诊断前端BUG, 历史数据和实例监控BUG修复, !273 【业务开发】- 连接弹窗等bug修复 Merge pull request !273 from sweet365/master, !277 智能运维模块630需求内容，含实例监控插件、SQL诊断插件、告警通知插件 Merge pull request !277 from 杨子浩/master, codecheck, !281 智能运维模块630告警通知需求内容 Merge pull request !281 from wuyuebin/master, codecheck, !282 智能运维模块630告警通知需求内容 Merge pull request !282 from wuyuebin/master, 告警接口过滤, !283 过滤prometheus发送告警信息的告警接口 Merge pull request !283 from wuyuebin/master, !274 完善迁移批量安装页面国际化翻译，增加迁移日志说明 Merge pull request !274 from 王亚龙/master, 修改ds文档、增加连接弹窗主机输入限制、删除连接提示, 中英文国际化优化和README修改, 实例监控、历史数据诊断bug修复, !289 智能运维模块630需求内容实例监控、历史数据诊断模块bug修复与优化 Merge pull request !289 from Lmeng梦/master, 2, 实例监控bug修复, !292 业务开发-接口优化 Merge pull request !292 from 吴雨霖/master, !293 智能运维模块实例监控插件bug修复 Merge pull request !293 from Lmeng梦/master, 实例监控bug修复, !294 智能运维模块实例监控插件bug修复 Merge pull request !294 from 板栗/master, dataStudio修复bug, 修改样式和操作手册, !296 智能运维模块告警通知插件bug修复 Merge pull request !296 from wuyuebin/master, !295 业务开发插件bug修复 Merge pull request !295 from sweet365/master, 代码优化, 代码优化, !297 智能运维模块告警通知插件bug修复 Merge pull request !297 from wuyuebin/master, 依据新的参数配置列表，修改迁移前端画面判断, add support for auto add plugin to manage, !265 服务器管理去除多余的代码 Merge pull request !265 from 杨森/master, !298 依据新的参数配置列表，修改迁移前端画面校验判断 Merge pull request !298 from 王亚龙/master, 代码优化, 样式调整, !299 智能运维模块告警通知插件bug修复 Merge pull request !299 from wuyuebin/master, 代码优化, 去掉中文, !300 智能运维模块告警通知插件bug修复 Merge pull request !300 from wuyuebin/master, 调整实例监控首页, 告警接口调整, !302 智能运维模块告警通知插件bug修复 Merge pull request !302 from wuyuebin/master, !301 调整实例监控首页 Merge pull request !301 from Ponfy_Liu/master, !290 【bugfix】修复windows版本下安装插件图标丢失和visualtool-plugin下自动安装的插件不能被插件中心管理的问题 Merge pull request !290 from 周斌/auto_plugin, 修改循环注入, !303 业务开发-0630循环依赖修复 Merge pull request !303 from 吴雨霖/master, 将jsch升级到最新版本, !304 将jsch升级到最新版本，解决部分场景下OpenEuler无法连接的问题 Merge pull request !304 from 王亚龙/master, 修复实例监控前端BUG, !306 实例监控前端样式优化 Merge pull request !306 from Lmeng梦/master, 代码检查，bug修复, !307 智能运维模块告警通知插件bug修复 Merge pull request !307 from wuyuebin/master, 修复实例监控、智能诊断模块前端问题, 会话详情等待事件记录BUG修复, 优化阻塞会话树状图, 提交前端优化代码, !308 实例监控前端样式优化 Merge pull request !308 from Lmeng梦/master, alert-center更改为alert-monitor, codecheck, !310 智能运维模块告警通知插件名称由alert-center改为alert-monitor Merge pull request !310 from wuyuebin/master, Merge branch 'master' of https://gitee.com/sweet365/openGauss-workbench, 业务开发模块创建表增加保存提示, !311 业务开发模块创建表增加保存提示 Merge pull request !311 from sweet365/master, 修复实例监控和历史数据诊断前端BUG, 历史数据诊断-修复缺陷和优化代码逻辑, 修复codeCheck, codeCheck修改, 修改前端空格缩进, !313 历史数据诊断-修复缺陷和优化代码逻辑 Merge pull request !313 from Lmeng梦/master, !312 实例监控、历史数据诊断样式优化 Merge pull request !312 from Lmeng梦/master, 移除无效文件,添加等待事件空即考验,添加安装端口校验,修改指标bug, !316 实例监控 bugfix Merge pull request !316 from 板栗/master, 移除无效文件,添加等待事件空即考验,添加安装端口校验,修改指标bug, !319 实例监控 bugfix Merge pull request !319 from 板栗/master, 补充遗漏提交, !321 实例监控 bugfix Merge pull request !321 from 板栗/master, bug, 修复实例监控WDRBUG, 修改代码缩进codecheck, !323 实例监控WDR报告BUG修复 Merge pull request !323 from Lmeng梦/master, 告警bug修复, codecheck, !322 业务开发 - 0630bug修复 Merge pull request !322 from RoaneZhou/master, !325 智能运维模块告警通知插件bug修复 Merge pull request !325 from wuyuebin/master, 修改会话监控接口响应结构体, Merge remote-tracking branch 'origin/master', !326 修改会话监控接口响应结构体 Merge pull request !326 from Ponfy_Liu/master, 修复SQL诊断页面显示BUG, !327 修复SQL诊断页面显示样式BUG Merge pull request !327 from Lmeng梦/master, 安装采集器端口检测方法修改，慢sql指标采集修改,操作手册, !328 实例监控 bugfix Merge pull request !328 from 板栗/master, 抛异常问题修复, !329 业务开发-序列DDL预览显示问题 Merge pull request !329 from 吴雨霖/master, 对自定义的appcationRunner启动出现异常进行处理, 对自定义的appcationRunner启动出现异常进行处理, !331 智能运维模块告警通知插件bug修复 Merge pull request !331 from wuyuebin/master, 1.实例监控首页接口性能优化, codeCheck, codeCheck, codeCheck, !332 实例监控首页接口性能优化 Merge pull request !332 from Ponfy_Liu/master, 修复实例监控和智能诊断前端BUG, 修复codeCheck, 警告/代码整理, 慢sql指标修改,TCP指标修改,移除无效文件, !334 修复实例监控和SQL诊断页面显示样式BUG Merge pull request !334 from Lmeng梦/master, !333 实例监控 bugfix Merge pull request !333 from 板栗/master, 智能运维模块logo更新，告警插件操作文档更新及代码优化, !336 块智能运维模块logo更新，告警插件操作文档更新及代码优化 Merge pull request !336 from wuyuebin/master, 优化实例监控代码结构, codeCheck, !337 优化实例监控代码结构 Merge pull request !337 from Ponfy_Liu/master, 建表语句修复, !338 业务开发-创建表DDL预览显示问题 Merge pull request !338 from 吴雨霖/master, 【日志检索】上下文框未被隐藏, !339 智能运维模块日志检索插件bug修复 Merge pull request !339 from wuyuebin/master, 修复列描述问题, !340 业务开发-列描述显示问题 Merge pull request !340 from 吴雨霖/master, TOPSQL，点击SQLID进入到SQL诊断页面，创建诊断任务，SQL不能修改参数。, !341 智能运维模块bug修复 Merge pull request !341 from wuyuebin/master, 删除关闭窗口清掉断点接口, !342 【业务开发】函数/过程0630版本优化 Merge pull request !342 from RoaneZhou/master, WDR报告，未选实例点击快照管理，页数错误，点击页数会报错。, !343 智能运维模块实例监控插件bug修复 Merge pull request !343 from wuyuebin/master, 说明文档添加下载地址, !344 添加下载地址 Merge pull request !344 from 刘桐/master, 优化代码, codecheck, !345 智能运维模块告警通知插件bug修复 Merge pull requ Created-by: zhangcheng Author-id: 7119759 MR-id: 7238094 Commit-by: zhanghaoyu;张昊宇;zhouwenruo;zhangcheng;yangzihao;wuyuebin;liupengfei;罗梦;luomeng Merged-by: zhouwenruo Description: merge "develop" into "release" merge develop into develop-930-lm merge "develop" into "develop-930-lm" 服务器管理去除多余的代码, 修复连接弹窗重置的逻辑, 完善国际化翻译，增加日志说明, 解决全局配置无法打开的问题, 提交智能运维630代码, 历史数据诊断前端修改, 修复历史数据诊断前端BUG, 历史数据和实例监控BUG修复, !273 【业务开发】- 连接弹窗等bug修复 Merge pull request !273 from sweet365/master, !277 智能运维模块630需求内容，含实例监控插件、SQL诊断插件、告警通知插件 Merge pull request !277 from 杨子浩/master, codecheck, !281 智能运维模块630告警通知需求内容 Merge pull request !281 from wuyuebin/master, codecheck, !282 智能运维模块630告警通知需求内容 Merge pull request !282 from wuyuebin/master, 告警接口过滤, !283 过滤prometheus发送告警信息的告警接口 Merge pull request !283 from wuyuebin/master, !274 完善迁移批量安装页面国际化翻译，增加迁移日志说明 Merge pull request !274 from 王亚龙/master, 修改ds文档、增加连接弹窗主机输入限制、删除连接提示, 中英文国际化优化和README修改, 实例监控、历史数据诊断bug修复, !289 智能运维模块630需求内容实例监控、历史数据诊断模块bug修复与优化 Merge pull request !289 from Lmeng梦/master, 2, 实例监控bug修复, !292 业务开发-接口优化 Merge pull request !292 from 吴雨霖/master, !293 智能运维模块实例监控插件bug修复 Merge pull request !293 from Lmeng梦/master, 实例监控bug修复, !294 智能运维模块实例监控插件bug修复 Merge pull request !294 from 板栗/master, dataStudio修复bug, 修改样式和操作手册, !296 智能运维模块告警通知插件bug修复 Merge pull request !296 from wuyuebin/master, !295 业务开发插件bug修复 Merge pull request !295 from sweet365/master, 代码优化, 代码优化, !297 智能运维模块告警通知插件bug修复 Merge pull request !297 from wuyuebin/master, 依据新的参数配置列表，修改迁移前端画面判断, add support for auto add plugin to manage, !265 服务器管理去除多余的代码 Merge pull request !265 from 杨森/master, !298 依据新的参数配置列表，修改迁移前端画面校验判断 Merge pull request !298 from 王亚龙/master, 代码优化, 样式调整, !299 智能运维模块告警通知插件bug修复 Merge pull request !299 from wuyuebin/master, 代码优化, 去掉中文, !300 智能运维模块告警通知插件bug修复 Merge pull request !300 from wuyuebin/master, 调整实例监控首页, 告警接口调整, !302 智能运维模块告警通知插件bug修复 Merge pull request !302 from wuyuebin/master, !301 调整实例监控首页 Merge pull request !301 from Ponfy_Liu/master, !290 【bugfix】修复windows版本下安装插件图标丢失和visualtool-plugin下自动安装的插件不能被插件中心管理的问题 Merge pull request !290 from 周斌/auto_plugin, 修改循环注入, !303 业务开发-0630循环依赖修复 Merge pull request !303 from 吴雨霖/master, 将jsch升级到最新版本, !304 将jsch升级到最新版本，解决部分场景下OpenEuler无法连接的问题 Merge pull request !304 from 王亚龙/master, 修复实例监控前端BUG, !306 实例监控前端样式优化 Merge pull request !306 from Lmeng梦/master, 代码检查，bug修复, !307 智能运维模块告警通知插件bug修复 Merge pull request !307 from wuyuebin/master, 修复实例监控、智能诊断模块前端问题, 会话详情等待事件记录BUG修复, 优化阻塞会话树状图, 提交前端优化代码, !308 实例监控前端样式优化 Merge pull request !308 from Lmeng梦/master, alert-center更改为alert-monitor, codecheck, !310 智能运维模块告警通知插件名称由alert-center改为alert-monitor Merge pull request !310 from wuyuebin/master, Merge branch 'master' of https://gitee.com/sweet365/openGauss-workbench, 业务开发模块创建表增加保存提示, !311 业务开发模块创建表增加保存提示 Merge pull request !311 from sweet365/master, 修复实例监控和历史数据诊断前端BUG, 历史数据诊断-修复缺陷和优化代码逻辑, 修复codeCheck, codeCheck修改, 修改前端空格缩进, !313 历史数据诊断-修复缺陷和优化代码逻辑 Merge pull request !313 from Lmeng梦/master, !312 实例监控、历史数据诊断样式优化 Merge pull request !312 from Lmeng梦/master, 移除无效文件,添加等待事件空即考验,添加安装端口校验,修改指标bug, !316 实例监控 bugfix Merge pull request !316 from 板栗/master, 移除无效文件,添加等待事件空即考验,添加安装端口校验,修改指标bug, !319 实例监控 bugfix Merge pull request !319 from 板栗/master, 补充遗漏提交, !321 实例监控 bugfix Merge pull request !321 from 板栗/master, bug, 修复实例监控WDRBUG, 修改代码缩进codecheck, !323 实例监控WDR报告BUG修复 Merge pull request !323 from Lmeng梦/master, 告警bug修复, codecheck, !322 业务开发 - 0630bug修复 Merge pull request !322 from RoaneZhou/master, !325 智能运维模块告警通知插件bug修复 Merge pull request !325 from wuyuebin/master, 修改会话监控接口响应结构体, Merge remote-tracking branch 'origin/master', !326 修改会话监控接口响应结构体 Merge pull request !326 from Ponfy_Liu/master, 修复SQL诊断页面显示BUG, !327 修复SQL诊断页面显示样式BUG Merge pull request !327 from Lmeng梦/master, 安装采集器端口检测方法修改，慢sql指标采集修改,操作手册, !328 实例监控 bugfix Merge pull request !328 from 板栗/master, 抛异常问题修复, !329 业务开发-序列DDL预览显示问题 Merge pull request !329 from 吴雨霖/master, 对自定义的appcationRunner启动出现异常进行处理, 对自定义的appcationRunner启动出现异常进行处理, !331 智能运维模块告警通知插件bug修复 Merge pull request !331 from wuyuebin/master, 1.实例监控首页接口性能优化, codeCheck, codeCheck, codeCheck, !332 实例监控首页接口性能优化 Merge pull request !332 from Ponfy_Liu/master, 修复实例监控和智能诊断前端BUG, 修复codeCheck, 警告/代码整理, 慢sql指标修改,TCP指标修改,移除无效文件, !334 修复实例监控和SQL诊断页面显示样式BUG Merge pull request !334 from Lmeng梦/master, !333 实例监控 bugfix Merge pull request !333 from 板栗/master, 智能运维模块logo更新，告警插件操作文档更新及代码优化, !336 块智能运维模块logo更新，告警插件操作文档更新及代码优化 Merge pull request !336 from wuyuebin/master, 优化实例监控代码结构, codeCheck, !337 优化实例监控代码结构 Merge pull request !337 from Ponfy_Liu/master, 建表语句修复, !338 业务开发-创建表DDL预览显示问题 Merge pull request !338 from 吴雨霖/master, 【日志检索】上下文框未被隐藏, !339 智能运维模块日志检索插件bug修复 Merge pull request !339 from wuyuebin/master, 修复列描述问题, !340 业务开发-列描述显示问题 Merge pull request !340 from 吴雨霖/master, TOPSQL，点击SQLID进入到SQL诊断页面，创建诊断任务，SQL不能修改参数。, !341 智能运维模块bug修复 Merge pull request !341 from wuyuebin/master, 删除关闭窗口清掉断点接口, !342 【业务开发】函数/过程0630版本优化 Merge pull request !342 from RoaneZhou/master, WDR报告，未选实例点击快照管理，页数错误，点击页数会报错。, !343 智能运维模块实例监控插件bug修复 Merge pull request !343 from wuyuebin/master, 说明文档添加下载地址, !344 添加下载地址 Merge pull request !344 from 刘桐/master, 优化代码, codecheck, !345 智能运维模块告警通知插件bug修复 Merge pull requ See merge request: openGaussythcs00001/openGauss-workbench!586 commit 0b55611732881df8237913cb140c8f63ad8a91d4 Merge: 84ae1c90 cef56553 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Thu Aug 24 14:33:39 2023 +0800 merge release-zwr into release merge "release-zwr" into "release" 修改bug Created-by: zhouwenruo Author-id: 7119763 MR-id: 7238172 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 修改bug See merge request: openGaussythcs00001/openGauss-workbench!590 commit cef565537193b021f8e11a40fe3204cfee5486a1 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu Aug 24 14:31:21 2023 +0800 修改bug commit 64c848d5122a0322f3ba5d7b1bc91db6d2b024a9 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Thu Aug 24 11:54:18 2023 +0800 智能诊断930版本代码 commit 6322a01d9a9a0de199da0023de5b80b0339034c1 Merge: 804ff909 f1c4fc67 Author: zhanghaoyu <e9a6a9f516404feeabca273d60808c07@example.com> Date: Thu Aug 24 11:33:21 2023 +0800 merge Branch_feature-instance into develop merge "Branch_feature-instance" into "develop" 修正sql, 实例详情bug修改, 集群配置测试, Merge branch 'feature-instance-lpf' into feature-instance, topsql排序, 集群监控bug, cpu指标, 查找snapshot, 集群监控添加字段, Merge branch 'feature-instance-lpf' into feature-instance, 分离状态接口, 添加fullcommand,ssh采集本地指标, 首页等待事件, 更新事件类型sql, 内存数据更新, 端口号,线程会话/sqlid, 内存配置更新, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, 修改asp接口, exporter改用ssh连接, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'remotes/origin/feature-yangzihao-develop-930' into feature-instance, 修复exporter重启bug, 指标修改,修改等待事件接口,添加详情-系统资源, CPU部分指标修正,sqlid修改,topsql指标修改, 等待事件修改,top结果修改, 新版集群监控-首页接口, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 修改节点属性, 线程号,系统日志路径, 新版集群监控-集群详情, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, wdr接口, WDR版权, 集群监控, test, 集群监控, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 集群监控修改变量类型, 移除旧metric,精简包, 移除无效测试, session修改,代码清理, Merge remote-tracking branch 'remotes/origin/develop' into Branch_feature-instance # Conflicts: # plugins/observability-instance/InstanceExporter/src/main/resources/og_exporter.yml Created-by: zhanghaoyu Author-id: 7119760 MR-id: 7238124 Commit-by: 张昊宇;liupengfei Merged-by: zhanghaoyu Description: merge "Branch_feature-instance" into "develop" 修正sql, 实例详情bug修改, 集群配置测试, Merge branch 'feature-instance-lpf' into feature-instance, topsql排序, 集群监控bug, cpu指标, 查找snapshot, 集群监控添加字段, Merge branch 'feature-instance-lpf' into feature-instance, 分离状态接口, 添加fullcommand,ssh采集本地指标, 首页等待事件, 更新事件类型sql, 内存数据更新, 端口号,线程会话/sqlid, 内存配置更新, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, 修改asp接口, exporter改用ssh连接, 修改asp接口, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'remotes/origin/feature-yangzihao-develop-930' into feature-instance, 修复exporter重启bug, 指标修改,修改等待事件接口,添加详情-系统资源, CPU部分指标修正,sqlid修改,topsql指标修改, 等待事件修改,top结果修改, 新版集群监控-首页接口, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 修改节点属性, 线程号,系统日志路径, 新版集群监控-集群详情, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, wdr接口, WDR版权, 集群监控, test, 集群监控, Merge branch 'feature-instance-lpf' into feature-instance, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, 集群监控修改变量类型, 移除旧metric,精简包, 移除无效测试, session修改,代码清理, Merge remote-tracking branch 'remotes/origin/develop' into Branch_feature-instance # Conflicts: # plugins/observability-instance/InstanceExporter/src/main/resources/og_exporter.yml See merge request: openGaussythcs00001/openGauss-workbench!588 commit f1c4fc67fd5b8ade56c20dc31b368bd2ae59a896 Merge: 274c200a 804ff909 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Thu Aug 24 11:28:45 2023 +0800 Merge remote-tracking branch 'remotes/origin/develop' into Branch_feature-instance # Conflicts: # plugins/observability-instance/InstanceExporter/src/main/resources/og_exporter.yml commit 274c200a915750c1ebec54d0937b836ec51b980b Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Thu Aug 24 11:14:14 2023 +0800 session修改,代码清理 commit 804ff90981046c349e9818601c256d04ddcd2caa Merge: c29ab69a dd2a5867 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Thu Aug 24 10:51:40 2023 +0800 merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" 提测前修复问题 Created-by: zhangcheng Author-id: 7119759 MR-id: 7238092 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "develop-zhangcheng-0930" into "develop" 提测前修复问题 See merge request: openGaussythcs00001/openGauss-workbench!585 commit dd2a5867e4afc5591d64b3b4c70c732b05cf7f33 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Thu Aug 24 10:47:15 2023 +0800 提测前修复问题 commit bea0b5498276fb30d98a624cef7ab46b31d04aaa Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Thu Aug 24 09:52:20 2023 +0800 移除无效测试 commit 9eef94859eb627096a03f204e67825c11b12184d Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Thu Aug 24 09:40:44 2023 +0800 移除旧metric,精简包 commit c29ab69aaf589ed3520b707167cd102876aa66c5 Merge: be4dbbde 96ffef9b Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Thu Aug 24 08:33:26 2023 +0800 merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, wdr分析 Created-by: wuyuebin Author-id: 7158405 MR-id: 7237993 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, wdr分析 See merge request: openGaussythcs00001/openGauss-workbench!584 commit 96ffef9bf157be9a9378d4df68510eb3e725ae2d Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Aug 23 18:56:35 2023 +0800 wdr分析 commit 387440f221ff02fc0cd79f3942060a6dbde437da Merge: b6fb6852 be4dbbde Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Aug 23 18:54:10 2023 +0800 Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930 commit 6451ed7b430b82fcdfbc63c4f6e650f8a0955365 Merge: 9d39044e be4dbbde Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Wed Aug 23 17:17:19 2023 +0800 merge develop into develop-930-lm merge "develop" into "develop-930-lm" repair data-studio, Merge remote-tracking branch 'origin/master', Merge remote-tracking branch 'origin/master', !369 业务开发-列问题回滚 Merge pull request !369 from 吴雨霖/master, 增加websocket默认消息大小，取消正则表达式判断条件, !370 增加websocket消息大小，取消迁移正则表达式文本限制 Merge pull request !370 from 王亚龙/master, 修改正则表达式判断条件, !371 修改正则表达式判断条件 Merge pull request !371 from 王亚龙/master, 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off, !373 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off Merge pull request !373 from 王亚龙/master, 杨子浩 930 实例监控前端代码, 第三方通知——snmp通知方式, Merge branch 'master' of https://gitee.com/opengauss/openGauss-workbench, repair druid config, !377 [bugfix] 修复druid没有检查直接使用线程池链接的问题 Merge pull request !377 from 周斌/master, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 屏蔽部分单元测试, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" 第三方通知——snmp通知方式, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 屏蔽部分单元测试 Created-by: wuyuebin Author-id: 7158405 MR-id: 7236880 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" 第三方通知——snmp通知方式, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 屏蔽部分单元测试 See merge request: openGaussythcs00001/openGauss-workbench!569, web-ds支持匿名块调试, 单元测试及代码优化, 调整查看用户角色功能, 视图、新增角色、删除角色, 匿名块调试readme修改, !372 web-ds支持匿名块调试 Merge pull request !372 from 李秦朗/master, !379 web-ds匿名块调试readme修改 Merge pull request !379 from 李秦朗/readme, Test覆盖率, merge develop-zwr into develop merge "develop-zwr" into "develop" 调整查看用户角色功能 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7237663 Commit-by: zhouwenruo Merged-by: zhangcheng Description: merge "develop-zwr" into "develop" 调整查看用户角色功能 See merge request: openGaussythcs00001/openGauss-workbench!571, 社区pr代码修改, 合并社区代码, merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" 视图、新增角色、删除角色, 社区pr代码修改 Created-by: zhangcheng Author-id: 7119759 MR-id: 7237720 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "develop-zhangcheng-0930" into "develop" 视图、新增角色、删除角色, 社区pr代码修改 See merge request: openGaussythcs00001/openGauss-workbench!573, merge develop-zwr into develop merge "develop-zwr" into "develop" 合并社区代码 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7237730 Commit-by: zhouwenruo Merged-by: zhangcheng Description: merge "develop-zwr" into "develop" 合并社区代码 See merge request: openGaussythcs00001/openGauss-workbench!574, merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 实例监控前端代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7237690 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 实例监控前端代码 See merge request: openGaussythcs00001/openGauss-workbench!572, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" 单元测试及代码优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7237184 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" 单元测试及代码优化 See merge request: openGaussythcs00001/openGauss-workbench!570, 杨子浩 930 集群监控代码, 杨子浩 930 集群监控 增加刷新按钮, Merge remote-tracking branch 'origin/release' into develop-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/debug/AsyncHelper.java # plugins/data-studio/web-ui/src/components/terminal-editor/createTemplate.ts # plugins/data-studio/web-ui/src/layout/Sidebar/index.vue, merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 集群监控代码, 杨子浩 930 集群监控 增加刷新按钮 Created-by: yangzihao Author-id: 7119754 MR-id: 7237763 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 集群监控代码, 杨子浩 930 集群监控 增加刷新按钮 See merge request: openGaussythcs00001/openGauss-workbench!579, merge develop-zwr into develop merge "develop-zwr" into "develop" repair data-studio, Merge remote-tracking branch 'origin/master', Merge remote-tracking branch 'origin/master', !369 业务开发-列问题回滚 Merge pull request !369 from 吴雨霖/master, 增加websocket默认消息大小，取消正则表达式判断条件, !370 增加websocket消息大小，取消迁移正则表达式文本限制 Merge pull request !370 from 王亚龙/master, 修改正则表达式判断条件, !371 修改正则表达式判断条件 Merge pull request !371 from 王亚龙/master, 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off, !373 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off Merge pull request !373 from 王亚龙/master, Merge branch 'master' of https://gitee.com/opengauss/openGauss-workbench, repair druid config, !377 [bugfix] 修复druid没有检查直接使用线程池链接的问题 Merge pull request !377 from 周斌/master, web-ds支持匿名块调试, 匿名块调试readme修改, !372 web-ds支持匿名块调试 Merge pull request !372 from 李秦朗/master, !379 web-ds匿名块调试readme修改 Merge pull request !379 from 李秦朗/readme, Merge remote-t Created-by: luomeng Author-id: 7119743 MR-id: 7237931 Commit-by: yangzihao;zhouwenruo;Zihao Yang;zhangcheng;opengauss_bot;li-qinlang;wuyuebin;justbk;wangyl Merged-by: luomeng Description: merge "develop" into "develop-930-lm" repair data-studio, Merge remote-tracking branch 'origin/master', Merge remote-tracking branch 'origin/master', !369 业务开发-列问题回滚 Merge pull request !369 from 吴雨霖/master, 增加websocket默认消息大小，取消正则表达式判断条件, !370 增加websocket消息大小，取消迁移正则表达式文本限制 Merge pull request !370 from 王亚龙/master, 修改正则表达式判断条件, !371 修改正则表达式判断条件 Merge pull request !371 from 王亚龙/master, 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off, !373 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off Merge pull request !373 from 王亚龙/master, 杨子浩 930 实例监控前端代码, 第三方通知——snmp通知方式, Merge branch 'master' of https://gitee.com/opengauss/openGauss-workbench, repair druid config, !377 [bugfix] 修复druid没有检查直接使用线程池链接的问题 Merge pull request !377 from 周斌/master, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 屏蔽部分单元测试, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" 第三方通知——snmp通知方式, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 屏蔽部分单元测试 Created-by: wuyuebin Author-id: 7158405 MR-id: 7236880 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" 第三方通知——snmp通知方式, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 屏蔽部分单元测试 See merge request: openGaussythcs00001/openGauss-workbench!569, web-ds支持匿名块调试, 单元测试及代码优化, 调整查看用户角色功能, 视图、新增角色、删除角色, 匿名块调试readme修改, !372 web-ds支持匿名块调试 Merge pull request !372 from 李秦朗/master, !379 web-ds匿名块调试readme修改 Merge pull request !379 from 李秦朗/readme, Test覆盖率, merge develop-zwr into develop merge "develop-zwr" into "develop" 调整查看用户角色功能 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7237663 Commit-by: zhouwenruo Merged-by: zhangcheng Description: merge "develop-zwr" into "develop" 调整查看用户角色功能 See merge request: openGaussythcs00001/openGauss-workbench!571, 社区pr代码修改, 合并社区代码, merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" 视图、新增角色、删除角色, 社区pr代码修改 Created-by: zhangcheng Author-id: 7119759 MR-id: 7237720 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "develop-zhangcheng-0930" into "develop" 视图、新增角色、删除角色, 社区pr代码修改 See merge request: openGaussythcs00001/openGauss-workbench!573, merge develop-zwr into develop merge "develop-zwr" into "develop" 合并社区代码 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7237730 Commit-by: zhouwenruo Merged-by: zhangcheng Description: merge "develop-zwr" into "develop" 合并社区代码 See merge request: openGaussythcs00001/openGauss-workbench!574, merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 实例监控前端代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7237690 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 实例监控前端代码 See merge request: openGaussythcs00001/openGauss-workbench!572, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" 单元测试及代码优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7237184 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" 单元测试及代码优化 See merge request: openGaussythcs00001/openGauss-workbench!570, 杨子浩 930 集群监控代码, 杨子浩 930 集群监控 增加刷新按钮, Merge remote-tracking branch 'origin/release' into develop-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/debug/AsyncHelper.java # plugins/data-studio/web-ui/src/components/terminal-editor/createTemplate.ts # plugins/data-studio/web-ui/src/layout/Sidebar/index.vue, merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 集群监控代码, 杨子浩 930 集群监控 增加刷新按钮 Created-by: yangzihao Author-id: 7119754 MR-id: 7237763 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 集群监控代码, 杨子浩 930 集群监控 增加刷新按钮 See merge request: openGaussythcs00001/openGauss-workbench!579, merge develop-zwr into develop merge "develop-zwr" into "develop" repair data-studio, Merge remote-tracking branch 'origin/master', Merge remote-tracking branch 'origin/master', !369 业务开发-列问题回滚 Merge pull request !369 from 吴雨霖/master, 增加websocket默认消息大小，取消正则表达式判断条件, !370 增加websocket消息大小，取消迁移正则表达式文本限制 Merge pull request !370 from 王亚龙/master, 修改正则表达式判断条件, !371 修改正则表达式判断条件 Merge pull request !371 from 王亚龙/master, 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off, !373 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off Merge pull request !373 from 王亚龙/master, Merge branch 'master' of https://gitee.com/opengauss/openGauss-workbench, repair druid config, !377 [bugfix] 修复druid没有检查直接使用线程池链接的问题 Merge pull request !377 from 周斌/master, web-ds支持匿名块调试, 匿名块调试readme修改, !372 web-ds支持匿名块调试 Merge pull request !372 from 李秦朗/master, !379 web-ds匿名块调试readme修改 Merge pull request !379 from 李秦朗/readme, Merge remote-t See merge request: openGaussythcs00001/openGauss-workbench!583 commit be4dbbde1f969d0bc4d423d3af859394b1351884 Merge: a7669fa7 9d39044e Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Wed Aug 23 17:16:28 2023 +0800 merge develop-930-lm into develop merge "develop-930-lm" into "develop" merge develop into develop-930-lm merge "develop" into "develop-930-lm" 服务器管理去除多余的代码, 修复连接弹窗重置的逻辑, 完善国际化翻译，增加日志说明, 解决全局配置无法打开的问题, 提交智能运维630代码, 历史数据诊断前端修改, 修复历史数据诊断前端BUG, 历史数据和实例监控BUG修复, !273 【业务开发】- 连接弹窗等bug修复 Merge pull request !273 from sweet365/master, !277 智能运维模块630需求内容，含实例监控插件、SQL诊断插件、告警通知插件 Merge pull request !277 from 杨子浩/master, codecheck, !281 智能运维模块630告警通知需求内容 Merge pull request !281 from wuyuebin/master, codecheck, !282 智能运维模块630告警通知需求内容 Merge pull request !282 from wuyuebin/master, 告警接口过滤, !283 过滤prometheus发送告警信息的告警接口 Merge pull request !283 from wuyuebin/master, !274 完善迁移批量安装页面国际化翻译，增加迁移日志说明 Merge pull request !274 from 王亚龙/master, 修改ds文档、增加连接弹窗主机输入限制、删除连接提示, 中英文国际化优化和README修改, 实例监控、历史数据诊断bug修复, !289 智能运维模块630需求内容实例监控、历史数据诊断模块bug修复与优化 Merge pull request !289 from Lmeng梦/master, 2, 实例监控bug修复, !292 业务开发-接口优化 Merge pull request !292 from 吴雨霖/master, !293 智能运维模块实例监控插件bug修复 Merge pull request !293 from Lmeng梦/master, 实例监控bug修复, !294 智能运维模块实例监控插件bug修复 Merge pull request !294 from 板栗/master, dataStudio修复bug, 修改样式和操作手册, !296 智能运维模块告警通知插件bug修复 Merge pull request !296 from wuyuebin/master, !295 业务开发插件bug修复 Merge pull request !295 from sweet365/master, 代码优化, 代码优化, !297 智能运维模块告警通知插件bug修复 Merge pull request !297 from wuyuebin/master, 依据新的参数配置列表，修改迁移前端画面判断, add support for auto add plugin to manage, !265 服务器管理去除多余的代码 Merge pull request !265 from 杨森/master, !298 依据新的参数配置列表，修改迁移前端画面校验判断 Merge pull request !298 from 王亚龙/master, 代码优化, 样式调整, !299 智能运维模块告警通知插件bug修复 Merge pull request !299 from wuyuebin/master, 代码优化, 去掉中文, !300 智能运维模块告警通知插件bug修复 Merge pull request !300 from wuyuebin/master, 调整实例监控首页, 告警接口调整, !302 智能运维模块告警通知插件bug修复 Merge pull request !302 from wuyuebin/master, !301 调整实例监控首页 Merge pull request !301 from Ponfy_Liu/master, !290 【bugfix】修复windows版本下安装插件图标丢失和visualtool-plugin下自动安装的插件不能被插件中心管理的问题 Merge pull request !290 from 周斌/auto_plugin, 修改循环注入, !303 业务开发-0630循环依赖修复 Merge pull request !303 from 吴雨霖/master, 将jsch升级到最新版本, !304 将jsch升级到最新版本，解决部分场景下OpenEuler无法连接的问题 Merge pull request !304 from 王亚龙/master, 修复实例监控前端BUG, !306 实例监控前端样式优化 Merge pull request !306 from Lmeng梦/master, 代码检查，bug修复, !307 智能运维模块告警通知插件bug修复 Merge pull request !307 from wuyuebin/master, 修复实例监控、智能诊断模块前端问题, 会话详情等待事件记录BUG修复, 优化阻塞会话树状图, 提交前端优化代码, !308 实例监控前端样式优化 Merge pull request !308 from Lmeng梦/master, alert-center更改为alert-monitor, codecheck, !310 智能运维模块告警通知插件名称由alert-center改为alert-monitor Merge pull request !310 from wuyuebin/master, Merge branch 'master' of https://gitee.com/sweet365/openGauss-workbench, 业务开发模块创建表增加保存提示, !311 业务开发模块创建表增加保存提示 Merge pull request !311 from sweet365/master, 修复实例监控和历史数据诊断前端BUG, 历史数据诊断-修复缺陷和优化代码逻辑, 修复codeCheck, codeCheck修改, 修改前端空格缩进, !313 历史数据诊断-修复缺陷和优化代码逻辑 Merge pull request !313 from Lmeng梦/master, !312 实例监控、历史数据诊断样式优化 Merge pull request !312 from Lmeng梦/master, 移除无效文件,添加等待事件空即考验,添加安装端口校验,修改指标bug, !316 实例监控 bugfix Merge pull request !316 from 板栗/master, 移除无效文件,添加等待事件空即考验,添加安装端口校验,修改指标bug, !319 实例监控 bugfix Merge pull request !319 from 板栗/master, 补充遗漏提交, !321 实例监控 bugfix Merge pull request !321 from 板栗/master, bug, 修复实例监控WDRBUG, 修改代码缩进codecheck, !323 实例监控WDR报告BUG修复 Merge pull request !323 from Lmeng梦/master, 告警bug修复, codecheck, !322 业务开发 - 0630bug修复 Merge pull request !322 from RoaneZhou/master, !325 智能运维模块告警通知插件bug修复 Merge pull request !325 from wuyuebin/master, 修改会话监控接口响应结构体, Merge remote-tracking branch 'origin/master', !326 修改会话监控接口响应结构体 Merge pull request !326 from Ponfy_Liu/master, 修复SQL诊断页面显示BUG, !327 修复SQL诊断页面显示样式BUG Merge pull request !327 from Lmeng梦/master, 安装采集器端口检测方法修改，慢sql指标采集修改,操作手册, !328 实例监控 bugfix Merge pull request !328 from 板栗/master, 抛异常问题修复, !329 业务开发-序列DDL预览显示问题 Merge pull request !329 from 吴雨霖/master, 对自定义的appcationRunner启动出现异常进行处理, 对自定义的appcationRunner启动出现异常进行处理, !331 智能运维模块告警通知插件bug修复 Merge pull request !331 from wuyuebin/master, 1.实例监控首页接口性能优化, codeCheck, codeCheck, codeCheck, !332 实例监控首页接口性能优化 Merge pull request !332 from Ponfy_Liu/master, 修复实例监控和智能诊断前端BUG, 修复codeCheck, 警告/代码整理, 慢sql指标修改,TCP指标修改,移除无效文件, !334 修复实例监控和SQL诊断页面显示样式BUG Merge pull request !334 from Lmeng梦/master, !333 实例监控 bugfix Merge pull request !333 from 板栗/master, 智能运维模块logo更新，告警插件操作文档更新及代码优化, !336 块智能运维模块logo更新，告警插件操作文档更新及代码优化 Merge pull request !336 from wuyuebin/master, 优化实例监控代码结构, codeCheck, !337 优化实例监控代码结构 Merge pull request !337 from Ponfy_Liu/master, 建表语句修复, !338 业务开发-创建表DDL预览显示问题 Merge pull request !338 from 吴雨霖/master, 【日志检索】上下文框未被隐藏, !339 智能运维模块日志检索插件bug修复 Merge pull request !339 from wuyuebin/master, 修复列描述问题, !340 业务开发-列描述显示问题 Merge pull request !340 from 吴雨霖/master, TOPSQL，点击SQLID进入到SQL诊断页面，创建诊断任务，SQL不能修改参数。, !341 智能运维模块bug修复 Merge pull request !341 from wuyuebin/master, 删除关闭窗口清掉断点接口, !342 【业务开发】函数/过程0630版本优化 Merge pull request !342 from RoaneZhou/master, WDR报告，未选实例点击快照管理，页数错误，点击页数会报错。, !343 智能运维模块实例监控插件bug修复 Merge pull request !343 from wuyuebin/master, 说明文档添加下载地址, !344 添加下载地址 Merge pull request !344 from 刘桐/master, 优化代码, codecheck, !345 智能运维模块告警通知插件bug修复 Merge pu Created-by: luomeng Author-id: 7119743 MR-id: 7236591 Commit-by: 罗梦;luomeng Merged-by: yangzihao Description: merge "develop-930-lm" into "develop" merge develop into develop-930-lm merge "develop" into "develop-930-lm" 服务器管理去除多余的代码, 修复连接弹窗重置的逻辑, 完善国际化翻译，增加日志说明, 解决全局配置无法打开的问题, 提交智能运维630代码, 历史数据诊断前端修改, 修复历史数据诊断前端BUG, 历史数据和实例监控BUG修复, !273 【业务开发】- 连接弹窗等bug修复 Merge pull request !273 from sweet365/master, !277 智能运维模块630需求内容，含实例监控插件、SQL诊断插件、告警通知插件 Merge pull request !277 from 杨子浩/master, codecheck, !281 智能运维模块630告警通知需求内容 Merge pull request !281 from wuyuebin/master, codecheck, !282 智能运维模块630告警通知需求内容 Merge pull request !282 from wuyuebin/master, 告警接口过滤, !283 过滤prometheus发送告警信息的告警接口 Merge pull request !283 from wuyuebin/master, !274 完善迁移批量安装页面国际化翻译，增加迁移日志说明 Merge pull request !274 from 王亚龙/master, 修改ds文档、增加连接弹窗主机输入限制、删除连接提示, 中英文国际化优化和README修改, 实例监控、历史数据诊断bug修复, !289 智能运维模块630需求内容实例监控、历史数据诊断模块bug修复与优化 Merge pull request !289 from Lmeng梦/master, 2, 实例监控bug修复, !292 业务开发-接口优化 Merge pull request !292 from 吴雨霖/master, !293 智能运维模块实例监控插件bug修复 Merge pull request !293 from Lmeng梦/master, 实例监控bug修复, !294 智能运维模块实例监控插件bug修复 Merge pull request !294 from 板栗/master, dataStudio修复bug, 修改样式和操作手册, !296 智能运维模块告警通知插件bug修复 Merge pull request !296 from wuyuebin/master, !295 业务开发插件bug修复 Merge pull request !295 from sweet365/master, 代码优化, 代码优化, !297 智能运维模块告警通知插件bug修复 Merge pull request !297 from wuyuebin/master, 依据新的参数配置列表，修改迁移前端画面判断, add support for auto add plugin to manage, !265 服务器管理去除多余的代码 Merge pull request !265 from 杨森/master, !298 依据新的参数配置列表，修改迁移前端画面校验判断 Merge pull request !298 from 王亚龙/master, 代码优化, 样式调整, !299 智能运维模块告警通知插件bug修复 Merge pull request !299 from wuyuebin/master, 代码优化, 去掉中文, !300 智能运维模块告警通知插件bug修复 Merge pull request !300 from wuyuebin/master, 调整实例监控首页, 告警接口调整, !302 智能运维模块告警通知插件bug修复 Merge pull request !302 from wuyuebin/master, !301 调整实例监控首页 Merge pull request !301 from Ponfy_Liu/master, !290 【bugfix】修复windows版本下安装插件图标丢失和visualtool-plugin下自动安装的插件不能被插件中心管理的问题 Merge pull request !290 from 周斌/auto_plugin, 修改循环注入, !303 业务开发-0630循环依赖修复 Merge pull request !303 from 吴雨霖/master, 将jsch升级到最新版本, !304 将jsch升级到最新版本，解决部分场景下OpenEuler无法连接的问题 Merge pull request !304 from 王亚龙/master, 修复实例监控前端BUG, !306 实例监控前端样式优化 Merge pull request !306 from Lmeng梦/master, 代码检查，bug修复, !307 智能运维模块告警通知插件bug修复 Merge pull request !307 from wuyuebin/master, 修复实例监控、智能诊断模块前端问题, 会话详情等待事件记录BUG修复, 优化阻塞会话树状图, 提交前端优化代码, !308 实例监控前端样式优化 Merge pull request !308 from Lmeng梦/master, alert-center更改为alert-monitor, codecheck, !310 智能运维模块告警通知插件名称由alert-center改为alert-monitor Merge pull request !310 from wuyuebin/master, Merge branch 'master' of https://gitee.com/sweet365/openGauss-workbench, 业务开发模块创建表增加保存提示, !311 业务开发模块创建表增加保存提示 Merge pull request !311 from sweet365/master, 修复实例监控和历史数据诊断前端BUG, 历史数据诊断-修复缺陷和优化代码逻辑, 修复codeCheck, codeCheck修改, 修改前端空格缩进, !313 历史数据诊断-修复缺陷和优化代码逻辑 Merge pull request !313 from Lmeng梦/master, !312 实例监控、历史数据诊断样式优化 Merge pull request !312 from Lmeng梦/master, 移除无效文件,添加等待事件空即考验,添加安装端口校验,修改指标bug, !316 实例监控 bugfix Merge pull request !316 from 板栗/master, 移除无效文件,添加等待事件空即考验,添加安装端口校验,修改指标bug, !319 实例监控 bugfix Merge pull request !319 from 板栗/master, 补充遗漏提交, !321 实例监控 bugfix Merge pull request !321 from 板栗/master, bug, 修复实例监控WDRBUG, 修改代码缩进codecheck, !323 实例监控WDR报告BUG修复 Merge pull request !323 from Lmeng梦/master, 告警bug修复, codecheck, !322 业务开发 - 0630bug修复 Merge pull request !322 from RoaneZhou/master, !325 智能运维模块告警通知插件bug修复 Merge pull request !325 from wuyuebin/master, 修改会话监控接口响应结构体, Merge remote-tracking branch 'origin/master', !326 修改会话监控接口响应结构体 Merge pull request !326 from Ponfy_Liu/master, 修复SQL诊断页面显示BUG, !327 修复SQL诊断页面显示样式BUG Merge pull request !327 from Lmeng梦/master, 安装采集器端口检测方法修改，慢sql指标采集修改,操作手册, !328 实例监控 bugfix Merge pull request !328 from 板栗/master, 抛异常问题修复, !329 业务开发-序列DDL预览显示问题 Merge pull request !329 from 吴雨霖/master, 对自定义的appcationRunner启动出现异常进行处理, 对自定义的appcationRunner启动出现异常进行处理, !331 智能运维模块告警通知插件bug修复 Merge pull request !331 from wuyuebin/master, 1.实例监控首页接口性能优化, codeCheck, codeCheck, codeCheck, !332 实例监控首页接口性能优化 Merge pull request !332 from Ponfy_Liu/master, 修复实例监控和智能诊断前端BUG, 修复codeCheck, 警告/代码整理, 慢sql指标修改,TCP指标修改,移除无效文件, !334 修复实例监控和SQL诊断页面显示样式BUG Merge pull request !334 from Lmeng梦/master, !333 实例监控 bugfix Merge pull request !333 from 板栗/master, 智能运维模块logo更新，告警插件操作文档更新及代码优化, !336 块智能运维模块logo更新，告警插件操作文档更新及代码优化 Merge pull request !336 from wuyuebin/master, 优化实例监控代码结构, codeCheck, !337 优化实例监控代码结构 Merge pull request !337 from Ponfy_Liu/master, 建表语句修复, !338 业务开发-创建表DDL预览显示问题 Merge pull request !338 from 吴雨霖/master, 【日志检索】上下文框未被隐藏, !339 智能运维模块日志检索插件bug修复 Merge pull request !339 from wuyuebin/master, 修复列描述问题, !340 业务开发-列描述显示问题 Merge pull request !340 from 吴雨霖/master, TOPSQL，点击SQLID进入到SQL诊断页面，创建诊断任务，SQL不能修改参数。, !341 智能运维模块bug修复 Merge pull request !341 from wuyuebin/master, 删除关闭窗口清掉断点接口, !342 【业务开发】函数/过程0630版本优化 Merge pull request !342 from RoaneZhou/master, WDR报告，未选实例点击快照管理，页数错误，点击页数会报错。, !343 智能运维模块实例监控插件bug修复 Merge pull request !343 from wuyuebin/master, 说明文档添加下载地址, !344 添加下载地址 Merge pull request !344 from 刘桐/master, 优化代码, codecheck, !345 智能运维模块告警通知插件bug修复 Merge pu See merge request: openGaussythcs00001/openGauss-workbench!568 commit 84ae1c908a8ecadf30d7e90f848ed4999f5f1642 Merge: 0c5de4d7 a7669fa7 Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Wed Aug 23 16:24:53 2023 +0800 merge develop into release merge "develop" into "release" 测试, merge "feature_wgb_test" into "develop" 测试, 测试, merge "feature_wgb_test" into "develop" 测试, 修改加长连接名称长度限制, merge "develop_wyl" into "develop" 修改加长连接名称长度限制, merge "develop" into "master" 测试, merge "feature_wgb_test" into "develop" 测试, 测试, merge "feature_wgb_test" into "develop" 测试, 修改加长连接名称长度限制, merge "develop_wyl" into "develop" 修改加长连接名称长度限制, 连接信息删除后重置, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, sql诊断_%IOWait高-分布图_数据显示被遮挡, sql诊断_%IOWait高-分布图_数据显示被遮挡, 重新设计AppStore的lastestConnectDatabase, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, 修改文案,添加历史数据源, 添加压缩包, SQL诊断-国际化参数诊断, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, merge "bugfix_lm_20230321" into "develop" 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "feature-wyb" into "develop" 修改文案,添加历史数据源, 添加压缩包, SQL诊断-国际化参数诊断, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "develop" into "master" 连接信息删除后重置, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, sql诊断_%IOWait高-分布图_数据显示被遮挡, sql诊断_%IOWait高-分布图_数据显示被遮挡, 重新设计AppStore的lastestConnectDatabase, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, merge "bugfix_lm_20230321" into "develop" 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "feature-wyb" into "develop" 修改文案,添加历史数据源, 添加压缩包, SQL诊断-国际化参数诊断, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, merge "feature-wyb" into "develop" 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, merge "develop" into "master" 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, merge "feature-wyb" into "develop" 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, 日志检索-修复日志内容解析问题, merge "bugfix_lm_20230321" into "develop" 日志检索-修复日志内容解析问题, 添加unzip安装/校验, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, 添加旧数据处理, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, merge "feature-wyb" into "develop" merge "develop" into "master" 连接信息删除后重置, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, sql诊断_%IOWait高-分布图_数据显示被遮挡, sql诊断_%IOWait高-分布图_数据显示被遮挡, 重新设计AppStore的lastestConnectDatabase, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, merge "bugfix_lm_20230321" into "develop" 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "feature-wyb" into "develop" 修改文案,添加历史数据源, 添加压缩包, SQL诊断-国际化参数诊断, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'devel Created-by: zhouwenruo Author-id: 7119763 MR-id: 7237874 Commit-by: zhangcheng;yangzihao;Zihao Yang;张昊宇;luomeng;罗梦;wuyuebin;liupengfei;zengseliang;zhouwenruo;wuyulin;hw73730920/wuguobiao;user;wuguobiao;opengauss-bot Merged-by: wuguobiao Description: merge "develop" into "release" 测试, merge "feature_wgb_test" into "develop" 测试, 测试, merge "feature_wgb_test" into "develop" 测试, 修改加长连接名称长度限制, merge "develop_wyl" into "develop" 修改加长连接名称长度限制, merge "develop" into "master" 测试, merge "feature_wgb_test" into "develop" 测试, 测试, merge "feature_wgb_test" into "develop" 测试, 修改加长连接名称长度限制, merge "develop_wyl" into "develop" 修改加长连接名称长度限制, 连接信息删除后重置, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, sql诊断_%IOWait高-分布图_数据显示被遮挡, sql诊断_%IOWait高-分布图_数据显示被遮挡, 重新设计AppStore的lastestConnectDatabase, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, 修改文案,添加历史数据源, 添加压缩包, SQL诊断-国际化参数诊断, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, merge "bugfix_lm_20230321" into "develop" 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "feature-wyb" into "develop" 修改文案,添加历史数据源, 添加压缩包, SQL诊断-国际化参数诊断, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "develop" into "master" 连接信息删除后重置, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, sql诊断_%IOWait高-分布图_数据显示被遮挡, sql诊断_%IOWait高-分布图_数据显示被遮挡, 重新设计AppStore的lastestConnectDatabase, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, merge "bugfix_lm_20230321" into "develop" 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "feature-wyb" into "develop" 修改文案,添加历史数据源, 添加压缩包, SQL诊断-国际化参数诊断, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, merge "feature-wyb" into "develop" 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, merge "develop" into "master" 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, merge "feature-wyb" into "develop" 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, 日志检索-修复日志内容解析问题, merge "bugfix_lm_20230321" into "develop" 日志检索-修复日志内容解析问题, 添加unzip安装/校验, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, 添加旧数据处理, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 日志检索_搜索后鼠标移至实例ID悬浮显示_出现抖动, merge "feature-wyb" into "develop" merge "develop" into "master" 连接信息删除后重置, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, sql诊断_%IOWait高-分布图_数据显示被遮挡, sql诊断_%IOWait高-分布图_数据显示被遮挡, 重新设计AppStore的lastestConnectDatabase, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, merge "bugfix_lm_20230321" into "develop" 实例监控-国际化系统配置参数, 日志检索-修复定时任务、上下文检索缺陷, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge "feature-wyb" into "develop" 修改文案,添加历史数据源, 添加压缩包, SQL诊断-国际化参数诊断, Merge branch 'master' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 系统资源_磁盘读写速率与系统负载中数据差异大 【中英文】sql诊断详情_下拉列表建议项显示语言不对, Merge branch 'devel See merge request: openGaussythcs00001/openGauss-workbench!580 commit a7669fa750adf9af7913ac8bb801561d7dffb147 Merge: f77a3881 35be156f Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Wed Aug 23 16:22:37 2023 +0800 merge develop-zwr into develop merge "develop-zwr" into "develop" repair data-studio, Merge remote-tracking branch 'origin/master', Merge remote-tracking branch 'origin/master', !369 业务开发-列问题回滚 Merge pull request !369 from 吴雨霖/master, 增加websocket默认消息大小，取消正则表达式判断条件, !370 增加websocket消息大小，取消迁移正则表达式文本限制 Merge pull request !370 from 王亚龙/master, 修改正则表达式判断条件, !371 修改正则表达式判断条件 Merge pull request !371 from 王亚龙/master, 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off, !373 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off Merge pull request !373 from 王亚龙/master, Merge branch 'master' of https://gitee.com/opengauss/openGauss-workbench, repair druid config, !377 [bugfix] 修复druid没有检查直接使用线程池链接的问题 Merge pull request !377 from 周斌/master, web-ds支持匿名块调试, 匿名块调试readme修改, !372 web-ds支持匿名块调试 Merge pull request !372 from 李秦朗/master, !379 web-ds匿名块调试readme修改 Merge pull request !379 from 李秦朗/readme, Merge remote-tracking branch 'origin/release' into develop-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/debug/AsyncHelper.java # plugins/data-studio/web-ui/src/components/terminal-editor/createTemplate.ts # plugins/data-studio/web-ui/src/layout/Sidebar/index.vue Created-by: zhouwenruo Author-id: 7119763 MR-id: 7237879 Commit-by: zhouwenruo;opengauss_bot;li-qinlang;justbk;wangyl Merged-by: zhouwenruo Description: merge "develop-zwr" into "develop" repair data-studio, Merge remote-tracking branch 'origin/master', Merge remote-tracking branch 'origin/master', !369 业务开发-列问题回滚 Merge pull request !369 from 吴雨霖/master, 增加websocket默认消息大小，取消正则表达式判断条件, !370 增加websocket消息大小，取消迁移正则表达式文本限制 Merge pull request !370 from 王亚龙/master, 修改正则表达式判断条件, !371 修改正则表达式判断条件 Merge pull request !371 from 王亚龙/master, 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off, !373 解决关闭其他标签时打开新的标签的问题，修改应用数据库连接为batchMode off Merge pull request !373 from 王亚龙/master, Merge branch 'master' of https://gitee.com/opengauss/openGauss-workbench, repair druid config, !377 [bugfix] 修复druid没有检查直接使用线程池链接的问题 Merge pull request !377 from 周斌/master, web-ds支持匿名块调试, 匿名块调试readme修改, !372 web-ds支持匿名块调试 Merge pull request !372 from 李秦朗/master, !379 web-ds匿名块调试readme修改 Merge pull request !379 from 李秦朗/readme, Merge remote-tracking branch 'origin/release' into develop-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/debug/AsyncHelper.java # plugins/data-studio/web-ui/src/components/terminal-editor/createTemplate.ts # plugins/data-studio/web-ui/src/layout/Sidebar/index.vue See merge request: openGaussythcs00001/openGauss-workbench!581 commit f77a38812f9f4a4be8b7cc593453bff26855f930 Merge: 47a32bac 01a75cbc Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Wed Aug 23 16:20:52 2023 +0800 merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 集群监控代码, 杨子浩 930 集群监控 增加刷新按钮 Created-by: yangzihao Author-id: 7119754 MR-id: 7237763 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 集群监控代码, 杨子浩 930 集群监控 增加刷新按钮 See merge request: openGaussythcs00001/openGauss-workbench!579 commit 35be156f20d73a70fc3ed173971effa6d9bde9c4 Merge: ea66e4cb 0c5de4d7 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Wed Aug 23 16:17:49 2023 +0800 Merge remote-tracking branch 'origin/release' into develop-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/debug/AsyncHelper.java # plugins/data-studio/web-ui/src/components/terminal-editor/createTemplate.ts # plugins/data-studio/web-ui/src/layout/Sidebar/index.vue commit 29443c9b3c319062c9602c4a307e680796ee4bef Author: liupengfei <liupengfei@ncti-gba.cn> Date: Wed Aug 23 11:29:33 2023 +0800 集群监控修改变量类型 commit 01a75cbc0479164528d6487fad5a85132591529d Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Wed Aug 23 11:29:07 2023 +0800 杨子浩 930 集群监控 增加刷新按钮 commit 30f21a8c0b5caf28cce1e7a3ffcaba3e935f3b24 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Wed Aug 23 11:24:06 2023 +0800 杨子浩 930 集群监控代码 commit 67fb797bf2b27f94e3e615aff605467bd4164969 Merge: 3c34e2e9 1fee98bc Author: liupengfei <liupengfei@ncti-gba.cn> Date: Wed Aug 23 11:22:43 2023 +0800 Merge remote-tracking branch 'origin/feature-instance' into feature-instance commit 3c34e2e9faa8fe7f41057178d4a8222e6bf7f572 Merge: 7e5587d1 38a226e7 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Wed Aug 23 11:22:10 2023 +0800 Merge branch 'feature-instance-lpf' into feature-instance commit 38a226e7e99ef6ef704131426899d0954dfdd1b0 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Wed Aug 23 11:21:20 2023 +0800 集群监控 commit 1fee98bcc24fe083e7f923db895db1679f5d51db Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Aug 23 11:20:33 2023 +0800 test commit 47a32bac93c7f8c73abd1f9dae53ed8f05c2ae29 Merge: c8803f2e f5137a89 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Wed Aug 23 11:16:54 2023 +0800 merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" 单元测试及代码优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7237184 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" 单元测试及代码优化 See merge request: openGaussythcs00001/openGauss-workbench!570 commit c8803f2efa9dc606df43881eac409494d687188c Merge: ea66e4cb 49f3cd65 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Wed Aug 23 11:16:27 2023 +0800 merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 实例监控前端代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7237690 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 实例监控前端代码 See merge request: openGaussythcs00001/openGauss-workbench!572 commit ea66e4cbbfeb4eeee728635fc356933154e56554 Merge: daa493c5 575535e8 Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Wed Aug 23 10:50:37 2023 +0800 merge develop-zwr into develop merge "develop-zwr" into "develop" 合并社区代码 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7237730 Commit-by: zhouwenruo Merged-by: zhangcheng Description: merge "develop-zwr" into "develop" 合并社区代码 See merge request: openGaussythcs00001/openGauss-workbench!574 commit daa493c51f6032541bad4c5c032095a03d474148 Merge: 48c1f99c 60bd7015 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Wed Aug 23 10:49:58 2023 +0800 merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" 视图、新增角色、删除角色, 社区pr代码修改 Created-by: zhangcheng Author-id: 7119759 MR-id: 7237720 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "develop-zhangcheng-0930" into "develop" 视图、新增角色、删除角色, 社区pr代码修改 See merge request: openGaussythcs00001/openGauss-workbench!573 commit 575535e8e18652b9c30e773ed037b6656a85e364 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Wed Aug 23 10:48:24 2023 +0800 合并社区代码 commit 60bd7015c84903485c0eb75f75b33e75d5fff35a Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Wed Aug 23 10:42:13 2023 +0800 社区pr代码修改 commit b6fb6852e430cbe3cd113e3ea98660413fce9ba2 Merge: f5137a89 48c1f99c Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Aug 23 10:16:08 2023 +0800 Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930 commit 48c1f99cb6d8b6945ecf20b9e1bcc0b712441737 Merge: 934d24c5 461e21ed Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Wed Aug 23 10:03:24 2023 +0800 merge develop-zwr into develop merge "develop-zwr" into "develop" 调整查看用户角色功能 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7237663 Commit-by: zhouwenruo Merged-by: zhangcheng Description: merge "develop-zwr" into "develop" 调整查看用户角色功能 See merge request: openGaussythcs00001/openGauss-workbench!571 commit 461e21edbfaafe6cc6d572487d2f470fa3bdb78e Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Wed Aug 23 09:56:33 2023 +0800 Test覆盖率 commit 92413265c0652d60819692da9b1749eae1536776 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Tue Aug 22 16:17:40 2023 +0800 视图、新增角色、删除角色 commit 006da4f29b774890f0edd82275e96e76387079d4 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Tue Aug 22 11:38:59 2023 +0800 调整查看用户角色功能 commit f7d01b31859ffd216b4133a74f92927cd32e0879 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Mon Aug 21 21:12:50 2023 +0800 集群监控 commit f5137a89a47ae92f9c02124cee10eab1bccc7320 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Aug 21 17:50:48 2023 +0800 单元测试及代码优化 commit 37ad300b73f015932e0df124324219b7746bc0ed Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon Aug 21 17:37:29 2023 +0800 WDR版权 commit 934d24c5072eadd6b1eeef12651653a55cf68dee Merge: 455496df edfa9837 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Mon Aug 21 10:37:35 2023 +0800 merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" 第三方通知——snmp通知方式, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 屏蔽部分单元测试 Created-by: wuyuebin Author-id: 7158405 MR-id: 7236880 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" 第三方通知——snmp通知方式, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 屏蔽部分单元测试 See merge request: openGaussythcs00001/openGauss-workbench!569 commit edfa98378387e439fdd9559d72f3e6820e8310a2 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Aug 21 09:08:38 2023 +0800 屏蔽部分单元测试 commit 4a23ccf79e1ba86a3dc67e825ffb106f10bf9431 Merge: 4f8f7203 455496df Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Aug 21 09:07:34 2023 +0800 Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930 commit 4f8f72032bca0bf8a92860475a4cebf05ff2ae49 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Sun Aug 20 11:20:25 2023 +0800 第三方通知——snmp通知方式 commit 0dbae86d2d0136d4ff0a2b6671605aac9c4f43d8 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Aug 18 15:40:00 2023 +0800 wdr接口 commit 9d39044e5b754ad64becfa52749bae38474ba059 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Fri Aug 18 15:29:05 2023 +0800 智能诊断930版本代码 commit cdbf840273193bfa697ee42e7cdfe793f251a66d Author: 罗梦 <luomeng@ncti-gba.cn> Date: Fri Aug 18 15:24:26 2023 +0800 智能诊断930版本代码 commit 909c791c85030a46d72075844856a63932d4143f Merge: d3f84f81 455496df Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Fri Aug 18 15:12:44 2023 +0800 merge develop into develop-930-lm merge "develop" into "develop-930-lm" 告警监控优化代码，添加校验功能、告警模板规则启动/停止功能, 修增视图编辑功能, merge develop-zwr into develop merge "develop-zwr" into "develop" 修增视图编辑功能 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7236381 Commit-by: zhouwenruo Merged-by: zhangcheng Description: merge "develop-zwr" into "develop" 修增视图编辑功能 See merge request: openGaussythcs00001/openGauss-workbench!565, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" 告警监控优化代码，添加校验功能、告警模板规则启动/停止功能 Created-by: wuyuebin Author-id: 7158405 MR-id: 7235998 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" 告警监控优化代码，添加校验功能、告警模板规则启动/停止功能 See merge request: openGaussythcs00001/openGauss-workbench!563, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 第三方通知——http通知方式, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 第三方通知——http通知方式 Created-by: wuyuebin Author-id: 7158405 MR-id: 7236474 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 第三方通知——http通知方式 See merge request: openGaussythcs00001/openGauss-workbench!566 Created-by: luomeng Author-id: 7119743 MR-id: 7236583 Commit-by: yangzihao;wuyuebin;zhangcheng;zhouwenruo Merged-by: luomeng Description: merge "develop" into "develop-930-lm" 告警监控优化代码，添加校验功能、告警模板规则启动/停止功能, 修增视图编辑功能, merge develop-zwr into develop merge "develop-zwr" into "develop" 修增视图编辑功能 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7236381 Commit-by: zhouwenruo Merged-by: zhangcheng Description: merge "develop-zwr" into "develop" 修增视图编辑功能 See merge request: openGaussythcs00001/openGauss-workbench!565, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" 告警监控优化代码，添加校验功能、告警模板规则启动/停止功能 Created-by: wuyuebin Author-id: 7158405 MR-id: 7235998 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" 告警监控优化代码，添加校验功能、告警模板规则启动/停止功能 See merge request: openGaussythcs00001/openGauss-workbench!563, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 第三方通知——http通知方式, merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 第三方通知——http通知方式 Created-by: wuyuebin Author-id: 7158405 MR-id: 7236474 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 第三方通知——http通知方式 See merge request: openGaussythcs00001/openGauss-workbench!566 See merge request: openGaussythcs00001/openGauss-workbench!567 commit 49f3cd654414a5bc796a59eed30bbd7a8e89cf75 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Fri Aug 18 14:40:42 2023 +0800 杨子浩 930 实例监控前端代码 commit 455496dfd204c7161c5cf269fbd600eb2f87a858 Merge: 8f6e7424 3853ac9e Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Fri Aug 18 09:33:57 2023 +0800 merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 第三方通知——http通知方式 Created-by: wuyuebin Author-id: 7158405 MR-id: 7236474 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930, 第三方通知——http通知方式 See merge request: openGaussythcs00001/openGauss-workbench!566 commit 3853ac9ec45a98d7fa4dd43d5327c8832b1117ad Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Fri Aug 18 09:11:36 2023 +0800 第三方通知——http通知方式 commit 94767930101abd72d3efce97c2a490d13fc85fd6 Merge: 45c81a4e 8f6e7424 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Fri Aug 18 09:09:28 2023 +0800 Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930 commit 7e5587d1cbe7644101c76f2f6646280cbf32e04d Merge: 8939c764 1491d031 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Fri Aug 18 09:08:30 2023 +0800 Merge remote-tracking branch 'origin/feature-instance' into feature-instance commit 8939c7647ee1495a74ac74e426532d5ff90ad5cc Merge: 5ec21e4c b121129c Author: liupengfei <liupengfei@ncti-gba.cn> Date: Fri Aug 18 09:07:58 2023 +0800 Merge branch 'feature-instance-lpf' into feature-instance commit b121129ceea2bbf57a3427959ed93ef8ded513b1 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Fri Aug 18 09:07:07 2023 +0800 新版集群监控-集群详情 commit 8f6e7424bee8a21fe75b26db375c423b5d0ee882 Merge: 489584ea 38a4d6ef Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Fri Aug 18 09:04:33 2023 +0800 merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" 告警监控优化代码，添加校验功能、告警模板规则启动/停止功能 Created-by: wuyuebin Author-id: 7158405 MR-id: 7235998 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" 告警监控优化代码，添加校验功能、告警模板规则启动/停止功能 See merge request: openGaussythcs00001/openGauss-workbench!563 commit 45c81a4e22b56b5902f6dfca9dfa67ccf5b0a639 Merge: 38a4d6ef 489584ea Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Fri Aug 18 08:55:45 2023 +0800 Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop-wyb-930 commit 489584ea838101adf1c95bb2e5f15358a8e01c32 Merge: d95f6b82 2acfd6ed Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Thu Aug 17 17:54:45 2023 +0800 merge develop-zwr into develop merge "develop-zwr" into "develop" 修增视图编辑功能 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7236381 Commit-by: zhouwenruo Merged-by: zhangcheng Description: merge "develop-zwr" into "develop" 修增视图编辑功能 See merge request: openGaussythcs00001/openGauss-workbench!565 commit 2acfd6edabf307c64e3a4e91409f72422453daef Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu Aug 17 17:53:04 2023 +0800 修增视图编辑功能 commit 1491d0314fa4c770fa966ec45c5c1c665f4432d7 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Thu Aug 17 17:04:15 2023 +0800 线程号,系统日志路径 commit 438b5d3a33bba02417d9de1104fe063be5484c84 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Thu Aug 17 16:39:12 2023 +0800 修改节点属性 commit 5ec21e4cdbfeed3dad7ba548e805a6090bf1a291 Merge: abdd9ad2 b8936f3c Author: liupengfei <liupengfei@ncti-gba.cn> Date: Thu Aug 17 14:37:43 2023 +0800 Merge remote-tracking branch 'origin/feature-instance' into feature-instance commit abdd9ad21a1f173fb573ce9cbbb64bfd96f865f1 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Thu Aug 17 14:33:49 2023 +0800 新版集群监控-首页接口 commit d3f84f81da551dbfc24d1714e85528c195e49838 Merge: 30309011 d95f6b82 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Thu Aug 17 10:42:13 2023 +0800 merge develop into develop-930-lm merge "develop" into "develop-930-lm" 杨子浩 930 实例监控代码, 杨子浩 930 实例监控前端代码, 杨子浩 930 SQL诊断前端代码, 杨子浩 930 实例监控前端代码, merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 实例监控代码, 杨子浩 930 实例监控前端代码, 杨子浩 930 SQL诊断前端代码, 杨子浩 930 实例监控前端代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7235987 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 实例监控代码, 杨子浩 930 实例监控前端代码, 杨子浩 930 SQL诊断前端代码, 杨子浩 930 实例监控前端代码 See merge request: openGaussythcs00001/openGauss-workbench!562 Created-by: luomeng Author-id: 7119743 MR-id: 7236111 Commit-by: yangzihao;Zihao Yang Merged-by: luomeng Description: merge "develop" into "develop-930-lm" 杨子浩 930 实例监控代码, 杨子浩 930 实例监控前端代码, 杨子浩 930 SQL诊断前端代码, 杨子浩 930 实例监控前端代码, merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 实例监控代码, 杨子浩 930 实例监控前端代码, 杨子浩 930 SQL诊断前端代码, 杨子浩 930 实例监控前端代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7235987 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 实例监控代码, 杨子浩 930 实例监控前端代码, 杨子浩 930 SQL诊断前端代码, 杨子浩 930 实例监控前端代码 See merge request: openGaussythcs00001/openGauss-workbench!562 See merge request: openGaussythcs00001/openGauss-workbench!564 commit 38a4d6ef89bb83e4c0fa16c0aa1438b3b62385ba Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Aug 16 17:51:57 2023 +0800 告警监控优化代码，添加校验功能、告警模板规则启动/停止功能 commit d95f6b826cd719556b85cf8fdcb2fffd7bdcb608 Merge: cde6ade6 b2483d51 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Wed Aug 16 17:45:41 2023 +0800 merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 实例监控代码, 杨子浩 930 实例监控前端代码, 杨子浩 930 SQL诊断前端代码, 杨子浩 930 实例监控前端代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7235987 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 实例监控代码, 杨子浩 930 实例监控前端代码, 杨子浩 930 SQL诊断前端代码, 杨子浩 930 实例监控前端代码 See merge request: openGaussythcs00001/openGauss-workbench!562 commit b2483d5131585d9599f1c5faa337f4c30d915ecd Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Wed Aug 16 17:28:41 2023 +0800 杨子浩 930 实例监控前端代码 commit eb77eb17cf15c626457f09ce4038ebc11e3269ad Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Wed Aug 16 17:28:22 2023 +0800 杨子浩 930 SQL诊断前端代码 commit 03c590f6a358aa2cc828749a1cdcfeb412e23331 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Wed Aug 16 17:27:09 2023 +0800 杨子浩 930 实例监控前端代码 commit ed62fd7c02bfd6f943a375a28ea5d02b23734b5b Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Wed Aug 16 17:06:23 2023 +0800 杨子浩 930 实例监控代码 commit b8936f3c7439962c2832696537169bdf2a43a4c5 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Aug 16 16:16:59 2023 +0800 等待事件修改,top结果修改 commit 13f320f69cfa3decc20ab009b840a7f74c888bda Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Aug 16 10:47:57 2023 +0800 CPU部分指标修正,sqlid修改,topsql指标修改 commit 6e45d969b2ebb76443ba62483397ae8f41e9e2be Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Aug 15 18:11:52 2023 +0800 指标修改,修改等待事件接口,添加详情-系统资源 commit 303090115a4abec61432629157d220b68e170425 Merge: 18c6910d cde6ade6 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Tue Aug 15 15:59:51 2023 +0800 merge develop into develop-930-lm merge "develop" into "develop-930-lm" 服务器管理去除多余的代码, 修复连接弹窗重置的逻辑, 完善国际化翻译，增加日志说明, 解决全局配置无法打开的问题, 提交智能运维630代码, 历史数据诊断前端修改, 修复历史数据诊断前端BUG, 历史数据和实例监控BUG修复, !273 【业务开发】- 连接弹窗等bug修复 Merge pull request !273 from sweet365/master, !277 智能运维模块630需求内容，含实例监控插件、SQL诊断插件、告警通知插件 Merge pull request !277 from 杨子浩/master, codecheck, !281 智能运维模块630告警通知需求内容 Merge pull request !281 from wuyuebin/master, codecheck, !282 智能运维模块630告警通知需求内容 Merge pull request !282 from wuyuebin/master, 告警接口过滤, !283 过滤prometheus发送告警信息的告警接口 Merge pull request !283 from wuyuebin/master, !274 完善迁移批量安装页面国际化翻译，增加迁移日志说明 Merge pull request !274 from 王亚龙/master, 修改ds文档、增加连接弹窗主机输入限制、删除连接提示, 中英文国际化优化和README修改, 实例监控、历史数据诊断bug修复, !289 智能运维模块630需求内容实例监控、历史数据诊断模块bug修复与优化 Merge pull request !289 from Lmeng梦/master, 2, 实例监控bug修复, !292 业务开发-接口优化 Merge pull request !292 from 吴雨霖/master, !293 智能运维模块实例监控插件bug修复 Merge pull request !293 from Lmeng梦/master, 实例监控bug修复, !294 智能运维模块实例监控插件bug修复 Merge pull request !294 from 板栗/master, dataStudio修复bug, 修改样式和操作手册, !296 智能运维模块告警通知插件bug修复 Merge pull request !296 from wuyuebin/master, !295 业务开发插件bug修复 Merge pull request !295 from sweet365/master, 代码优化, 代码优化, !297 智能运维模块告警通知插件bug修复 Merge pull request !297 from wuyuebin/master, 依据新的参数配置列表，修改迁移前端画面判断, add support for auto add plugin to manage, !265 服务器管理去除多余的代码 Merge pull request !265 from 杨森/master, !298 依据新的参数配置列表，修改迁移前端画面校验判断 Merge pull request !298 from 王亚龙/master, 代码优化, 样式调整, !299 智能运维模块告警通知插件bug修复 Merge pull request !299 from wuyuebin/master, 代码优化, 去掉中文, !300 智能运维模块告警通知插件bug修复 Merge pull request !300 from wuyuebin/master, 调整实例监控首页, 告警接口调整, !302 智能运维模块告警通知插件bug修复 Merge pull request !302 from wuyuebin/master, !301 调整实例监控首页 Merge pull request !301 from Ponfy_Liu/master, !290 【bugfix】修复windows版本下安装插件图标丢失和visualtool-plugin下自动安装的插件不能被插件中心管理的问题 Merge pull request !290 from 周斌/auto_plugin, 修改循环注入, !303 业务开发-0630循环依赖修复 Merge pull request !303 from 吴雨霖/master, 将jsch升级到最新版本, !304 将jsch升级到最新版本，解决部分场景下OpenEuler无法连接的问题 Merge pull request !304 from 王亚龙/master, 修复实例监控前端BUG, !306 实例监控前端样式优化 Merge pull request !306 from Lmeng梦/master, 代码检查，bug修复, !307 智能运维模块告警通知插件bug修复 Merge pull request !307 from wuyuebin/master, 修复实例监控、智能诊断模块前端问题, 会话详情等待事件记录BUG修复, 优化阻塞会话树状图, 提交前端优化代码, !308 实例监控前端样式优化 Merge pull request !308 from Lmeng梦/master, alert-center更改为alert-monitor, codecheck, !310 智能运维模块告警通知插件名称由alert-center改为alert-monitor Merge pull request !310 from wuyuebin/master, Merge branch 'master' of https://gitee.com/sweet365/openGauss-workbench, 业务开发模块创建表增加保存提示, !311 业务开发模块创建表增加保存提示 Merge pull request !311 from sweet365/master, 修复实例监控和历史数据诊断前端BUG, 历史数据诊断-修复缺陷和优化代码逻辑, 修复codeCheck, codeCheck修改, 修改前端空格缩进, !313 历史数据诊断-修复缺陷和优化代码逻辑 Merge pull request !313 from Lmeng梦/master, !312 实例监控、历史数据诊断样式优化 Merge pull request !312 from Lmeng梦/master, 移除无效文件,添加等待事件空即考验,添加安装端口校验,修改指标bug, !316 实例监控 bugfix Merge pull request !316 from 板栗/master, 移除无效文件,添加等待事件空即考验,添加安装端口校验,修改指标bug, !319 实例监控 bugfix Merge pull request !319 from 板栗/master, 补充遗漏提交, !321 实例监控 bugfix Merge pull request !321 from 板栗/master, bug, 修复实例监控WDRBUG, 修改代码缩进codecheck, !323 实例监控WDR报告BUG修复 Merge pull request !323 from Lmeng梦/master, 告警bug修复, codecheck, !322 业务开发 - 0630bug修复 Merge pull request !322 from RoaneZhou/master, !325 智能运维模块告警通知插件bug修复 Merge pull request !325 from wuyuebin/master, 修改会话监控接口响应结构体, Merge remote-tracking branch 'origin/master', !326 修改会话监控接口响应结构体 Merge pull request !326 from Ponfy_Liu/master, 修复SQL诊断页面显示BUG, !327 修复SQL诊断页面显示样式BUG Merge pull request !327 from Lmeng梦/master, 安装采集器端口检测方法修改，慢sql指标采集修改,操作手册, !328 实例监控 bugfix Merge pull request !328 from 板栗/master, 抛异常问题修复, !329 业务开发-序列DDL预览显示问题 Merge pull request !329 from 吴雨霖/master, 对自定义的appcationRunner启动出现异常进行处理, 对自定义的appcationRunner启动出现异常进行处理, !331 智能运维模块告警通知插件bug修复 Merge pull request !331 from wuyuebin/master, 1.实例监控首页接口性能优化, codeCheck, codeCheck, codeCheck, !332 实例监控首页接口性能优化 Merge pull request !332 from Ponfy_Liu/master, 修复实例监控和智能诊断前端BUG, 修复codeCheck, 警告/代码整理, 慢sql指标修改,TCP指标修改,移除无效文件, !334 修复实例监控和SQL诊断页面显示样式BUG Merge pull request !334 from Lmeng梦/master, !333 实例监控 bugfix Merge pull request !333 from 板栗/master, 智能运维模块logo更新，告警插件操作文档更新及代码优化, !336 块智能运维模块logo更新，告警插件操作文档更新及代码优化 Merge pull request !336 from wuyuebin/master, 优化实例监控代码结构, codeCheck, !337 优化实例监控代码结构 Merge pull request !337 from Ponfy_Liu/master, 建表语句修复, !338 业务开发-创建表DDL预览显示问题 Merge pull request !338 from 吴雨霖/master, 【日志检索】上下文框未被隐藏, !339 智能运维模块日志检索插件bug修复 Merge pull request !339 from wuyuebin/master, 修复列描述问题, !340 业务开发-列描述显示问题 Merge pull request !340 from 吴雨霖/master, TOPSQL，点击SQLID进入到SQL诊断页面，创建诊断任务，SQL不能修改参数。, !341 智能运维模块bug修复 Merge pull request !341 from wuyuebin/master, 删除关闭窗口清掉断点接口, !342 【业务开发】函数/过程0630版本优化 Merge pull request !342 from RoaneZhou/master, WDR报告，未选实例点击快照管理，页数错误，点击页数会报错。, !343 智能运维模块实例监控插件bug修复 Merge pull request !343 from wuyuebin/master, 说明文档添加下载地址, !344 添加下载地址 Merge pull request !344 from 刘桐/master, 优化代码, codecheck, !345 智能运维模块告警通知插件bug修复 Merge pull request !345 from wuyuebin/master, 更改告警接口白名单url, !346 更改告警接口白名单的url Me Created-by: luomeng Author-id: 7119743 MR-id: 7235454 Commit-by: yangzihao;Zihao Yang;zhangcheng;zhouwenruo;wuyuebin;wuyulin;liupengfei;张昊宇;opengauss_bot;吴雨霖;luomeng;wangyl;罗梦;pengjiong;liu-tong-8848;justbk;yangs Merged-by: luomeng Description: merge "develop" into "develop-930-lm" 服务器管理去除多余的代码, 修复连接弹窗重置的逻辑, 完善国际化翻译，增加日志说明, 解决全局配置无法打开的问题, 提交智能运维630代码, 历史数据诊断前端修改, 修复历史数据诊断前端BUG, 历史数据和实例监控BUG修复, !273 【业务开发】- 连接弹窗等bug修复 Merge pull request !273 from sweet365/master, !277 智能运维模块630需求内容，含实例监控插件、SQL诊断插件、告警通知插件 Merge pull request !277 from 杨子浩/master, codecheck, !281 智能运维模块630告警通知需求内容 Merge pull request !281 from wuyuebin/master, codecheck, !282 智能运维模块630告警通知需求内容 Merge pull request !282 from wuyuebin/master, 告警接口过滤, !283 过滤prometheus发送告警信息的告警接口 Merge pull request !283 from wuyuebin/master, !274 完善迁移批量安装页面国际化翻译，增加迁移日志说明 Merge pull request !274 from 王亚龙/master, 修改ds文档、增加连接弹窗主机输入限制、删除连接提示, 中英文国际化优化和README修改, 实例监控、历史数据诊断bug修复, !289 智能运维模块630需求内容实例监控、历史数据诊断模块bug修复与优化 Merge pull request !289 from Lmeng梦/master, 2, 实例监控bug修复, !292 业务开发-接口优化 Merge pull request !292 from 吴雨霖/master, !293 智能运维模块实例监控插件bug修复 Merge pull request !293 from Lmeng梦/master, 实例监控bug修复, !294 智能运维模块实例监控插件bug修复 Merge pull request !294 from 板栗/master, dataStudio修复bug, 修改样式和操作手册, !296 智能运维模块告警通知插件bug修复 Merge pull request !296 from wuyuebin/master, !295 业务开发插件bug修复 Merge pull request !295 from sweet365/master, 代码优化, 代码优化, !297 智能运维模块告警通知插件bug修复 Merge pull request !297 from wuyuebin/master, 依据新的参数配置列表，修改迁移前端画面判断, add support for auto add plugin to manage, !265 服务器管理去除多余的代码 Merge pull request !265 from 杨森/master, !298 依据新的参数配置列表，修改迁移前端画面校验判断 Merge pull request !298 from 王亚龙/master, 代码优化, 样式调整, !299 智能运维模块告警通知插件bug修复 Merge pull request !299 from wuyuebin/master, 代码优化, 去掉中文, !300 智能运维模块告警通知插件bug修复 Merge pull request !300 from wuyuebin/master, 调整实例监控首页, 告警接口调整, !302 智能运维模块告警通知插件bug修复 Merge pull request !302 from wuyuebin/master, !301 调整实例监控首页 Merge pull request !301 from Ponfy_Liu/master, !290 【bugfix】修复windows版本下安装插件图标丢失和visualtool-plugin下自动安装的插件不能被插件中心管理的问题 Merge pull request !290 from 周斌/auto_plugin, 修改循环注入, !303 业务开发-0630循环依赖修复 Merge pull request !303 from 吴雨霖/master, 将jsch升级到最新版本, !304 将jsch升级到最新版本，解决部分场景下OpenEuler无法连接的问题 Merge pull request !304 from 王亚龙/master, 修复实例监控前端BUG, !306 实例监控前端样式优化 Merge pull request !306 from Lmeng梦/master, 代码检查，bug修复, !307 智能运维模块告警通知插件bug修复 Merge pull request !307 from wuyuebin/master, 修复实例监控、智能诊断模块前端问题, 会话详情等待事件记录BUG修复, 优化阻塞会话树状图, 提交前端优化代码, !308 实例监控前端样式优化 Merge pull request !308 from Lmeng梦/master, alert-center更改为alert-monitor, codecheck, !310 智能运维模块告警通知插件名称由alert-center改为alert-monitor Merge pull request !310 from wuyuebin/master, Merge branch 'master' of https://gitee.com/sweet365/openGauss-workbench, 业务开发模块创建表增加保存提示, !311 业务开发模块创建表增加保存提示 Merge pull request !311 from sweet365/master, 修复实例监控和历史数据诊断前端BUG, 历史数据诊断-修复缺陷和优化代码逻辑, 修复codeCheck, codeCheck修改, 修改前端空格缩进, !313 历史数据诊断-修复缺陷和优化代码逻辑 Merge pull request !313 from Lmeng梦/master, !312 实例监控、历史数据诊断样式优化 Merge pull request !312 from Lmeng梦/master, 移除无效文件,添加等待事件空即考验,添加安装端口校验,修改指标bug, !316 实例监控 bugfix Merge pull request !316 from 板栗/master, 移除无效文件,添加等待事件空即考验,添加安装端口校验,修改指标bug, !319 实例监控 bugfix Merge pull request !319 from 板栗/master, 补充遗漏提交, !321 实例监控 bugfix Merge pull request !321 from 板栗/master, bug, 修复实例监控WDRBUG, 修改代码缩进codecheck, !323 实例监控WDR报告BUG修复 Merge pull request !323 from Lmeng梦/master, 告警bug修复, codecheck, !322 业务开发 - 0630bug修复 Merge pull request !322 from RoaneZhou/master, !325 智能运维模块告警通知插件bug修复 Merge pull request !325 from wuyuebin/master, 修改会话监控接口响应结构体, Merge remote-tracking branch 'origin/master', !326 修改会话监控接口响应结构体 Merge pull request !326 from Ponfy_Liu/master, 修复SQL诊断页面显示BUG, !327 修复SQL诊断页面显示样式BUG Merge pull request !327 from Lmeng梦/master, 安装采集器端口检测方法修改，慢sql指标采集修改,操作手册, !328 实例监控 bugfix Merge pull request !328 from 板栗/master, 抛异常问题修复, !329 业务开发-序列DDL预览显示问题 Merge pull request !329 from 吴雨霖/master, 对自定义的appcationRunner启动出现异常进行处理, 对自定义的appcationRunner启动出现异常进行处理, !331 智能运维模块告警通知插件bug修复 Merge pull request !331 from wuyuebin/master, 1.实例监控首页接口性能优化, codeCheck, codeCheck, codeCheck, !332 实例监控首页接口性能优化 Merge pull request !332 from Ponfy_Liu/master, 修复实例监控和智能诊断前端BUG, 修复codeCheck, 警告/代码整理, 慢sql指标修改,TCP指标修改,移除无效文件, !334 修复实例监控和SQL诊断页面显示样式BUG Merge pull request !334 from Lmeng梦/master, !333 实例监控 bugfix Merge pull request !333 from 板栗/master, 智能运维模块logo更新，告警插件操作文档更新及代码优化, !336 块智能运维模块logo更新，告警插件操作文档更新及代码优化 Merge pull request !336 from wuyuebin/master, 优化实例监控代码结构, codeCheck, !337 优化实例监控代码结构 Merge pull request !337 from Ponfy_Liu/master, 建表语句修复, !338 业务开发-创建表DDL预览显示问题 Merge pull request !338 from 吴雨霖/master, 【日志检索】上下文框未被隐藏, !339 智能运维模块日志检索插件bug修复 Merge pull request !339 from wuyuebin/master, 修复列描述问题, !340 业务开发-列描述显示问题 Merge pull request !340 from 吴雨霖/master, TOPSQL，点击SQLID进入到SQL诊断页面，创建诊断任务，SQL不能修改参数。, !341 智能运维模块bug修复 Merge pull request !341 from wuyuebin/master, 删除关闭窗口清掉断点接口, !342 【业务开发】函数/过程0630版本优化 Merge pull request !342 from RoaneZhou/master, WDR报告，未选实例点击快照管理，页数错误，点击页数会报错。, !343 智能运维模块实例监控插件bug修复 Merge pull request !343 from wuyuebin/master, 说明文档添加下载地址, !344 添加下载地址 Merge pull request !344 from 刘桐/master, 优化代码, codecheck, !345 智能运维模块告警通知插件bug修复 Merge pull request !345 from wuyuebin/master, 更改告警接口白名单url, !346 更改告警接口白名单的url Me See merge request: openGaussythcs00001/openGauss-workbench!561 commit cde6ade6638a4fe4d30ca78d9a95532a03b1c2f3 Merge: 6a35b895 02a26561 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Tue Aug 15 15:57:44 2023 +0800 merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 SQL诊断前端代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7235443 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 SQL诊断前端代码 See merge request: openGaussythcs00001/openGauss-workbench!560 commit 02a26561ad37035ae45f7c3165fd0c83d1fad6d2 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue Aug 15 15:43:26 2023 +0800 杨子浩 930 SQL诊断前端代码 commit 6a35b89543302bc70a04299ba71856f528fe9160 Merge: 025c0550 45879157 Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Tue Aug 15 09:22:11 2023 +0800 merge develop-zwr into develop merge "develop-zwr" into "develop" 调整导入表数据为空的情况, 新增编辑视图功能 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7235194 Commit-by: zhouwenruo Merged-by: zhangcheng Description: merge "develop-zwr" into "develop" 调整导入表数据为空的情况, 新增编辑视图功能 See merge request: openGaussythcs00001/openGauss-workbench!559 commit 025c05500e8d6a0cb0ae7b9f6ff173386124eef6 Merge: f6a81d8a f767e482 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Tue Aug 15 09:21:52 2023 +0800 merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" 导入导出表数据 Created-by: zhangcheng Author-id: 7119759 MR-id: 7235105 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "develop-zhangcheng-0930" into "develop" 导入导出表数据 See merge request: openGaussythcs00001/openGauss-workbench!557 commit 45879157e1a114f9a6bb10b7d156b3f05e3b3173 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Tue Aug 15 09:19:29 2023 +0800 新增编辑视图功能 commit b706651ebf45a220cec6b6454f0c2487079092c8 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Tue Aug 15 09:11:14 2023 +0800 调整导入表数据为空的情况 commit f6a81d8a407be8e167378999042d2239bfc5c123 Merge: 42a11af3 afae8839 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Mon Aug 14 17:40:44 2023 +0800 merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 ASP代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7235114 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 ASP代码 See merge request: openGaussythcs00001/openGauss-workbench!558 commit afae8839edcc491b75c5aade9b1d12f97eb8b02c Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Mon Aug 14 17:24:07 2023 +0800 杨子浩 930 ASP代码 commit f767e482d1fee2a32b0ee16c0ab7756527e4f372 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Mon Aug 14 17:23:00 2023 +0800 导入导出表数据 commit 42a11af3c7a2397fd7d91e11debc330b0946e404 Merge: 275ab22c 0c57ee23 Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Mon Aug 14 11:39:31 2023 +0800 merge develop-zwr into develop merge "develop-zwr" into "develop" 调整导出表数据功能 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7234937 Commit-by: zhouwenruo Merged-by: zhangcheng Description: merge "develop-zwr" into "develop" 调整导出表数据功能 See merge request: openGaussythcs00001/openGauss-workbench!556 commit 0c57ee2386585f1be61a20d567af2c179c333350 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Mon Aug 14 11:38:03 2023 +0800 调整导出表数据功能 commit 275ab22c1f46d516313dc30ed82ad8306cd6300f Merge: bf2dd59f 4bd6e86a Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Mon Aug 14 11:21:07 2023 +0800 merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" 告警监控 Created-by: wuyuebin Author-id: 7158405 MR-id: 7234919 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" 告警监控 See merge request: openGaussythcs00001/openGauss-workbench!555 commit 4bd6e86af0c2bdfcaa2ead6d354c02df1eaead08 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Aug 14 10:56:58 2023 +0800 告警监控 commit 3b279aa04b374e58e91615340855468149c233ae Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon Aug 14 10:00:20 2023 +0800 修复exporter重启bug commit bf2dd59f31afff456763a8a8c076d3a6a2448782 Merge: 13d4d8c7 e39d0ba3 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Fri Aug 11 16:51:55 2023 +0800 merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 ASP代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7234692 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 ASP代码 See merge request: openGaussythcs00001/openGauss-workbench!554 commit e39d0ba3518fc79141484596db2183925b191074 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Fri Aug 11 16:38:46 2023 +0800 杨子浩 930 ASP代码 commit 13d4d8c750d3a971fc99936d7059957d327f0c5a Merge: 4e1176a2 722ae71b Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Fri Aug 11 16:38:46 2023 +0800 merge feature-0930-wyl into develop merge "feature-0930-wyl" into "develop" 测试问题修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7234676 Commit-by: wuyulin Merged-by: zhouwenruo Description: merge "feature-0930-wyl" into "develop" 测试问题修复 See merge request: openGaussythcs00001/openGauss-workbench!552 commit 4e1176a292d77ecfbb02fe5a86b745dbcb05efb5 Merge: 2f6344f2 0bb90d81 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Fri Aug 11 16:37:30 2023 +0800 merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" 编辑表提交删除的数据结构 Created-by: zhangcheng Author-id: 7119759 MR-id: 7234678 Commit-by: zhangcheng Merged-by: wuyulin Description: merge "develop-zhangcheng-0930" into "develop" 编辑表提交删除的数据结构 See merge request: openGaussythcs00001/openGauss-workbench!553 commit 0bb90d81f2a115e4f03db9997f04a37d4cc7b809 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Fri Aug 11 16:34:16 2023 +0800 编辑表提交删除的数据结构 commit 2f6344f2d5755e2bf06141c30e57162a488e6795 Merge: 1342afc9 e3f86337 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Fri Aug 11 15:52:43 2023 +0800 merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 ASP部分代码, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-yangzihao-develop-930 Created-by: yangzihao Author-id: 7119754 MR-id: 7234653 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 ASP部分代码, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-yangzihao-develop-930 See merge request: openGaussythcs00001/openGauss-workbench!551 commit e3f863374eb7042288536b2fe08e44f70c9587a3 Merge: 7b9a2adc 1342afc9 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Fri Aug 11 15:46:08 2023 +0800 Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-yangzihao-develop-930 commit 7b9a2adc5aa624debd857da28547fc8245be1593 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Fri Aug 11 15:45:13 2023 +0800 杨子浩 930 ASP部分代码 commit 722ae71be8e2ad3bce308b26f0e4175192143831 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri Aug 11 15:00:50 2023 +0800 测试问题修复 commit f88f22f99ec4b77ea65fb964bcc0b2a109b5670b Merge: 5ff7d258 280f7234 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Aug 11 14:19:37 2023 +0800 Merge remote-tracking branch 'remotes/origin/feature-yangzihao-develop-930' into feature-instance commit 1342afc9995bc33ed8a736e1f5285f029927678c Merge: d51c9c6f 91ea88b5 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Fri Aug 11 11:50:38 2023 +0800 merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" 编辑表数据的type改成operationType Created-by: zhangcheng Author-id: 7119759 MR-id: 7234588 Commit-by: zhangcheng Merged-by: wuyulin Description: merge "develop-zhangcheng-0930" into "develop" 编辑表数据的type改成operationType See merge request: openGaussythcs00001/openGauss-workbench!550 commit 91ea88b53895efb9c8564bb260f7e4c62392916a Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Fri Aug 11 11:49:09 2023 +0800 编辑表数据的type改成operationType commit d51c9c6fba4d6b4b810147b73653e909119891f9 Merge: a14eefe8 b91da294 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Fri Aug 11 11:19:34 2023 +0800 merge develop-zwr into develop merge "develop-zwr" into "develop" 调整package调试功能 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7234572 Commit-by: zhouwenruo Merged-by: wuyulin Description: merge "develop-zwr" into "develop" 调整package调试功能 See merge request: openGaussythcs00001/openGauss-workbench!549 commit b91da294a19c46a0ef0d43b6de9c3c6c0d62875e Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Fri Aug 11 11:17:16 2023 +0800 调整package调试功能 commit a14eefe8728804a066a357554d0495f919c5d2ef Merge: 3dfa919c 991d087b Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Fri Aug 11 11:14:56 2023 +0800 merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" 编辑表分区表数据可编辑 Created-by: zhangcheng Author-id: 7119759 MR-id: 7234537 Commit-by: zhangcheng Merged-by: wuyulin Description: merge "develop-zhangcheng-0930" into "develop" 编辑表分区表数据可编辑 See merge request: openGaussythcs00001/openGauss-workbench!548 commit 5ff7d258ecb3d2b25544a2af7cf512e3f25d5800 Merge: 38d25e69 d8f644fc Author: liupengfei <liupengfei@ncti-gba.cn> Date: Fri Aug 11 10:57:52 2023 +0800 Merge branch 'feature-instance-lpf' into feature-instance commit d8f644fc23557013d8f0bf1c74ad8157c2e18ab2 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Fri Aug 11 10:54:38 2023 +0800 修改asp接口 commit 991d087b9b4d1c0a583c69da0168026763268c40 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Fri Aug 11 10:10:37 2023 +0800 编辑表分区表数据可编辑 commit 38d25e690cda52263216e28c50c20040de4c2f2c Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Aug 11 09:42:05 2023 +0800 exporter改用ssh连接 commit 3dfa919c523aa6bdd8292c8837312f699f01947f Merge: 227e73b8 41e646dc Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Thu Aug 10 18:44:18 2023 +0800 merge feature-0930-wyl into develop merge "feature-0930-wyl" into "develop" 删除用户, 修改请求方式, Merge branch 'feature-0930-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-0930-wyl # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/controller/DatabaseUserController.java Created-by: wuyulin Author-id: 7119753 MR-id: 7234381 Commit-by: wuyulin Merged-by: zhouwenruo Description: merge "feature-0930-wyl" into "develop" 删除用户, 修改请求方式, Merge branch 'feature-0930-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-0930-wyl # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/controller/DatabaseUserController.java See merge request: openGaussythcs00001/openGauss-workbench!547 commit 41e646dc26019d471316307cd30bc85e4b006ee6 Merge: 7ba5482d d2b34444 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Thu Aug 10 18:41:40 2023 +0800 Merge branch 'feature-0930-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-0930-wyl # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/controller/DatabaseUserController.java commit 7ba5482de08e5574e79a1e3d679094ed106f3f40 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Thu Aug 10 18:37:01 2023 +0800 修改请求方式 commit 34a889ab57df00e86b372e841dac49aa2ed628bb Author: wuyulin <wuyulin@ncti-gba.cn> Date: Thu Aug 10 18:25:39 2023 +0800 删除用户 commit 227e73b854483fa192f6277c86e7b6b5993d32db Merge: 6caac354 d2b34444 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Thu Aug 10 18:29:01 2023 +0800 merge feature-0930-wyl into develop merge "feature-0930-wyl" into "develop" 删除用户 Created-by: wuyulin Author-id: 7119753 MR-id: 7234372 Commit-by: wuyulin Merged-by: zhouwenruo Description: merge "feature-0930-wyl" into "develop" 删除用户 See merge request: openGaussythcs00001/openGauss-workbench!545 commit d2b3444499e20f30bf50139703f99c1864bd400c Author: wuyulin <wuyulin@ncti-gba.cn> Date: Thu Aug 10 18:25:39 2023 +0800 删除用户 commit db2fe2ea3b7990495ee01b5d036efe89270ab3e5 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Thu Aug 10 17:59:18 2023 +0800 修改asp接口 commit 5c276aa35aa828c5f6beaafa0d787fce3280e89a Merge: 72e69984 ba01affb Author: liupengfei <liupengfei@ncti-gba.cn> Date: Thu Aug 10 17:47:20 2023 +0800 Merge branch 'feature-instance-lpf' into feature-instance commit ba01affbddebf560a5ae23c5de67898aacf46e7f Author: liupengfei <liupengfei@ncti-gba.cn> Date: Thu Aug 10 17:45:01 2023 +0800 修改asp接口 commit 6caac35495bd6787cdbcb9a636c27959ae615551 Merge: d2b88324 99317d82 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Thu Aug 10 17:35:09 2023 +0800 merge feature-0930-wyl into develop merge "feature-0930-wyl" into "develop" 创建用户 Created-by: wuyulin Author-id: 7119753 MR-id: 7234319 Commit-by: wuyulin Merged-by: zhouwenruo Description: merge "feature-0930-wyl" into "develop" 创建用户 See merge request: openGaussythcs00001/openGauss-workbench!544 commit 99317d8229a5f45a3497a6dca12bb2c04d0c0ed0 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Thu Aug 10 17:34:24 2023 +0800 创建用户 commit d2b88324062f4dd16e6cc9851213be27946949ea Merge: 0c69e69e 1929fb38 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Thu Aug 10 15:44:18 2023 +0800 merge develop-zwr into develop merge "develop-zwr" into "develop" 调整导出DDL文件名称, 调整执行完package关闭窗口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7234228 Commit-by: zhouwenruo Merged-by: wuyulin Description: merge "develop-zwr" into "develop" 调整导出DDL文件名称, 调整执行完package关闭窗口 See merge request: openGaussythcs00001/openGauss-workbench!543 commit 1929fb388d7601d37196edf6e80ab0569a312a7d Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu Aug 10 15:42:44 2023 +0800 调整执行完package关闭窗口 commit d32dae6076f24d4abe533d6d3e6a70387fbb32bb Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu Aug 10 15:17:16 2023 +0800 调整导出DDL文件名称 commit 0c69e69e5c537b2a20bbcc7b05b6919b4ac5e77e Merge: 8f2934d9 97a5a127 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Thu Aug 10 11:41:51 2023 +0800 merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" 新增package功能 Created-by: zhangcheng Author-id: 7119759 MR-id: 7234102 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "develop-zhangcheng-0930" into "develop" 新增package功能 See merge request: openGaussythcs00001/openGauss-workbench!542 commit 97a5a12769edc4d2da107994951b57e0548c4aa7 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Thu Aug 10 11:39:46 2023 +0800 新增package功能 commit 8f2934d98be845382d86dbd75d08b12018e16162 Merge: 5ba0cc9b 280f7234 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Thu Aug 10 09:55:20 2023 +0800 merge feature-yangzihao-develop-930 into develop merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 实例监控前端代码, 杨子浩 930 实例监控前端代码, 杨子浩 930 实例监控前端, 杨子浩 930 撤回删除LazyLine, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-yangzihao-develop-930 Created-by: yangzihao Author-id: 7119754 MR-id: 7234006 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-develop-930" into "develop" 杨子浩 930 实例监控前端代码, 杨子浩 930 实例监控前端代码, 杨子浩 930 实例监控前端, 杨子浩 930 撤回删除LazyLine, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-yangzihao-develop-930 See merge request: openGaussythcs00001/openGauss-workbench!541 commit 5ba0cc9b401955a38c748318dbbfaafc692bd7f2 Merge: 8c0af4b5 02b93355 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Thu Aug 10 09:28:39 2023 +0800 merge develop-zwr into develop merge "develop-zwr" into "develop" 新增删除package接口, 新增删除package接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7234002 Commit-by: zhouwenruo Merged-by: wuyulin Description: merge "develop-zwr" into "develop" 新增删除package接口, 新增删除package接口 See merge request: openGaussythcs00001/openGauss-workbench!540 commit 280f72340bc20547acd67b21ac6ce0e896379e33 Merge: 3ef0802f 8c0af4b5 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Thu Aug 10 09:25:12 2023 +0800 Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-yangzihao-develop-930 commit 02b9335530ee5bbf406a53847e36401cbfc595c6 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu Aug 10 09:24:50 2023 +0800 新增删除package接口 commit 763643c66b55b3efdb285f9bc807657d506c3a86 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu Aug 10 09:23:26 2023 +0800 新增删除package接口 commit 3ef0802f2114b98d658e28740845ec23d22bdf81 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Thu Aug 10 09:19:00 2023 +0800 杨子浩 930 撤回删除LazyLine commit a1eedb94a60d702d6a2b8c5f6556c85ca8f10d87 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Wed Aug 9 17:43:23 2023 +0800 杨子浩 930 实例监控前端 commit 72e6998492058c9e33f2a9b349abb7eeca6d48e6 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Aug 9 17:11:36 2023 +0800 内存配置更新 commit 8c0af4b58bbd7a69fc7e305cf51400b464dbf6ac Merge: be9747ca eab05600 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Wed Aug 9 16:33:03 2023 +0800 merge feature-0930-wyl into develop merge "feature-0930-wyl" into "develop" 列表 Created-by: wuyulin Author-id: 7119753 MR-id: 7233768 Commit-by: wuyulin Merged-by: zhouwenruo Description: merge "feature-0930-wyl" into "develop" 列表 See merge request: openGaussythcs00001/openGauss-workbench!538 commit eab0560043f17be13ce9ad3f4a1b6d1dca85188b Author: wuyulin <wuyulin@ncti-gba.cn> Date: Wed Aug 9 16:32:12 2023 +0800 列表 commit 1b60b1954d4c361541340d5b62fa2fcd3c554a7a Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Aug 9 16:15:31 2023 +0800 端口号,线程会话/sqlid commit be9747ca367caa89bcb8dc68528370317bba8f2e Merge: 6c417ea4 1a8a851b Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Wed Aug 9 15:18:14 2023 +0800 merge feature-0930-wyl into develop merge "feature-0930-wyl" into "develop" user列表和其他列表优化 Created-by: wuyulin Author-id: 7119753 MR-id: 7233714 Commit-by: wuyulin Merged-by: zhouwenruo Description: merge "feature-0930-wyl" into "develop" user列表和其他列表优化 See merge request: openGaussythcs00001/openGauss-workbench!537 commit 69572d121059e33627dcff78299d7cfc65e18bed Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Aug 9 15:00:47 2023 +0800 内存数据更新 commit 1a8a851b6eb2f5fcb35b803e3aa8e558e1a65629 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Wed Aug 9 15:03:21 2023 +0800 user列表和其他列表优化 commit 0e9cf4732e19af9c24bf70a9c41faeebef515e61 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Aug 9 14:30:05 2023 +0800 更新事件类型sql commit b2f38553d2a1fba9dd08ccf740b8d54759ed19c1 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Wed Aug 9 11:28:54 2023 +0800 杨子浩 930 实例监控前端代码 commit 1a398aaf678fa1fd6d6b366cef39ee6c1fe0d5d2 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Aug 9 11:28:20 2023 +0800 首页等待事件 commit 47b8480e5f0d6ad036490d9cb8ef8a9b665250f7 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Wed Aug 9 11:27:59 2023 +0800 杨子浩 930 实例监控前端代码 commit 94ccf894a812f7d2c36e47cac204fd035903587e Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Aug 9 09:18:48 2023 +0800 添加fullcommand,ssh采集本地指标 commit 6c417ea485e5877bd690c23176ac975645eeac43 Merge: 281c57d6 f2e4732f Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Tue Aug 8 17:16:22 2023 +0800 merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" 修改表数据的提交结构 Created-by: zhangcheng Author-id: 7119759 MR-id: 7233401 Commit-by: zhangcheng Merged-by: wuyulin Description: merge "develop-zhangcheng-0930" into "develop" 修改表数据的提交结构 See merge request: openGaussythcs00001/openGauss-workbench!536 commit f2e4732f70663b8df24285b9132089df3ab46651 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Tue Aug 8 17:12:56 2023 +0800 修改表数据的提交结构 commit 281c57d6c6f1fa97f19c2022808b05456c33a746 Merge: 070b55b5 c15b69f9 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Tue Aug 8 16:34:56 2023 +0800 merge develop-zwr into develop merge "develop-zwr" into "develop" 调整package函数相关 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7233366 Commit-by: zhouwenruo Merged-by: wuyulin Description: merge "develop-zwr" into "develop" 调整package函数相关 See merge request: openGaussythcs00001/openGauss-workbench!535 commit c15b69f9641de49e002f8cfdd5ba6427ff2c4820 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Tue Aug 8 16:32:32 2023 +0800 调整package函数相关 commit 070b55b5d53b3c34a4ccfd04cdabed381410c386 Merge: 01076f4a e80ebdce Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Tue Aug 8 15:14:32 2023 +0800 merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" sql助手url路径删除空格 (cherry picked from commit 313901955b95bf540b3392307a8a49fa1b67248c), 终端sql执行历史、表数据排序筛选、表分析、表分区 Created-by: zhangcheng Author-id: 7119759 MR-id: 7233284 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "develop-zhangcheng-0930" into "develop" sql助手url路径删除空格 (cherry picked from commit 313901955b95bf540b3392307a8a49fa1b67248c), 终端sql执行历史、表数据排序筛选、表分析、表分区 See merge request: openGaussythcs00001/openGauss-workbench!534 commit e80ebdceb1ac1708b5104e94fafc88e51b64a2f8 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Tue Aug 8 15:11:54 2023 +0800 终端sql执行历史、表数据排序筛选、表分析、表分区 commit 01076f4ad3f50a0ef4b2f6fba21ab85186b87cba Merge: ec743239 2b0022de Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Tue Aug 8 15:10:12 2023 +0800 merge feature-0930-wyl into develop merge "feature-0930-wyl" into "develop" 数据修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7233258 Commit-by: wuyulin Merged-by: zhouwenruo Description: merge "feature-0930-wyl" into "develop" 数据修改 See merge request: openGaussythcs00001/openGauss-workbench!533 commit 2b0022de6edae8413e9651e5a2ea053e8d8587f9 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Tue Aug 8 15:02:23 2023 +0800 数据修改 commit ec743239be27671366e6fe2fb84e5df8df13fdcf Merge: 714020cf 5a53d95a Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Tue Aug 8 14:34:00 2023 +0800 merge develop-zwr into develop merge "develop-zwr" into "develop" 新增删除sql记录时判断是否锁定, Merge remote-tracking branch 'origin/develop' into develop-zwr, 新增删除sql记录时判断是否锁定 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7233220 Commit-by: zhouwenruo Merged-by: wuyulin Description: merge "develop-zwr" into "develop" 新增删除sql记录时判断是否锁定, Merge remote-tracking branch 'origin/develop' into develop-zwr, 新增删除sql记录时判断是否锁定 See merge request: openGaussythcs00001/openGauss-workbench!532 commit 5a53d95a38d616aa4fc2fa590917cc7ba9072f2d Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Tue Aug 8 14:32:04 2023 +0800 新增删除sql记录时判断是否锁定 commit 6237c5f2124d5b1fd4ce8bd0eb10f7505bab4fa0 Merge: 28b28262 714020cf Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Tue Aug 8 14:30:03 2023 +0800 Merge remote-tracking branch 'origin/develop' into develop-zwr commit 28b282628249301a8838eff1ddbd3f1bb703a7ef Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Tue Aug 8 14:26:23 2023 +0800 新增删除sql记录时判断是否锁定 commit 2158c89d368fd263a01f58af29c8843eb1101459 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Tue Aug 8 11:23:23 2023 +0800 分离状态接口 commit c70d7d5882a3029a902b689fb9b5996d3f42c8fb Merge: e363d12e b23a095b Author: liupengfei <liupengfei@ncti-gba.cn> Date: Tue Aug 8 10:30:19 2023 +0800 Merge branch 'feature-instance-lpf' into feature-instance commit b23a095bc34631c85e2fb62b6e0cc0e930decf3c Author: liupengfei <liupengfei@ncti-gba.cn> Date: Tue Aug 8 10:28:49 2023 +0800 集群监控添加字段 commit e363d12e137b7b9de1d97d9b92f0646595ec42a0 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Aug 8 09:59:24 2023 +0800 查找snapshot commit 714020cf2ff3cd8bdfa92775f6cb3964378d22b7 Merge: 79a5bc3f 3c7a31c3 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Mon Aug 7 09:30:02 2023 +0800 merge develop-zwr into develop merge "develop-zwr" into "develop" 导入表数据接口修改, Merge remote-tracking branch 'origin/develop-zwr' into develop-zwr, Merge remote-tracking branch 'origin/develop' into develop-zwr, Merge remote-tracking branch 'origin/develop' into develop-zwr, Merge remote-tracking branch 'origin/develop' into develop-zwr, Merge remote-tracking branch 'origin/develop' into develop-zwr, Merge remote-tracking branch 'origin/develop' into develop-zwr, Merge remote-tracking branch 'origin/develop' into develop-zwr, Merge remote-tracking branch 'origin/develop' into develop-zwr, 提取公共方法 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7232665 Commit-by: zhouwenruo Merged-by: wuyulin Description: merge "develop-zwr" into "develop" 导入表数据接口修改, Merge remote-tracking branch 'origin/develop-zwr' into develop-zwr, Merge remote-tracking branch 'origin/develop' into develop-zwr, Merge remote-tracking branch 'origin/develop' into develop-zwr, Merge remote-tracking branch 'origin/develop' into develop-zwr, Merge remote-tracking branch 'origin/develop' into develop-zwr, Merge remote-tracking branch 'origin/develop' into develop-zwr, Merge remote-tracking branch 'origin/develop' into develop-zwr, Merge remote-tracking branch 'origin/develop' into develop-zwr, 提取公共方法 See merge request: openGaussythcs00001/openGauss-workbench!530 commit 3c7a31c3f9ad89efbc09c8aa8c1dbbdb152967bd Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Mon Aug 7 09:26:28 2023 +0800 提取公共方法 commit 79a5bc3f29f6cd97eab2a0eac22eaa0973941e03 Merge: 25613659 5b1f89af Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Fri Aug 4 17:55:14 2023 +0800 merge feature-0930-wyl into develop merge "feature-0930-wyl" into "develop" 分析表, 分区表问题, Merge branch 'feature-0930-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-0930-wyl # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/compatible/opengauss/TableObjectSQLServiceImpl.java Created-by: wuyulin Author-id: 7119753 MR-id: 7232484 Commit-by: wuyulin Merged-by: zhouwenruo Description: merge "feature-0930-wyl" into "develop" 分析表, 分区表问题, Merge branch 'feature-0930-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-0930-wyl # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/compatible/opengauss/TableObjectSQLServiceImpl.java See merge request: openGaussythcs00001/openGauss-workbench!529 commit 5b1f89af676ec933dcf5e371bad2620d3a21c319 Merge: 154ce4b9 fa36a6c2 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri Aug 4 17:53:21 2023 +0800 Merge branch 'feature-0930-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-0930-wyl # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/compatible/opengauss/TableObjectSQLServiceImpl.java commit 154ce4b952225781ea8f7be25dba9fabd6237d35 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri Aug 4 17:50:48 2023 +0800 分区表问题 commit 256136595585f17fe04b88744cfc7f4e51005045 Merge: 43d707e7 fa36a6c2 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Fri Aug 4 17:35:13 2023 +0800 merge feature-0930-wyl into develop merge "feature-0930-wyl" into "develop" 修改问题, 分析表, Merge branch 'feature-0930-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-0930-wyl Created-by: wuyulin Author-id: 7119753 MR-id: 7232475 Commit-by: wuyulin Merged-by: zhouwenruo Description: merge "feature-0930-wyl" into "develop" 修改问题, 分析表, Merge branch 'feature-0930-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-0930-wyl See merge request: openGaussythcs00001/openGauss-workbench!528 commit 7b52b4ff6f84d1f0eb9f9638251ccd0813452370 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri Aug 4 17:32:08 2023 +0800 分析表 commit fa36a6c2caaa67b3ece1e16758a3b6a81f68e0a5 Merge: f7d01f92 64deb748 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri Aug 4 17:32:25 2023 +0800 Merge branch 'feature-0930-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-0930-wyl commit f7d01f9241a189ac2ec206664d4d84f4c3f7e09b Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri Aug 4 17:32:08 2023 +0800 分析表 commit ccc5297f5c53f6b106c19a616d967a99e4cf86d2 Merge: 92ab75a8 43d707e7 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Fri Aug 4 17:26:33 2023 +0800 Merge remote-tracking branch 'origin/develop' into develop-zwr commit 92ab75a8e86aa741569baaaa8e7ccb396903524d Merge: 5501d3e2 853792d7 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Fri Aug 4 15:28:51 2023 +0800 Merge remote-tracking branch 'origin/develop' into develop-zwr commit 43d707e7acd67575af4f68dcae99b1bad98305c2 Merge: 853792d7 64deb748 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Fri Aug 4 15:25:56 2023 +0800 merge feature-0930-wyl into develop merge "feature-0930-wyl" into "develop" 修改问题 Created-by: wuyulin Author-id: 7119753 MR-id: 7232412 Commit-by: wuyulin Merged-by: zhouwenruo Description: merge "feature-0930-wyl" into "develop" 修改问题 See merge request: openGaussythcs00001/openGauss-workbench!527 commit b9efa429eb854bbdd644a4acaf2be7b3edf49886 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri Aug 4 15:24:01 2023 +0800 修改问题 commit 64deb748cf631500e002b31fa7ff8ad4df926185 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri Aug 4 15:24:01 2023 +0800 修改问题 commit 2022e0af170aa9d60e1413a7b932cfe56a7acc12 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Aug 4 14:50:20 2023 +0800 cpu指标 commit 5077f7838a4a82ce658598cf5dd29333d00838a9 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Fri Aug 4 10:25:04 2023 +0800 集群监控bug commit f5855a595c0eb81f0a640710e717bd60ddcfd679 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Aug 4 09:39:38 2023 +0800 topsql排序 commit 6170b02ce7c29267ea88302ac57965746971a567 Merge: 4f20ff3a 635b9c8a Author: liupengfei <liupengfei@ncti-gba.cn> Date: Fri Aug 4 09:19:50 2023 +0800 Merge branch 'feature-instance-lpf' into feature-instance commit 635b9c8a8196bc2cc57504b315315fb4dbed7808 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Fri Aug 4 09:18:37 2023 +0800 集群配置测试 commit 4f20ff3a9b1f5b4f6c9cfeb34200d08d03c482e4 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Fri Aug 4 08:35:06 2023 +0800 实例详情bug修改 commit 853792d74dd3968fbd5274cab18edd468b465860 Merge: 6d971b1f 0a74527b Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Thu Aug 3 17:18:05 2023 +0800 merge feature-0930-wyl into develop merge "feature-0930-wyl" into "develop" 修改值名称, 查询修改, Merge branch 'feature-0930-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-0930-wyl Created-by: wuyulin Author-id: 7119753 MR-id: 7232162 Commit-by: wuyulin Merged-by: zhouwenruo Description: merge "feature-0930-wyl" into "develop" 修改值名称, 查询修改, Merge branch 'feature-0930-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-0930-wyl See merge request: openGaussythcs00001/openGauss-workbench!526 commit 0a74527b99bb2df608bd3cac49919e0ff5a71016 Merge: 0fedacec 5bca2204 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Thu Aug 3 17:16:14 2023 +0800 Merge branch 'feature-0930-wyl' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-0930-wyl commit 0fedacecd439bccf0297fd5f8dd75690c329450d Author: wuyulin <wuyulin@ncti-gba.cn> Date: Thu Aug 3 17:16:05 2023 +0800 查询修改 commit d895b4a82e540ff41099e261932f171587ffd236 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Thu Aug 3 16:07:11 2023 +0800 修正sql commit 6d971b1f6b041f3af5d4ed3b8cf96850924f787f Merge: 5c2e1f36 42572575 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Thu Aug 3 15:36:05 2023 +0800 merge feature-instance into develop merge "feature-instance" into "develop" ds注解, @Ds生效, 添加注释, 添加注释, 实时sql详情, 集群运维, topsql waitevent 更改, 实例信息, 防止单主机多采集bug, Asp, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, Merge branch 'feature-instance-lpf' into feature-instance, 添加菜单, Merge branch 'feature-instance-lpf' into feature-instance Created-by: liupengfei Author-id: 7158026 MR-id: 7232039 Commit-by: liupengfei;张昊宇 Merged-by: yangzihao Description: merge "feature-instance" into "develop" ds注解, @Ds生效, 添加注释, 添加注释, 实时sql详情, 集群运维, topsql waitevent 更改, 实例信息, 防止单主机多采集bug, Asp, Merge remote-tracking branch 'origin/feature-instance' into feature-instance, Merge branch 'feature-instance-lpf' into feature-instance, 添加菜单, Merge branch 'feature-instance-lpf' into feature-instance See merge request: openGaussythcs00001/openGauss-workbench!525 commit 42572575a407ba125e008d19eeea47df6143603c Author: liupengfei <liupengfei@ncti-gba.cn> Date: Thu Aug 3 15:31:59 2023 +0800 删除重复语句 commit 62eab80e0843ee5d2d7668be5e569864b93da6df Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Thu Aug 3 15:19:53 2023 +0800 恢复pom提交 commit dc8125e63aeca8fe74b760d408f2be89fd78f1b7 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Thu Aug 3 15:15:10 2023 +0800 首页等待事件，活跃会话数量状态更改 commit 2acb5c3e0b68192a2b713c46303aad0527e6a3b9 Merge: 20bfe417 d270521d Author: liupengfei <liupengfei@ncti-gba.cn> Date: Thu Aug 3 15:13:31 2023 +0800 Merge branch 'feature-instance-lpf' into feature-instance commit d270521d0ccd69f8d0508788631be23056b75e44 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Thu Aug 3 15:11:39 2023 +0800 添加菜单 commit 20bfe4177f1cba4e3b35677c89dbb300fd7baeab Merge: 7f0e7098 05016af7 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Thu Aug 3 14:58:14 2023 +0800 Merge branch 'feature-instance-lpf' into feature-instance commit 7f0e709894e310421b71715a5769421e87aefbff Merge: ec0bcbe0 cab1f869 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Thu Aug 3 14:57:51 2023 +0800 Merge remote-tracking branch 'origin/feature-instance' into feature-instance commit 05016af7d6d9c1ae3275278f346c6b2fb42fda49 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Thu Aug 3 14:50:43 2023 +0800 Asp commit 5501d3e28b44a4d850923749044cd6ed063f9e84 Merge: e3892a6f 5c2e1f36 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu Aug 3 14:09:41 2023 +0800 Merge remote-tracking branch 'origin/develop' into develop-zwr commit e3892a6fa84c7a44c0403e24c93b9360e9b3e014 Merge: cac9a498 f830db9b Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu Aug 3 11:39:11 2023 +0800 Merge remote-tracking branch 'origin/develop' into develop-zwr commit 5c2e1f36e45f07419efa7343025dd3fd697022e6 Merge: f830db9b 5bca2204 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Thu Aug 3 11:38:02 2023 +0800 merge feature-0930-wyl into develop merge "feature-0930-wyl" into "develop" 删除多余代码, 导入表数据接口修改, 修改值名称 Created-by: wuyulin Author-id: 7119753 MR-id: 7231932 Commit-by: wuyulin;zhouwenruo Merged-by: zhouwenruo Description: merge "feature-0930-wyl" into "develop" 删除多余代码, 导入表数据接口修改, 修改值名称 See merge request: openGaussythcs00001/openGauss-workbench!524 commit 9a54d2446f076e0f53542efffe3c2799ac6c8881 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Thu Aug 3 11:32:35 2023 +0800 修改值名称 commit 5bca2204a35f336dd02ac24316e9a90910f765ca Author: wuyulin <wuyulin@ncti-gba.cn> Date: Thu Aug 3 11:32:35 2023 +0800 修改值名称 commit cab1f86990f4afe55b5d72f53b3fb2d302b5d392 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Thu Aug 3 10:30:29 2023 +0800 防止单主机多采集bug commit 88c6cc74e6e406d3c5a8df3506ae17805541ad86 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Thu Aug 3 10:05:13 2023 +0800 实例信息 commit 42ee4b71490fe53bfac67402a206e0a8fdc3b67d Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Fri Jul 28 14:32:57 2023 +0800 导入表数据接口修改 commit 3e2e4987a300d5b7fedc1355b833a48e60a10150 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu Jul 27 16:40:04 2023 +0800 删除多余代码 commit 1bd6b11f5ba9f2dbe552459431be4f7204117de6 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Thu Aug 3 09:00:28 2023 +0800 topsql waitevent 更改 commit 7ba7b00ea658d87a75198a0564139feba8c2a126 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Wed Aug 2 16:28:05 2023 +0800 集群运维 commit f830db9b5d8e138e5ca81ceeb042755b0dbf6d7c Merge: 371e6d04 2cbbc84a Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Wed Aug 2 08:59:09 2023 +0800 merge feature-0930-wyl into develop merge "feature-0930-wyl" into "develop" 数据类型 Created-by: wuyulin Author-id: 7119753 MR-id: 7231467 Commit-by: wuyulin Merged-by: zhouwenruo Description: merge "feature-0930-wyl" into "develop" 数据类型 See merge request: openGaussythcs00001/openGauss-workbench!522 commit 2cbbc84a8109eca55cdbe25ba5deb79a7e47c604 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Wed Aug 2 08:52:28 2023 +0800 数据类型 commit 19cdcb5e2b7f03313473120f78c63fddcde7676e Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Aug 1 17:17:11 2023 +0800 实时sql详情 commit b17504cd7f6333d4ea3100576cb7918862ea8dac Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Aug 1 09:14:56 2023 +0800 添加注释 commit ec0bcbe0576ff358db3922bfcb5076871100e6df Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Aug 1 09:14:56 2023 +0800 添加注释 commit 8a9e56ffe1d4bc1dd2e44e6971163b2989e8f0ae Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon Jul 31 18:10:03 2023 +0800 @Ds生效 commit cbb879d753983580efc3191d1c7e8b4d2d1642dd Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon Jul 31 17:56:07 2023 +0800 ds注解 commit 371e6d0456dbfee7fb52e1472f8c276b9c9efde4 Merge: df48739b da697da8 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Mon Jul 31 14:26:40 2023 +0800 merge feature-0930-wyl into develop merge "feature-0930-wyl" into "develop" bug, 无, bug, !364 业务开发-约束问题 Merge pull request !364 from 吴雨霖/master, 分区, Merge branch 'master' of https://gitee.com/wu-yulin110/openGauss-workbench into gitee-master, 无, Merge branch 'master' of https://gitee.com/wu-yulin110/openGauss-workbench into gitee-master, o'k ok Signed-off-by: 吴雨霖 <wuyulin@ncti-gba.cn>, !368 业务开发-分区问题 Merge pull request !368 from 吴雨霖/master, Merge branch 'master' of https://gitee.com/wu-yulin110/openGauss-workbench into gitee-master, 列默认值, Merge remote-tracking branch 'remotes/gitt/master' into feature-0930-wyl # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/constants/SqlConstants.java Created-by: wuyulin Author-id: 7119753 MR-id: 7230781 Commit-by: wuyulin;opengauss_bot;吴雨霖 Merged-by: zhouwenruo Description: merge "feature-0930-wyl" into "develop" bug, 无, bug, !364 业务开发-约束问题 Merge pull request !364 from 吴雨霖/master, 分区, Merge branch 'master' of https://gitee.com/wu-yulin110/openGauss-workbench into gitee-master, 无, Merge branch 'master' of https://gitee.com/wu-yulin110/openGauss-workbench into gitee-master, o'k ok Signed-off-by: 吴雨霖 <wuyulin@ncti-gba.cn>, !368 业务开发-分区问题 Merge pull request !368 from 吴雨霖/master, Merge branch 'master' of https://gitee.com/wu-yulin110/openGauss-workbench into gitee-master, 列默认值, Merge remote-tracking branch 'remotes/gitt/master' into feature-0930-wyl # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/constants/SqlConstants.java See merge request: openGaussythcs00001/openGauss-workbench!521 commit da697da80a6e26d9f2a1a5d42d56ff921e6ca469 Merge: 945d9ec1 a16b041f Author: wuyulin <wuyulin@ncti-gba.cn> Date: Mon Jul 31 14:24:21 2023 +0800 Merge remote-tracking branch 'remotes/gitt/master' into feature-0930-wyl # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/constants/SqlConstants.java commit cac9a498b3960fbfdb7b15ee87e0afe7be03155d Merge: 738f6b70 df48739b Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Fri Jul 28 15:33:28 2023 +0800 Merge remote-tracking branch 'origin/develop' into develop-zwr commit df48739b36eda7ccdabdfc1de93ee52baa27ceb5 Merge: 791b5248 945d9ec1 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Fri Jul 28 15:32:41 2023 +0800 merge feature-0930-wyl into develop merge "feature-0930-wyl" into "develop" 排序 Created-by: wuyulin Author-id: 7119753 MR-id: 7230451 Commit-by: wuyulin Merged-by: zhouwenruo Description: merge "feature-0930-wyl" into "develop" 排序 See merge request: openGaussythcs00001/openGauss-workbench!520 commit 945d9ec178559d700b54e9cc78f192cd541b9c7c Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri Jul 28 15:31:11 2023 +0800 排序 commit 738f6b70ab35ee59a1b788a523cd4152619193e5 Merge: 9c29e8e0 791b5248 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Fri Jul 28 15:20:56 2023 +0800 Merge remote-tracking branch 'origin/develop' into develop-zwr commit 9c29e8e0081a8d34737f8c778009f2aa87ac23b5 Merge: 0fa18b3f 71afd06c Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Fri Jul 28 15:07:12 2023 +0800 Merge remote-tracking branch 'origin/develop' into develop-zwr commit 791b52485685c26f2308afb40a93feaf700e274f Merge: 71afd06c 14497141 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Fri Jul 28 15:05:05 2023 +0800 merge feature-0930-wyl into develop merge "feature-0930-wyl" into "develop" 加排序 Created-by: wuyulin Author-id: 7119753 MR-id: 7230436 Commit-by: wuyulin Merged-by: zhouwenruo Description: merge "feature-0930-wyl" into "develop" 加排序 See merge request: openGaussythcs00001/openGauss-workbench!519 commit 144971415f25103365b8e1cc693d2bfd3775380a Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri Jul 28 15:03:51 2023 +0800 加排序 commit 0fa18b3f33e1018121a92251719b82baaf239ea7 Merge: 7c49fa01 95a27d22 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Fri Jul 28 14:35:34 2023 +0800 Merge remote-tracking branch 'origin/develop-zwr' into develop-zwr commit 71afd06c17b8084d5f4217cfc84fdd7d99dcd275 Merge: d1a1014d 95a27d22 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Fri Jul 28 14:34:56 2023 +0800 merge develop-zwr into develop merge "develop-zwr" into "develop" 导入表数据接口修改 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7230413 Commit-by: zhouwenruo Merged-by: wuyulin Description: merge "develop-zwr" into "develop" 导入表数据接口修改 See merge request: openGaussythcs00001/openGauss-workbench!518 commit 7c49fa01fef66543c960f48bd55f76891089f1b9 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Fri Jul 28 14:32:57 2023 +0800 导入表数据接口修改 commit 95a27d22899b476cce695e4b6916d0c06dc73d5a Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Fri Jul 28 14:32:57 2023 +0800 导入表数据接口修改 commit d1a1014d6d7f8c50912be83d4cfee2ff7292924d Merge: eca3de5a 2d7b898c Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Fri Jul 28 14:10:02 2023 +0800 merge feature-0930-wyl into develop merge "feature-0930-wyl" into "develop" bug Created-by: wuyulin Author-id: 7119753 MR-id: 7230373 Commit-by: wuyulin Merged-by: zhouwenruo Description: merge "feature-0930-wyl" into "develop" bug See merge request: openGaussythcs00001/openGauss-workbench!517 commit 2d7b898c584547e4419c8a702b0a8dbc19daf34e Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri Jul 28 11:46:52 2023 +0800 bug commit eca3de5a4ef3282a46623cc87da6533857976553 Merge: cf47d7a5 36e9bcf1 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Thu Jul 27 16:41:07 2023 +0800 merge develop-zwr into develop merge "develop-zwr" into "develop" 删除多余代码 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7230195 Commit-by: zhouwenruo Merged-by: wuyulin Description: merge "develop-zwr" into "develop" 删除多余代码 See merge request: openGaussythcs00001/openGauss-workbench!516 commit 36e9bcf1be9468e40b4ceaea3133e5b53248ea59 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu Jul 27 16:40:04 2023 +0800 删除多余代码 commit cf47d7a5b938be2d66c012627a502f56983dd115 Merge: 14970546 496fbc26 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Thu Jul 27 16:36:21 2023 +0800 merge feature-0930-wyl into develop merge "feature-0930-wyl" into "develop" test, test Created-by: wuyulin Author-id: 7119753 MR-id: 7230193 Commit-by: wuyulin Merged-by: zhouwenruo Description: merge "feature-0930-wyl" into "develop" test, test See merge request: openGaussythcs00001/openGauss-workbench!515 commit 149705460b1e6d90f7de15abb2639a6ee11d0216 Merge: 3a4a9b3f 3bd5e72e Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Thu Jul 27 16:35:19 2023 +0800 merge develop-zwr into develop merge "develop-zwr" into "develop" 导入导出表数据, 分析表, 分区, 导入导出表数据, 导入导出表数据 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7230189 Commit-by: zhouwenruo;wuyulin Merged-by: wuyulin Description: merge "develop-zwr" into "develop" 导入导出表数据, 分析表, 分区, 导入导出表数据, 导入导出表数据 See merge request: openGaussythcs00001/openGauss-workbench!514 commit 3bd5e72eeb8b3ed533c56ba9ceb06ebf41eacdee Merge: 4b2edc25 3a4a9b3f Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Thu Jul 27 16:34:07 2023 +0800 导入导出表数据 commit 4b2edc25f3242e73546f387a0112ea569b368a5a Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu Jul 27 16:21:32 2023 +0800 导入导出表数据 commit d7b38288003bcca6b3c0f75644cee0d8bde6baea Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu Jul 27 15:59:36 2023 +0800 导入导出表数据 commit 2e148633c9a62cb487478b0796948212cfb1122b Author: wuyulin <wuyulin@ncti-gba.cn> Date: Thu Jul 27 15:47:17 2023 +0800 分区 commit 08f870843e5886b97da538b717fb91616017c595 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Tue Jul 25 15:47:12 2023 +0800 分析表 commit 496fbc264c231921489a272d7f84a2cb58b0e3d7 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Thu Jul 27 16:09:55 2023 +0800 test commit 514e9325791ecaaefb4ced7eb818f470869f8aac Author: wuyulin <wuyulin@ncti-gba.cn> Date: Thu Jul 27 15:59:46 2023 +0800 test commit 83697d9b80f9c577c5e33a1bad1d9a709cdf5cc2 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu Jul 27 15:59:36 2023 +0800 导入导出表数据 commit 3a4a9b3f2fb35204b3424a42bf7dd99c0bc689c3 Merge: c63ecb9f c2c4f685 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Thu Jul 27 15:58:32 2023 +0800 merge feature-0930-wyl into develop merge "feature-0930-wyl" into "develop" 分析表, 分区 Created-by: wuyulin Author-id: 7119753 MR-id: 7230155 Commit-by: wuyulin Merged-by: zhouwenruo Description: merge "feature-0930-wyl" into "develop" 分析表, 分区 See merge request: openGaussythcs00001/openGauss-workbench!512 commit c2c4f6853e9125c8007c8018e15a0af21b0e6ec8 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Thu Jul 27 15:47:17 2023 +0800 分区 commit c63ecb9fb5d1fb3c31f450b66a308b4847da387e Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Thu Jul 27 14:55:35 2023 +0800 解决冲突 commit 20b071baa404d71c166a99e0b8d7a09d1fcefc01 Merge: 0a567ff2 7a505487 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Thu Jul 27 14:47:44 2023 +0800 Merge branch 'master' into develop # Conflicts: # openGauss-visualtool/visualtool-framework/src/main/java/org/opengauss/admin/framework/config/SecurityConfig.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/compatible/TableObjectSQLService.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/compatible/opengauss/GainObjectSQLServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/compatible/opengauss/SequenceObjectSQLServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/compatible/opengauss/TableColumnSQLServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/compatible/opengauss/ViewObjectSQLServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/constants/SqlConstants.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/controller/DatabaseTableController.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/dao/ResultSetMapDAO.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/model/dto/DatabaseCreUpdColumnDTO.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/debug/AsyncHelper.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/debug/CreateCoverageRateImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/ExportServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/StartSqlImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/service/impl/sql/TableDataServiceImpl.java # plugins/data-studio/src/main/java/com/nctigba/datastudio/util/DebugUtils.java # plugins/data-studio/web-ui/package-lock.json # plugins/data-studio/web-ui/src/i18n/lang/en.ts # plugins/data-studio/web-ui/src/i18n/lang/zh-Cn.ts # plugins/data-studio/web-ui/src/views/home/index.vue # plugins/observability-instance/InstanceExporter/.gitignore # plugins/observability-instance/InstanceExporter/pom.xml # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/Application.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/config/DbConfig.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/controller/Command.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/controller/Config.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/Ametric.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/DBmetric.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/Metric.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/OSmetric.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/opengauss/OpengaussExporter.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/opengauss/Top.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/system/VmStat.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/system/cpu/LoadAvg.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/system/cpu/ProcStat.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/system/disk/DiskStats.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/system/memory/Free.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/system/memory/ProcMeminfo.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/system/network/NetDev.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/system/network/Netstat.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/system/network/SockStat.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/system/network/Socket.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/server/HostMetric.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/util/CmdUtil.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/util/DbUtil.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/util/FileUtil.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/util/StringUtil.java # plugins/observability-instance/InstanceExporter/src/main/resources/application.yml # plugins/observability-instance/InstanceExporter/src/main/resources/logbak-spring.xml # plugins/observability-instance/InstanceExporter/src/main/resources/og_exporter.yml # plugins/observability-instance/README.md # plugins/observability-instance/doc/instance_install_offline.png # plugins/observability-instance/doc/instance_install_offline_upload.png # plugins/observability-instance/doc/instance_install_proxy.png # plugins/observability-instance/doc/instance_install_server_offline.png # plugins/observability-instance/doc/instance_proxy_install_online.png # plugins/observability-instance/doc/instance_uninstall_proxy_form.png # plugins/observability-instance/doc/instance_uninstall_server_form.png # plugins/observability-instance/pom.xml # plugins/observability-instance/src/main/java/com/nctigba/common/web/exception/InstanceException.java # plugins/observability-instance/src/main/java/com/nctigba/common/web/result/AppResult.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/ObservabilityPluginApplication.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/DataSourceConfig.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/MybatisPlusConfig.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/PluginExtensionInfoConfig.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/constants/CommonConstants.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/constants/DatabaseType.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/constants/DriverConstants.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/constants/JdbcConnectConstants.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/constants/MetricsLine.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/constants/MetricsValue.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/constants/MonitoringConstants.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/constants/MonitoringResultType.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/constants/MonitoringType.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/controller/ControllerConfig.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/controller/EnvironmentController.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/controller/IndexController.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/controller/Installer.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/controller/MonitoringController.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/controller/PageController.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/controller/ParamInfoController.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/controller/ResourceCPUController.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/controller/SessionController.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/controller/TopSQLController.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/controller/WdrController.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/dto/param/ParamInfoDTO.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/dto/server/ServerInfoReq.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/dto/session/DetailStatisticDto.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/dto/topsql/TopSQLInfoReq.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/dto/topsql/TopSQLListReq.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/dto/topsql/TopSQLNowReq.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/entity/NctigbaEnv.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/entity/OpsWdrEntity.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/entity/ParamInfo.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/entity/ParamValueInfo.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/entity/ServerInfoEntity.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/factory/MonitoringHandlerFactory.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/factory/SessionHandlerFactory.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/factory/TopSQLHandlerFactory.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/handler/monitoring/MonitoringHandler.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/handler/monitoring/NormalMonitoringHandler.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/handler/session/OpenGaussSessionHandler.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/handler/session/SessionHandler.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/handler/topsql/OpenGaussTopSQLHandler.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/handler/topsql/TopSQLHandler.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/listener/PluginListener.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/mapper/DbConfigMapper.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/mapper/NctigbaEnvMapper.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/mapper/OpsWdrMapper.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/mapper/ParamInfoMapper.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/mapper/ParamValueInfoMapper.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/mapper/ServerInfoMapper.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/mapper/TopSqlMapper.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/model/DictionaryConfig.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/model/ExecutionPlan.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/model/IndexAdvice.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/model/InstanceInfo.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/model/InstanceNodeInfo.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/model/PartitionDataResp.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/model/ResInfo.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/model/WdrGeneratorBody.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/model/WdrSnapshotVO.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/model/monitoring/MonitoringMetric.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/model/monitoring/MonitoringParam.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/model/param/ParamQuery.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/AbstractInstaller.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/ClusterManager.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/ExporterInstallService.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/IServerInfoService.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/MetricsService.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/MonitoringService.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/OpsWdrService.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/ParamInfoService.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/PrometheusService.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/SessionService.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/TopSQLService.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/impl/MonitoringServiceImpl.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/impl/SessionServiceImpl.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/provider/AbstractOpsProvider.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/provider/ClusterOpsProvider.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/provider/ClusterOpsProviderManager.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/provider/EnterpriseOpsProvider.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/provider/LiteOpsProvider.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/provider/MinimaListOpsProvider.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/provider/OpenEulerArch64EnterpriseOpsProvider.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/provider/OpenEulerArch64LiteOpsProvider.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/provider/OpenEulerArch64MinimaListOpsProvider.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/provider/OpenEulerX86EnterpriseOpsProvider.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/provider/OpenEulerX86LiteOpsProvider.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/provider/OpenEulerX86MinimaListOpsProvider.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/util/Download.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/util/HttpUtils.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/util/JschUtil.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/util/Language.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/util/ListUtil.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/util/MessageSourceUtil.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/util/SshSession.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/util/YamlUtil.java # plugins/observability-instance/src/main/resources/application-dev.yml # plugins/observability-instance/src/main/resources/application.yml # plugins/observability-instance/src/main/resources/messages.properties # plugins/observability-instance/src/main/resources/messages_en_US.properties # plugins/observability-instance/src/main/resources/messages_zh_CN.properties # plugins/observability-instance/src/main/resources/schema-all.sql # plugins/observability-instance/src/test/java/com/nctigba/observability/instance/ObservabilityPluginApplicationTests.java # plugins/observability-instance/src/test/java/com/nctigba/observability/instance/controller/SessionControllerTest.java # plugins/observability-instance/src/test/java/com/nctigba/observability/instance/handler/session/OpenGaussSessionHandlerTest.java # plugins/observability-instance/src/test/java/com/nctigba/observability/instance/service/MonitoringServiceTest.java # plugins/observability-instance/src/test/java/com/nctigba/observability/instance/service/TopSQLServiceTest.java # plugins/observability-instance/src/test/java/com/nctigba/observability/instance/service/impl/SessionServiceImplTest.java # plugins/observability-instance/web-ui/.eslintrc.json # plugins/observability-instance/web-ui/.prettierrc.json # plugins/observability-instance/web-ui/src/api/observability.ts # plugins/observability-instance/web-ui/src/components/echarts/IndexLine.vue # plugins/observability-instance/web-ui/src/components/echarts/LazyLine.vue # plugins/observability-instance/web-ui/src/i18n/en.ts # plugins/observability-instance/web-ui/src/i18n/zhCn.ts # plugins/observability-instance/web-ui/src/pages/dashboardV2/Index.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/instanceMonitor/instanceMetrics/Index.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/instanceMonitor/sessionMonitor/Detail.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/instanceMonitor/topSQL/Index.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/performanceLoad/Index.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/resourceMonitor/Index.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/resourceMonitor/memory/Index.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/resourceMonitor/network/Index.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/wdr/Index.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/wdr/buildWdr.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/wdr/snapshotManage.vue # plugins/observability-instance/web-ui/src/pages/sql_detail/sql_diagnose/trackAdd.vue # plugins/observability-instance/web-ui/src/store/monitor.ts # plugins/observability-instance/web-ui/tsconfig.json # plugins/observability-instance/web-ui/yarn.lock # plugins/observability-log-search/src/main/java/com/nctigba/observability/log/config/PluginExtensionInfoConfig.java # plugins/observability-sql-diagnosis/src/main/resources/messages_en_US.properties # plugins/observability-sql-diagnosis/src/main/resources/messages_zh_CN.properties commit 0a567ff2251f6f885bb17fe1b4937297dce7412b Merge: 9963d191 18c6910d Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Wed Jul 26 15:08:43 2023 +0800 merge develop-930-lm into develop merge "develop-930-lm" into "develop" 智能诊断同步社区代码 Created-by: luomeng Author-id: 7119743 MR-id: 7229672 Commit-by: 罗梦 Merged-by: luomeng Description: merge "develop-930-lm" into "develop" 智能诊断同步社区代码 See merge request: openGaussythcs00001/openGauss-workbench!509 commit 18c6910db664efe89bda343317ea2b32f2a16769 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Wed Jul 26 15:04:39 2023 +0800 智能诊断同步社区代码 commit 9963d19150f2272851878a9ed38fcb21c8ae29f4 Merge: 5024581a f2557300 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Wed Jul 26 14:29:44 2023 +0800 merge develop-wyb-930 into develop merge "develop-wyb-930" into "develop" 更新代码 Created-by: wuyuebin Author-id: 7158405 MR-id: 7229651 Commit-by: wuyuebin Merged-by: yangzihao Description: merge "develop-wyb-930" into "develop" 更新代码 See merge request: openGaussythcs00001/openGauss-workbench!508 commit f2557300ae4369f94bf6dc7965c8ee6c26028605 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Jul 26 14:19:44 2023 +0800 更新代码 commit 52e8d5d877a6fe981c617ddbaae2c91bc5a84fcd Author: wuyulin <wuyulin@ncti-gba.cn> Date: Tue Jul 25 15:47:12 2023 +0800 分析表 commit 5024581ae26a2cc4bbd68ac89ddf1f524b2d6df3 Merge: feb0a4a0 4d958f0f Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Tue Jul 25 14:56:02 2023 +0800 merge feature-0930-wyl into develop merge "feature-0930-wyl" into "develop" 视图与表查询，列修改, 表查询加条件，表名校验 Created-by: wuyulin Author-id: 7119753 MR-id: 7229291 Commit-by: wuyulin Merged-by: zhouwenruo Description: merge "feature-0930-wyl" into "develop" 视图与表查询，列修改, 表查询加条件，表名校验 See merge request: openGaussythcs00001/openGauss-workbench!507 commit 4d958f0f41accb70baab326da6c54060419deb32 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Tue Jul 25 14:54:15 2023 +0800 1 commit 3e535223fc9c5ffbc00407b2aa64254eaa2fbcdc Author: wuyulin <wuyulin@ncti-gba.cn> Date: Tue Jul 25 14:35:45 2023 +0800 表查询加条件，表名校验 commit 3cfa203d32c663fff64a21d995d1196aa6051605 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Mon Jul 24 10:50:52 2023 +0800 sql助手url路径删除空格 (cherry picked from commit 313901955b95bf540b3392307a8a49fa1b67248c) commit 6108238352d9febfaef2ebed5a3a40f9339fb6d6 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Mon Jul 24 10:33:20 2023 +0800 视图与表查询，列修改 commit feb0a4a00e994db7e11f1016ea564cb7f075e9ea Merge: 3e850797 5ebdc648 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Fri Jul 21 16:55:50 2023 +0800 merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" 恢复修改变量的代码 (cherry picked from commit 8e401350ffe7f537da9a8d14a3b67f9539028601) Created-by: zhangcheng Author-id: 7119759 MR-id: 7228623 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "develop-zhangcheng-0930" into "develop" 恢复修改变量的代码 (cherry picked from commit 8e401350ffe7f537da9a8d14a3b67f9539028601) See merge request: openGaussythcs00001/openGauss-workbench!506 commit 5ebdc648eee74d20b562dc13099f001cb4a3e9da Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Fri Jul 21 16:54:36 2023 +0800 恢复修改变量的代码 (cherry picked from commit 8e401350ffe7f537da9a8d14a3b67f9539028601) commit 3e8507971a8695c94a5324266901e7db15d84d09 Merge: 04a98bb5 fd412842 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Fri Jul 21 15:44:08 2023 +0800 merge develop-zhangcheng-0930 into develop merge "develop-zhangcheng-0930" into "develop" 迁移0930纯前端功能代码 Created-by: zhangcheng Author-id: 7119759 MR-id: 7228569 Commit-by: zhangcheng Merged-by: zhouwenruo Description: merge "develop-zhangcheng-0930" into "develop" 迁移0930纯前端功能代码 See merge request: openGaussythcs00001/openGauss-workbench!505 commit fd412842b3814775e5e94e34073e92194624317c Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Fri Jul 21 15:41:32 2023 +0800 迁移0930纯前端功能代码 commit 04a98bb5c175fc66b8c20fb5a344afa2c7e557b4 Merge: 2aaa3025 30ba7e90 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Thu Jul 20 15:43:15 2023 +0800 merge develop-zwr into develop merge "develop-zwr" into "develop" 修改解锁和锁定sql执行记录逻辑, 校验名称是否合规工具类, 校验名称是否合规工具类, 校验名称是否合规工具类 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7228221 Commit-by: zhouwenruo Merged-by: wuyulin Description: merge "develop-zwr" into "develop" 修改解锁和锁定sql执行记录逻辑, 校验名称是否合规工具类, 校验名称是否合规工具类, 校验名称是否合规工具类 See merge request: openGaussythcs00001/openGauss-workbench!503 commit 30ba7e9094b4f99995fd9b8e03d6834610c29169 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu Jul 20 15:41:38 2023 +0800 校验名称是否合规工具类 commit 1f68503872db350ccedcb37cf23091653d54ae5c Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu Jul 20 15:32:38 2023 +0800 校验名称是否合规工具类 commit 65d62c3d96262b068e789e2bfb2bee1e8abd23f7 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu Jul 20 15:31:48 2023 +0800 校验名称是否合规工具类 commit 381c45e59d67e15b79109d18d4ac188854422b79 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu Jul 20 14:54:52 2023 +0800 修改解锁和锁定sql执行记录逻辑 commit 2aaa30254d1f57bad76beecf4a84e4fcf7f3aa8a Merge: 2e3b9d13 bf54bcb6 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Thu Jul 20 11:14:32 2023 +0800 merge develop-zwr into develop merge "develop-zwr" into "develop" 调整SQL执行历史记录功能 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7228119 Commit-by: zhouwenruo Merged-by: wuyulin Description: merge "develop-zwr" into "develop" 调整SQL执行历史记录功能 See merge request: openGaussythcs00001/openGauss-workbench!501 commit bf54bcb66e4309d470150050429f73f39c8b8b8a Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Thu Jul 20 11:02:16 2023 +0800 调整SQL执行历史记录功能 commit 2e3b9d1355a2442c156ba1bf692034b61ab8d82e Merge: 1ea15627 99d47e06 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Wed Jul 19 11:05:41 2023 +0800 merge develop-zwr into develop merge "develop-zwr" into "develop" SQL执行历史记录功能 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7227729 Commit-by: zhouwenruo Merged-by: wuyulin Description: merge "develop-zwr" into "develop" SQL执行历史记录功能 See merge request: openGaussythcs00001/openGauss-workbench!500 commit 99d47e06e60d7309a499664b1bfa8090a191bebe Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Wed Jul 19 11:04:10 2023 +0800 SQL执行历史记录功能 commit 1ea156270f7291bb585af312c61cc98826c55797 Merge: e0633806 ea402ae5 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Tue Jul 18 11:51:16 2023 +0800 merge develop-zwr into develop merge "develop-zwr" into "develop" SQL执行历史记录管理, CodeCheck修改 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7227240 Commit-by: zhouwenruo Merged-by: wuyulin Description: merge "develop-zwr" into "develop" SQL执行历史记录管理, CodeCheck修改 See merge request: openGaussythcs00001/openGauss-workbench!481 commit ea402ae56313ffdce73024be7139f60db62c1858 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Mon Jul 17 17:36:32 2023 +0800 CodeCheck修改 commit 7a37d3c3d8d7217a954a2d97270b63f911482804 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Mon Jul 17 17:07:03 2023 +0800 SQL执行历史记录管理 commit e063380663ede51600f63c93b92cb11a0af94db6 Merge: c4d95dbf e103b819 Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Mon Jul 17 08:53:48 2023 +0800 merge develop-zwr into develop merge "develop-zwr" into "develop" codecheck和单元测试 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7226961 Commit-by: zhouwenruo Merged-by: wuguobiao Description: merge "develop-zwr" into "develop" codecheck和单元测试 See merge request: openGaussythcs00001/openGauss-workbench!467 commit e103b819902fece5cdee11b9cd1ed5f3a78a7f65 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Mon Jul 17 08:38:35 2023 +0800 codecheck和单元测试 commit c4d95dbf520616687f2af7978ce85f6c83a676af Merge: 57595b71 e2902607 Author: wuguobiao <b276263bb24044a9b2bd8fe7a4aa04ea@example.com> Date: Fri Jul 14 14:54:49 2023 +0800 merge dev-bill-14 into develop merge "dev-bill-14" into "develop" gitee社区合并ds Created-by: wuguobiao Author-id: 7157987 MR-id: 7226696 Commit-by: hw73730920/wuguobiao Merged-by: wuguobiao Description: merge "dev-bill-14" into "develop" gitee社区合并ds See merge request: openGaussythcs00001/openGauss-workbench!460 commit e29026073ab04cafabf3de0c4f33ecde94293bbf Author: hw73730920/wuguobiao <4027thg32*Wug126> Date: Fri Jul 14 14:54:05 2023 +0800 gitee社区合并ds commit 57595b7100e1c70b1cb23acc8e4f0559bd031e8d Author: wuyulin <wuyulin@ncti-gba.cn> Date: Wed Jul 5 17:01:12 2023 +0800 冲突 commit eab21a0d05395519f4ce40033c5ba1b17414af72 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Wed Jul 5 16:47:58 2023 +0800 冲突 commit 42822242948f2ad1237cfcae77fb5bc89b0a0c25 Merge: 084f8027 bd8d499d Author: wuyulin <wuyulin@ncti-gba.cn> Date: Wed Jul 5 16:46:17 2023 +0800 Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into develop commit 084f802748193caf8a1a60257787c8891f3c8d1d Author: wuyulin <wuyulin@ncti-gba.cn> Date: Wed Jul 5 16:45:57 2023 +0800 冲突 commit bd8d499d253fdd5420863e5d3413c00f464178c2 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Wed Jul 5 16:44:55 2023 +0800 修改响应体结构 commit 2692e2c52bd186f8548089c890da8e15c08e07be Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Jul 5 10:39:08 2023 +0800 恢复前端提交 commit d0527673d73a00d85f37e09eb2a093f9e5dab6de Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Jul 5 10:34:15 2023 +0800 添加端口校验,bug修复 commit 8298e4523818282408c8f8de564b25ebd6aa9aed Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Jul 5 10:21:56 2023 +0800 恢复前端提交 commit c5628c95301e61818829919b95164f2cb3d3ab6b Merge: 1122941b f37c05cd Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Jul 5 09:31:37 2023 +0800 Merge branch 'dev-zhy' into develop # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/controller/PageController.java # plugins/observability-instance/src/test/java/com/nctigba/observability/instance/handler/session/OpenGaussSessionHandlerTest.java commit f37c05cd5d9c2e4efee4c98cc1c224dcbcf807d4 Merge: eba8a62f 5ebbbeca Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Jul 5 09:28:39 2023 +0800 Merge branch 'release' into dev-zhy commit 5ebbbecaeebde6617a480f9f779fb9b9a463d4fb Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Jul 5 09:28:14 2023 +0800 codecheck, topsql bug, delete unused file commit eba8a62fa9a1f348e531a348615db49722688a3c Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Jul 5 09:03:53 2023 +0800 install port check topsql waitevent null commit ed223ff2f210ce806ac192bab57af7aedb51a7fb Merge: 2a849fb5 41236dc5 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Tue Jul 4 20:12:51 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 代码检查 Created-by: wuyuebin Author-id: 7158405 MR-id: 7224039 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码检查 See merge request: openGaussythcs00001/openGauss-workbench!393 commit 41236dc54cd23b55d3696a5781287ee5428af7e7 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Jul 4 20:11:51 2023 +0800 代码检查 commit 2a849fb596e6f18d341639969b25a4a3840f0d28 Merge: 53629cb5 ec0502ce Author: 罗梦 <luomeng@ncti-gba.cn> Date: Tue Jul 4 19:44:29 2023 +0800 Merge remote-tracking branch 'origin/release' into release commit 53629cb598c946b254b1aa54a9054d91dfba1c52 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Tue Jul 4 19:43:41 2023 +0800 历史数据诊断-修复缺陷和优化代码逻辑 commit ec0502ce53cada7df1045c8c1644b549d6fd094d Merge: 41f338da e2c22aaf Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Tue Jul 4 19:37:54 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 更改插件logo Created-by: wuyuebin Author-id: 7158405 MR-id: 7224033 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 更改插件logo See merge request: openGaussythcs00001/openGauss-workbench!392 commit e2c22aafef06daade5fdad2885124a7068c29f43 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Jul 4 19:36:52 2023 +0800 更改插件logo commit 41f338da6cb0e84903a042e7b526d4aff3cae5b2 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Tue Jul 4 17:46:29 2023 +0800 历史数据诊断-修复缺陷和优化代码逻辑 commit c94f222f0f681b0f84ae110f018fa105c7770655 Merge: 9256aab5 01a01bfd Author: 罗梦 <luomeng@ncti-gba.cn> Date: Tue Jul 4 17:25:57 2023 +0800 Merge remote-tracking branch 'origin/release' into release commit 01a01bfd90077391f08af16a871d2684ebfbc0cc Merge: 95f7fb14 d95d060b Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Tue Jul 4 17:19:23 2023 +0800 merge feature-yangzihao-instance into release merge "feature-yangzihao-instance" into "release" #708867934 实例监控，会话监控，刷新页面重新进入会话监控，折线图显示异常。 Created-by: yangzihao Author-id: 7119754 MR-id: 7223959 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "release" #708867934 实例监控，会话监控，刷新页面重新进入会话监控，折线图显示异常。 See merge request: openGaussythcs00001/openGauss-workbench!391 commit 95f7fb14a130dbdbceb0d4927694e1206d948d63 Merge: 7f6598c1 36d3175f Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Tue Jul 4 17:18:13 2023 +0800 merge feature-yangzihao-history into release merge "feature-yangzihao-history" into "release" #708867934 实例监控，会话监控，刷新页面重新进入会话监控，折线图显示异常。 Created-by: yangzihao Author-id: 7119754 MR-id: 7223957 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-history" into "release" #708867934 实例监控，会话监控，刷新页面重新进入会话监控，折线图显示异常。 See merge request: openGaussythcs00001/openGauss-workbench!390 commit 36d3175f70d8532ced962ea419b49db29783858c Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue Jul 4 17:17:21 2023 +0800 #708867934 实例监控，会话监控，刷新页面重新进入会话监控，折线图显示异常。 commit d95d060b81f24d32b1690c2e626d20a6c2fdca46 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue Jul 4 17:16:36 2023 +0800 #708867934 实例监控，会话监控，刷新页面重新进入会话监控，折线图显示异常。 commit 7f6598c14ef37fd32691408f2e921a853f4ceca3 Merge: 22502746 62541b20 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Tue Jul 4 17:09:54 2023 +0800 merge feature-yangzihao-instance into release merge "feature-yangzihao-instance" into "release" #708867934 实例监控，会话监控，刷新页面重新进入会话监控，折线图显示异常。 Created-by: yangzihao Author-id: 7119754 MR-id: 7223948 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "release" #708867934 实例监控，会话监控，刷新页面重新进入会话监控，折线图显示异常。 See merge request: openGaussythcs00001/openGauss-workbench!389 commit 62541b20981a9cbd8aee6c31c3a0f3101c90d803 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue Jul 4 17:09:09 2023 +0800 #708867934 实例监控，会话监控，刷新页面重新进入会话监控，折线图显示异常。 commit 22502746f925b5ce844ee66bdea900b554a8a18f Merge: 013ff803 51820332 Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Tue Jul 4 16:48:49 2023 +0800 merge bugfix-zhangcheng-0630-3 into release merge "bugfix-zhangcheng-0630-3" into "release" createTable做关闭保存提示 Created-by: zhangcheng Author-id: 7119759 MR-id: 7223930 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-3" into "release" createTable做关闭保存提示 See merge request: openGaussythcs00001/openGauss-workbench!388 commit 5182033299dadd7d2b6565db637f7ab7227c27d7 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Tue Jul 4 16:47:38 2023 +0800 createTable做关闭保存提示 commit 013ff80323603107863beb4a5984905a06b1696d Merge: 775690b2 a0f6e7c6 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Tue Jul 4 16:35:08 2023 +0800 merge feature-yangzihao-history into release merge "feature-yangzihao-history" into "release" 修复历史数据诊断前端BUG #708867934 实例监控，会话监控，刷新页面重新进入会话监控，折线图显示异常。 #708899860 历史诊断_业务连接数显示为空 Created-by: yangzihao Author-id: 7119754 MR-id: 7223915 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-history" into "release" 修复历史数据诊断前端BUG #708867934 实例监控，会话监控，刷新页面重新进入会话监控，折线图显示异常。 #708899860 历史诊断_业务连接数显示为空 See merge request: openGaussythcs00001/openGauss-workbench!387 commit 775690b2acafb5705db3a1a4acdd03fe75b07760 Merge: 07e95950 a0d35dc2 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Tue Jul 4 16:34:45 2023 +0800 merge feature-yangzihao-instance into release merge "feature-yangzihao-instance" into "release" 修复实例监控前端问题 #708867934 实例监控，会话监控，刷新页面重新进入会话监控，折线图显示异常。 Created-by: yangzihao Author-id: 7119754 MR-id: 7223914 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "release" 修复实例监控前端问题 #708867934 实例监控，会话监控，刷新页面重新进入会话监控，折线图显示异常。 See merge request: openGaussythcs00001/openGauss-workbench!386 commit 07e959500e2770658c27095576831a030c70b099 Merge: b242ba0b c185eebd Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Tue Jul 4 16:33:21 2023 +0800 merge feature-yangzihao-history into release merge "feature-yangzihao-history" into "release" #708867934 实例监控，会话监控，刷新页面重新进入会话监控，折线图显示异常。 Created-by: yangzihao Author-id: 7119754 MR-id: 7223912 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-history" into "release" #708867934 实例监控，会话监控，刷新页面重新进入会话监控，折线图显示异常。 See merge request: openGaussythcs00001/openGauss-workbench!385 commit a0d35dc2e6fe4f0724a9378baaa152ab01d59e57 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue Jul 4 16:32:47 2023 +0800 修复实例监控前端问题 #708867934 实例监控，会话监控，刷新页面重新进入会话监控，折线图显示异常。 commit a0f6e7c6d37c7d2aa29f6cd6f88e31a962731aca Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue Jul 4 16:31:18 2023 +0800 修复历史数据诊断前端BUG #708867934 实例监控，会话监控，刷新页面重新进入会话监控，折线图显示异常。 #708899860 历史诊断_业务连接数显示为空 commit b242ba0b0460e1f905f1e224421e774803c6431f Merge: ef155df3 0202635c Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Tue Jul 4 14:09:02 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7223822 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!384 commit 0202635c08df2aeb80e158168287e594478788a2 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Jul 4 14:07:38 2023 +0800 codecheck commit ef155df3f542045dee1241d96e0aba199cbc8060 Merge: 4742dc56 0ac9eaa0 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Tue Jul 4 13:02:25 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 删除alert-center Created-by: wuyuebin Author-id: 7158405 MR-id: 7223813 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 删除alert-center See merge request: openGaussythcs00001/openGauss-workbench!383 commit 0ac9eaa0b2a0397474a580aace9d06baa0dfb6f7 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Jul 4 13:00:50 2023 +0800 删除alert-center commit 4742dc5628567470ee7a3d2261281ca6d762696d Merge: 664f9a09 879fe1aa Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Tue Jul 4 12:57:25 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 代码路径更换，名称更换 Created-by: wuyuebin Author-id: 7158405 MR-id: 7223812 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码路径更换，名称更换 See merge request: openGaussythcs00001/openGauss-workbench!382 commit 879fe1aa625a7484627edf8cdf0ced89ad72a0ee Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Jul 4 12:52:35 2023 +0800 代码路径更换，名称更换 commit ca9c294fc0c8af29dca377d81b55619e3e362402 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jul 4 10:46:17 2023 +0800 bug修改,多余文件移除 commit 664f9a09dec86c4b0b5ca72d5449ea0b9e580065 Merge: 14f3bd24 7d1d8fff Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Tue Jul 4 10:20:26 2023 +0800 merge feature-yangzihao-instance into release merge "feature-yangzihao-instance" into "release" #708867934 实例监控，会话监控，刷新页面重新进入会话监控，折线图显示异常。 Created-by: yangzihao Author-id: 7119754 MR-id: 7223756 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "release" #708867934 实例监控，会话监控，刷新页面重新进入会话监控，折线图显示异常。 See merge request: openGaussythcs00001/openGauss-workbench!381 commit c185eebdba30834c379c8cd7af681088c21e9404 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue Jul 4 10:19:19 2023 +0800 #708867934 实例监控，会话监控，刷新页面重新进入会话监控，折线图显示异常。 commit 7d1d8ffff0855c9ddbb12e6a0aa73a923df28346 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue Jul 4 10:18:15 2023 +0800 #708867934 实例监控，会话监控，刷新页面重新进入会话监控，折线图显示异常。 commit 9256aab59e5cb301a5488c746f94461736a08f29 Merge: b9fbc06c 14f3bd24 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Tue Jul 4 09:53:58 2023 +0800 Merge remote-tracking branch 'origin/release' into release commit 670ff612c7c766c446897d0cf486c3e8efd63211 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jul 4 08:47:56 2023 +0800 codecheck commit 14f3bd24670a7c2668a4cb903a080387a91775e2 Merge: d8091c22 b31d9543 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Mon Jul 3 18:39:40 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 告警插件添加logo, 代码路径更换，名称更换, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb Created-by: wuyuebin Author-id: 7158405 MR-id: 7223705 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 告警插件添加logo, 代码路径更换，名称更换, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb See merge request: openGaussythcs00001/openGauss-workbench!380 commit b31d95430401f210ccc0ecc5e701ed2322b26f85 Merge: cb9b8bd3 d8091c22 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Jul 3 18:33:52 2023 +0800 Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb commit cb9b8bd3badcac6c27521092e26e21f339299c7a Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Jul 3 18:32:22 2023 +0800 代码路径更换，名称更换 commit d8091c2289a0d417159742a1ed43a49fa93b7e43 Merge: a9238b93 1b5363c0 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Mon Jul 3 17:54:52 2023 +0800 merge feature-yangzihao-instance into release merge "feature-yangzihao-instance" into "release" 优化阻塞会话前端代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7223685 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "release" 优化阻塞会话前端代码 See merge request: openGaussythcs00001/openGauss-workbench!379 commit 1b5363c0f1bd653577a6544ffae61f990d2faa99 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Mon Jul 3 17:54:11 2023 +0800 优化阻塞会话前端代码 commit 96ce08722c6a8cbb63d12c2323fc7c56585a9ebe Merge: df6dd12d 8dfcab30 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon Jul 3 17:50:36 2023 +0800 Merge branch 'codecheck' into dev-zhy # Conflicts: # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/config/NodeConfig.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/controller/Command.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/controller/Config.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/opengauss/OpengaussExporter.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/server/HostMetric.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/util/DbUtil.java # plugins/observability-instance/README.md # plugins/observability-instance/pom.xml # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/handler/session/OpenGaussSessionHandler.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/handler/topsql/OpenGaussTopSQLHandler.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/ExporterInstallService.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/MetricsService.java # plugins/observability-instance/src/test/java/com/nctigba/observability/instance/ObservabilityPluginApplicationTests.java # plugins/observability-instance/src/test/java/com/nctigba/observability/instance/service/MonitoringServiceTest.java # plugins/observability-instance/src/test/java/com/nctigba/observability/instance/service/TopSQLServiceTest.java # plugins/observability-instance/web-ui/src/utils/websocket.ts commit df6dd12d7b2451690e7053b2fceb29a7836d1617 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Mon Jul 3 17:39:32 2023 +0800 test init commit 1122941be567c76447f9e41965bc521395ce1c40 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Thu Jun 29 16:43:51 2023 +0800 bug commit a9238b930196c28b1d736326c8e13b111ec4cfc7 Merge: d7a9f6c5 8191715b Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Mon Jul 3 17:23:18 2023 +0800 merge feature-yangzihao-instance into release merge "feature-yangzihao-instance" into "release" 优化读取树状结构代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7223668 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "release" 优化读取树状结构代码 See merge request: openGaussythcs00001/openGauss-workbench!378 commit 8191715b4c6f19992d9580a5c13782e5c1993cba Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Mon Jul 3 17:22:04 2023 +0800 优化读取树状结构代码 commit d7a9f6c5a31000293d0d28498b2798afe75908b9 Merge: 6eae6287 d25af633 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Mon Jul 3 17:01:45 2023 +0800 merge feature-yangzihao-instance into release merge "feature-yangzihao-instance" into "release" 修改实例监控BUG Created-by: yangzihao Author-id: 7119754 MR-id: 7223652 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "release" 修改实例监控BUG See merge request: openGaussythcs00001/openGauss-workbench!377 commit 6eae6287fd79d230ed7a95c4bd3448d76cc3f85c Merge: ba2a6e47 bd3f3d95 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Mon Jul 3 17:01:06 2023 +0800 merge feature-yangzihao-history into release merge "feature-yangzihao-history" into "release" 修改历史SQL诊断代码评审问题 修复BUG： #708899769 历史数据诊断，分析报告，点击诊断阈值，点击放大图标，页面放大后会默认显示诊断结果页面内容。 Created-by: yangzihao Author-id: 7119754 MR-id: 7223649 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-history" into "release" 修改历史SQL诊断代码评审问题 修复BUG： #708899769 历史数据诊断，分析报告，点击诊断阈值，点击放大图标，页面放大后会默认显示诊断结果页面内容。 See merge request: openGaussythcs00001/openGauss-workbench!376 commit bd3f3d957733ffa8c3c055cf19d5c1f5b18071d4 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Mon Jul 3 16:56:02 2023 +0800 修改历史SQL诊断代码评审问题 修复BUG： #708899769 历史数据诊断，分析报告，点击诊断阈值，点击放大图标，页面放大后会默认显示诊断结果页面内容。 commit d25af6330d642d16f4ddedc7aebce4c0e9833ca7 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Mon Jul 3 16:55:01 2023 +0800 修改实例监控BUG commit c876f1283527779cd99214915ad5a66304bcf622 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Jul 3 16:32:28 2023 +0800 告警插件添加logo commit b9fbc06c78846a3869679fa143a350efbca7298f Merge: 20586aca ba2a6e47 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Mon Jul 3 15:22:18 2023 +0800 Merge remote-tracking branch 'origin/release' into release commit ba2a6e4767db3349254815595b02fd7a1f1e89da Merge: 2384dcd7 d61f14d6 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Mon Jul 3 14:12:50 2023 +0800 merge feature-yangzihao-instance into release merge "feature-yangzihao-instance" into "release" 修复实例监控前端BUG Created-by: yangzihao Author-id: 7119754 MR-id: 7223532 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "release" 修复实例监控前端BUG See merge request: openGaussythcs00001/openGauss-workbench!375 commit d61f14d6dafb56365f8ff47bbc07a9c375da1842 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Mon Jul 3 12:53:31 2023 +0800 修复实例监控前端BUG commit 2384dcd792ac9d68c59b1b951af8df74f43ef766 Merge: 8c38d46a b02b1d0e Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Mon Jul 3 12:31:09 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 代码优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7223523 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码优化 See merge request: openGaussythcs00001/openGauss-workbench!374 commit b02b1d0e037567bb59ff1ff1bde0cebbe7b652ad Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Jul 3 12:29:30 2023 +0800 代码优化 commit 8c38d46a08bae2f6023a7e091df8a5f2d5d9b493 Merge: 220ec209 d4797f8e Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Mon Jul 3 11:49:24 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 代码优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7223518 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码优化 See merge request: openGaussythcs00001/openGauss-workbench!373 commit d4797f8e0d900ae52d0361d2c8d2cf72d86800f2 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Jul 3 11:48:17 2023 +0800 代码优化 commit 220ec2091750d299591e1f550d3cee74730d3d81 Merge: eed186d4 3cf4510c Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Mon Jul 3 11:21:06 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 修复bug,代码优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7223495 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修复bug,代码优化 See merge request: openGaussythcs00001/openGauss-workbench!372 commit 3cf4510cd5b12c338e8ed5487adf43c3530b2f8a Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Jul 3 11:19:27 2023 +0800 修复bug,代码优化 commit eed186d4560ed52c014d4cd50bfe202255c356ea Merge: d4391872 8c34d1b7 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Sun Jul 2 22:50:42 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 修复bug,代码优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7223414 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修复bug,代码优化 See merge request: openGaussythcs00001/openGauss-workbench!370 commit 8c34d1b7923d9918c0a4c9ea977431ce7b734fcd Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Sun Jul 2 22:34:01 2023 +0800 修复bug,代码优化 commit f28d5df2ae5f8e347006befd7c8a4e89bbd23664 Merge: 1663abe8 97f61eb0 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Fri Jun 30 17:23:09 2023 +0800 Merge branch 'JUnit' into develop commit 97f61eb0f0267f104a5f7524f1cb309ec24b1ab9 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Fri Jun 30 17:22:10 2023 +0800 补充会话监控单元测试 commit 20586aca8dd74a0c106dd70aaa0312e6eaadd8c4 Merge: 2e1c5ec5 d4391872 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Fri Jun 30 14:48:09 2023 +0800 Merge remote-tracking branch 'origin/release' into release commit d439187275695721ec3671bd61958ee10522139a Merge: 0d9d1067 1663abe8 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Fri Jun 30 14:33:14 2023 +0800 Merge branch 'bugfix-lpf' into release commit 1663abe8c1a0fddbe20238ccb6271072bdccac1a Author: liupengfei <liupengfei@ncti-gba.cn> Date: Fri Jun 30 14:29:27 2023 +0800 修复bug，会话详情--等待事件记录不显示 commit 0d9d1067e87627d1c39aa6cf26d66cff9404218c Merge: 8bee2a2a 2fb080c3 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Fri Jun 30 12:40:47 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 调整告警接口 Created-by: wuyuebin Author-id: 7158405 MR-id: 7223202 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 调整告警接口 See merge request: openGaussythcs00001/openGauss-workbench!369 commit 2fb080c3b5b67312216c19ae669b60ef87f8ed2f Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Fri Jun 30 12:39:03 2023 +0800 调整告警接口 commit 8bee2a2a0c6e8ca0ba3b0e997579b18f86c7b089 Merge: f7a7ff38 0c035bd8 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Fri Jun 30 11:32:16 2023 +0800 Merge remote-tracking branch 'origin/release' into release commit 0c035bd8b26244b57bc4fc295ada4f454714af05 Merge: d4923796 0a8ab47b Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Fri Jun 30 11:09:57 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 代码优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7223157 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码优化 See merge request: openGaussythcs00001/openGauss-workbench!368 commit 0a8ab47b4bf98d558068eeec00bd4acca45a4560 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Fri Jun 30 11:08:19 2023 +0800 代码优化 commit f7a7ff38bde3aaa1d710283d8775a19b00bc53db Merge: d4923796 691e726e Author: liupengfei <liupengfei@ncti-gba.cn> Date: Fri Jun 30 10:59:07 2023 +0800 Merge branch 'develop' into release commit d49237967b4374fb4181b7e1f5ff209727c5110c Merge: 336a7798 899d2307 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Fri Jun 30 10:56:22 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 代码优化,调整告警接口 Created-by: wuyuebin Author-id: 7158405 MR-id: 7223148 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码优化,调整告警接口 See merge request: openGaussythcs00001/openGauss-workbench!367 commit 899d2307158ccb80df9c840fa49854e852e172cd Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Fri Jun 30 10:54:07 2023 +0800 代码优化,调整告警接口 commit 336a77981d4bfc00504f8e1f4b9c9d556d67baf9 Merge: 3efdc833 2ff2549e Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Fri Jun 30 10:50:46 2023 +0800 merge feature-yangzihao-instance into release merge "feature-yangzihao-instance" into "release" 修改首页样式, 海量建议界面修改 Created-by: yangzihao Author-id: 7119754 MR-id: 7223145 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "release" 修改首页样式, 海量建议界面修改 See merge request: openGaussythcs00001/openGauss-workbench!366 commit 2ff2549ecf4bb08d970349ca9594a0d511905347 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Fri Jun 30 10:48:58 2023 +0800 海量建议界面修改 commit 3efdc8330cd92246d2987aa12902e579605429a2 Merge: 350e4298 1beaf62c Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Fri Jun 30 08:44:29 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 代码优化，样式调整, 代码优化，样式调整 Created-by: wuyuebin Author-id: 7158405 MR-id: 7223041 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码优化，样式调整, 代码优化，样式调整 See merge request: openGaussythcs00001/openGauss-workbench!365 commit 1beaf62c42b25ce0b89038966dbb921728d938f9 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Fri Jun 30 08:40:56 2023 +0800 代码优化，样式调整 commit b5a4ec9504db56ccfc503aa77a1ea3c2e7e7da64 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Fri Jun 30 08:40:13 2023 +0800 代码优化，样式调整 commit 350e4298a77a7450976855db654871eb61bb0043 Merge: c42c4c7f d1ca9ce3 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Thu Jun 29 19:53:02 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 代码优化, 代码优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7223003 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码优化, 代码优化 See merge request: openGaussythcs00001/openGauss-workbench!364 commit d1ca9ce352a76660b7bc120cc69347b0092a2f2e Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Thu Jun 29 19:50:37 2023 +0800 代码优化 commit f804eda0149e059fbe232dc33cd5008f5b01ae46 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Thu Jun 29 19:49:05 2023 +0800 代码优化 commit 691e726e472b48a05cb207a589fb5281542581d3 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Thu Jun 29 17:07:52 2023 +0800 修复bug commit 832afcd268dcbfad6404d6603b92c2a75fe957d6 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Thu Jun 29 16:44:27 2023 +0800 pom配置单测覆盖率报告 commit 35f65f69dc5f35703f1165c44c737bdc883482cd Author: liupengfei <liupengfei@ncti-gba.cn> Date: Thu Jun 29 16:42:39 2023 +0800 pom配置单测覆盖率报告 commit 19635bca173456cf61dcf78f866915841f2c8957 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Thu Jun 29 16:29:03 2023 +0800 修改首页样式 commit dcf3ce03160dd7bd4e3f99b6fe60698bc1d28e01 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Thu Jun 29 16:13:08 2023 +0800 pom配置单测覆盖率报告 commit 58296b27e03a4173260e2208a03c6ae04ffc0a04 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Thu Jun 29 16:08:43 2023 +0800 实例监控首页，增加返回数据 commit c42c4c7f749ad23cda57b39d937d9e51be672c5f Merge: 18cd0905 3a9fd2b2 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Thu Jun 29 15:17:39 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 代码优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7222810 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码优化 See merge request: openGaussythcs00001/openGauss-workbench!363 commit 3a9fd2b24d9d6fb393c2564adbd58764e4680dca Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Thu Jun 29 15:16:28 2023 +0800 代码优化 commit 18cd0905953de8ccc7157825a3f7021393783e42 Merge: 93f640b6 4b048762 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Thu Jun 29 14:44:16 2023 +0800 Merge branch 'bugfix-sessionWating-lpf' into release commit 4b048762aa0b384d28ed945edb65cebc2d1bc4e9 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Thu Jun 29 14:42:21 2023 +0800 修复会话监控bug commit 93f640b6680589b020e1d71009aebcb75c1f883d Merge: 96bbee4b 953525ec Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Thu Jun 29 12:46:40 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 代码优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7222738 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码优化 See merge request: openGaussythcs00001/openGauss-workbench!362 commit 953525ec9cf5cd944b1ec9c24d623baddbfe50d5 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Thu Jun 29 12:45:29 2023 +0800 代码优化 commit 96bbee4b6ec84f91ca53187f248623e80ca71faf Merge: 4acaa7e3 62d20f20 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Thu Jun 29 12:10:46 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 代码优化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7222735 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码优化 See merge request: openGaussythcs00001/openGauss-workbench!361 commit 62d20f2078795a4e2f43e93e640484c6a421e21f Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Thu Jun 29 12:09:03 2023 +0800 代码优化 commit 4acaa7e3a91997207de404abee245118c2dc7ebc Merge: 8f47d3ef 260f5d09 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Wed Jun 28 17:34:21 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 修改样式 Created-by: wuyuebin Author-id: 7158405 MR-id: 7222537 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修改样式 See merge request: openGaussythcs00001/openGauss-workbench!360 commit 260f5d09c1865f28375b9c706495b32ffacd0701 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Jun 28 17:32:30 2023 +0800 修改样式 commit a07dc93523521c833c1a28ea5f8f004996275a0f Merge: 34886beb 8f47d3ef Author: liupengfei <liupengfei@ncti-gba.cn> Date: Wed Jun 28 16:43:02 2023 +0800 Merge branch 'release' into develop commit 8f47d3efe5be495c9ca6df8fb0df2ce541dc1c65 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Wed Jun 28 16:22:34 2023 +0800 修复会话详情--阻塞树bug commit 34886beb0fbffd6c1de517a5f3be4e345221a83c Merge: bfb7d453 da2e9625 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Wed Jun 28 15:08:47 2023 +0800 18 commit b5b29b95844cdc4f04d0cb4bcf3bef9281d801ad Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Jun 28 11:53:36 2023 +0800 添加报错日志 commit bfb7d4536f8c8a0c256dc19eed2c976f47884179 Merge: 7c91d279 53042a13 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Wed Jun 28 11:34:07 2023 +0800 merge release into develop merge "release" into "develop" 添加字段.移除无效文件,改名, Merge branch 'develop' into dev-zhy, Squashed commit of the following: commit ae724aec71fed5b5351ed9f1d05b73be72d5d292 Merge: 84970cb9 78c32bbd Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:47:30 2023 +0800 Merge branch 'develop' into dev-zhy commit 84970cb9a70db7560fac4ac6e402f6279d99e0cf Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:44:39 2023 +0800 添加字段.移除无效文件,改名, Merge branch 'develop' into dev-zhy, 文档更新, 配置, 打包, Merge branch 'release' into dev-zhy, agent获取数据修改, 文档.图片, Merge branch 'develop' into dev-zhy, Merge branch 'develop' into dev-zhy, 采集器连接数据库, 增加小数位,更改topsql逻辑, 增加小数位,更改topsql逻辑, bug修复, 配置, Merge branch 'release' into dev-zhy # Conflicts: # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/controller/Config.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/server/HostMetric.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/util/DbUtil.java, bug修复 Created-by: luomeng Author-id: 7119743 MR-id: 7222296 Commit-by: 张昊宇 Merged-by: luomeng Description: merge "release" into "develop" 添加字段.移除无效文件,改名, Merge branch 'develop' into dev-zhy, Squashed commit of the following: commit ae724aec71fed5b5351ed9f1d05b73be72d5d292 Merge: 84970cb9 78c32bbd Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:47:30 2023 +0800 Merge branch 'develop' into dev-zhy commit 84970cb9a70db7560fac4ac6e402f6279d99e0cf Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:44:39 2023 +0800 添加字段.移除无效文件,改名, Merge branch 'develop' into dev-zhy, 文档更新, 配置, 打包, Merge branch 'release' into dev-zhy, agent获取数据修改, 文档.图片, Merge branch 'develop' into dev-zhy, Merge branch 'develop' into dev-zhy, 采集器连接数据库, 增加小数位,更改topsql逻辑, 增加小数位,更改topsql逻辑, bug修复, 配置, Merge branch 'release' into dev-zhy # Conflicts: # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/controller/Config.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/server/HostMetric.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/util/DbUtil.java, bug修复 See merge request: openGaussythcs00001/openGauss-workbench!357 commit 53042a13679ff6689f4280dc6b07ac296721ffb0 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Jun 28 10:46:52 2023 +0800 bug修复 commit da2e962547eb37bbaeb63990ed17b29f73d3740c Merge: a7789ace 9d3f4564 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Wed Jun 28 10:38:10 2023 +0800 Merge remote-tracking branch 'origin/feature-codecheck' into feature-codecheck commit 9cedc97f44a6144545520cf720527c887a219a75 Merge: bf661eda 3daf6417 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Jun 28 10:37:29 2023 +0800 Merge branch 'release' into dev-zhy # Conflicts: # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/controller/Config.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/server/HostMetric.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/util/DbUtil.java commit a7789ace4070c55e305fce700cc2ba348b9fbee3 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Wed Jun 28 10:37:11 2023 +0800 优化导出接口 commit 3daf6417ae6fd16f9a8288df16b318f14dfe020a Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Jun 28 10:34:13 2023 +0800 配置 commit 1da495625fd7b4c2f71c537ea7b1d48eea2672cc Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Jun 28 10:29:33 2023 +0800 bug修复 commit ee48c8c65399a1e6f6bef8ff03e1856de5ce36fe Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Sun Jun 25 15:22:02 2023 +0800 增加小数位,更改topsql逻辑 commit 7c91d279eb553821ea57f18f3249cefd96446146 Merge: 41251b5d 4be2381a Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Wed Jun 28 10:22:54 2023 +0800 merge release into develop merge "release" into "develop" #708879791 历史数据诊断，诊断结果时间不完整。, merge feature-yangzihao-history into release merge "feature-yangzihao-history" into "release" #708879791 历史数据诊断，诊断结果时间不完整。 Created-by: yangzihao Author-id: 7119754 MR-id: 7221813 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-history" into "release" #708879791 历史数据诊断，诊断结果时间不完整。 See merge request: openGaussythcs00001/openGauss-workbench!345, #708877939 历史数据诊断详情，数据库进程当前使用CPU过高，优化显示样式。, Merge branch 'feature-yangzihao-instance' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-yangzihao-instance, merge feature-yangzihao-instance into release merge "feature-yangzihao-instance" into "release" #708877939 历史数据诊断详情，数据库进程当前使用CPU过高，优化显示样式。, Merge branch 'feature-yangzihao-instance' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-yangzihao-instance Created-by: yangzihao Author-id: 7119754 MR-id: 7221821 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "release" #708877939 历史数据诊断详情，数据库进程当前使用CPU过高，优化显示样式。, Merge branch 'feature-yangzihao-instance' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-yangzihao-instance See merge request: openGaussythcs00001/openGauss-workbench!346, 修复创建同义词的对象名称, merge bugfix-zhangcheng-0630-3 into release merge "bugfix-zhangcheng-0630-3" into "release" 修复创建同义词的对象名称 Created-by: zhangcheng Author-id: 7119759 MR-id: 7221892 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-3" into "release" 修复创建同义词的对象名称 See merge request: openGaussythcs00001/openGauss-workbench!347, 平台过滤路径, 修复创建表中英文, 平台过滤路径, merge bugfix-zhangcheng-0630-3 into release merge "bugfix-zhangcheng-0630-3" into "release" 修复创建表中英文 Created-by: zhangcheng Author-id: 7119759 MR-id: 7221905 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-3" into "release" 修复创建表中英文 See merge request: openGaussythcs00001/openGauss-workbench!348, #708877939 历史数据诊断详情，数据库进程当前使用CPU过高，优化显示样式。, merge feature-yangzihao-history into release merge "feature-yangzihao-history" into "release" #708877939 历史数据诊断详情，数据库进程当前使用CPU过高，优化显示样式。 Created-by: yangzihao Author-id: 7119754 MR-id: 7222043 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-history" into "release" #708877939 历史数据诊断详情，数据库进程当前使用CPU过高，优化显示样式。 See merge request: openGaussythcs00001/openGauss-workbench!350, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 样式调整, merge feature-wyb into release merge "feature-wyb" into "release" 平台过滤路径, 平台过滤路径, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 样式调整 Created-by: wuyuebin Author-id: 7158405 MR-id: 7222084 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 平台过滤路径, 平台过滤路径, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 样式调整 See merge request: openGaussythcs00001/openGauss-workbench!351, 优化导出接口, merge release-zwr into release merge "release-zwr" into "release" 优化导出接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7222192 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 优化导出接口 See merge request: openGaussythcs00001/openGauss-workbench!352, 修改前端IP问题, merge feature-yangzihao-instance into release merge "feature-yangzihao-instance" into "release" 修改前端IP问题 Created-by: yangzihao Author-id: 7119754 MR-id: 7222222 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "release" 修改前端IP问题 See merge request: openGaussythcs00001/openGauss-workbench!353, 优化导出接口, merge release-zwr into release merge "release-zwr" into "release" 优化导出接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7222225 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 优化导出接口 See merge request: openGaussythcs00001/openGauss-workbench!354 Created-by: wuyulin Author-id: 7119753 MR-id: 7222230 Commit-by: zhouwenruo;yangzihao;Zihao Yang;wuyuebin;zhangcheng Merged-by: wuyulin Description: merge "release" into "develop" #708879791 历史数据诊断，诊断结果时间不完整。, merge feature-yangzihao-history into release merge "feature-yangzihao-history" into "release" #708879791 历史数据诊断，诊断结果时间不完整。 Created-by: yangzihao Author-id: 7119754 MR-id: 7221813 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-history" into "release" #708879791 历史数据诊断，诊断结果时间不完整。 See merge request: openGaussythcs00001/openGauss-workbench!345, #708877939 历史数据诊断详情，数据库进程当前使用CPU过高，优化显示样式。, Merge branch 'feature-yangzihao-instance' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-yangzihao-instance, merge feature-yangzihao-instance into release merge "feature-yangzihao-instance" into "release" #708877939 历史数据诊断详情，数据库进程当前使用CPU过高，优化显示样式。, Merge branch 'feature-yangzihao-instance' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-yangzihao-instance Created-by: yangzihao Author-id: 7119754 MR-id: 7221821 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "release" #708877939 历史数据诊断详情，数据库进程当前使用CPU过高，优化显示样式。, Merge branch 'feature-yangzihao-instance' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-yangzihao-instance See merge request: openGaussythcs00001/openGauss-workbench!346, 修复创建同义词的对象名称, merge bugfix-zhangcheng-0630-3 into release merge "bugfix-zhangcheng-0630-3" into "release" 修复创建同义词的对象名称 Created-by: zhangcheng Author-id: 7119759 MR-id: 7221892 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-3" into "release" 修复创建同义词的对象名称 See merge request: openGaussythcs00001/openGauss-workbench!347, 平台过滤路径, 修复创建表中英文, 平台过滤路径, merge bugfix-zhangcheng-0630-3 into release merge "bugfix-zhangcheng-0630-3" into "release" 修复创建表中英文 Created-by: zhangcheng Author-id: 7119759 MR-id: 7221905 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-3" into "release" 修复创建表中英文 See merge request: openGaussythcs00001/openGauss-workbench!348, #708877939 历史数据诊断详情，数据库进程当前使用CPU过高，优化显示样式。, merge feature-yangzihao-history into release merge "feature-yangzihao-history" into "release" #708877939 历史数据诊断详情，数据库进程当前使用CPU过高，优化显示样式。 Created-by: yangzihao Author-id: 7119754 MR-id: 7222043 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-history" into "release" #708877939 历史数据诊断详情，数据库进程当前使用CPU过高，优化显示样式。 See merge request: openGaussythcs00001/openGauss-workbench!350, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 样式调整, merge feature-wyb into release merge "feature-wyb" into "release" 平台过滤路径, 平台过滤路径, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 样式调整 Created-by: wuyuebin Author-id: 7158405 MR-id: 7222084 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 平台过滤路径, 平台过滤路径, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 样式调整 See merge request: openGaussythcs00001/openGauss-workbench!351, 优化导出接口, merge release-zwr into release merge "release-zwr" into "release" 优化导出接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7222192 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 优化导出接口 See merge request: openGaussythcs00001/openGauss-workbench!352, 修改前端IP问题, merge feature-yangzihao-instance into release merge "feature-yangzihao-instance" into "release" 修改前端IP问题 Created-by: yangzihao Author-id: 7119754 MR-id: 7222222 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "release" 修改前端IP问题 See merge request: openGaussythcs00001/openGauss-workbench!353, 优化导出接口, merge release-zwr into release merge "release-zwr" into "release" 优化导出接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7222225 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 优化导出接口 See merge request: openGaussythcs00001/openGauss-workbench!354 See merge request: openGaussythcs00001/openGauss-workbench!355 commit 9d3f45645f2620a7d078e6dca982c220148d3e5f Author: wuyulin <wuyulin@ncti-gba.cn> Date: Wed Jun 28 10:21:01 2023 +0800 bug同步 commit 41251b5d5fbab72e260c6e073f7549f30d2e9513 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Wed Jun 28 10:14:31 2023 +0800 优化导出接口 cherry-pick merge request: 优化导出接口 69ed7c7c48d9cfb71932b06e3a7422a6d1fe1fcb This cherry-pick merge request !354 commit 4be2381ac007a12b304475ccb8893e4d0fa44433 Merge: be3965dc 69ed7c7c Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Wed Jun 28 10:14:31 2023 +0800 merge release-zwr into release merge "release-zwr" into "release" 优化导出接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7222225 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 优化导出接口 See merge request: openGaussythcs00001/openGauss-workbench!354 commit 69ed7c7c48d9cfb71932b06e3a7422a6d1fe1fcb Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Wed Jun 28 10:13:38 2023 +0800 优化导出接口 commit 2e1c5ec51f73dc3ea0529f3c9ca53d6080e65f17 Merge: 6f45ae69 be3965dc Author: 罗梦 <luomeng@ncti-gba.cn> Date: Wed Jun 28 10:11:31 2023 +0800 Merge remote-tracking branch 'origin/release' into release commit be3965dcca00dfcf544d02103c7ba9e83b29d374 Merge: c85e7060 665a71a9 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Wed Jun 28 10:10:16 2023 +0800 merge feature-yangzihao-instance into release merge "feature-yangzihao-instance" into "release" 修改前端IP问题 Created-by: yangzihao Author-id: 7119754 MR-id: 7222222 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "release" 修改前端IP问题 See merge request: openGaussythcs00001/openGauss-workbench!353 commit 665a71a9a3ef179fa96f18311e7018e37232132b Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Wed Jun 28 10:08:37 2023 +0800 修改前端IP问题 commit 34f796f10306e829812eb02e24e47ef53f171324 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Wed Jun 28 10:07:56 2023 +0800 会话详情单元测试 commit 6f45ae69b811745aad7984b90c62d95cdaa83d41 Merge: 1888aba6 c85e7060 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Wed Jun 28 10:00:44 2023 +0800 Merge remote-tracking branch 'origin/release' into release commit a99ddcf0069b65ff33be35149e46e994919aad9b Merge: a5465159 87929935 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Wed Jun 28 10:00:18 2023 +0800 Merge branch 'JUnit' into develop commit 879299357758851b79326a4b2666461b6ac40f36 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Wed Jun 28 09:54:50 2023 +0800 会话详情单元测试 commit a546515927ca76c4156fc138e8a399355deeff0e Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Wed Jun 28 09:23:24 2023 +0800 优化导出接口 cherry-pick merge request: 优化导出接口 0078b406511874a9d7e058761a7ca9af8ac60c9f This cherry-pick merge request !352 commit c85e706092c7ed57e02eef564e8fc681acb2b15b Merge: 42480778 0078b406 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Wed Jun 28 09:23:24 2023 +0800 merge release-zwr into release merge "release-zwr" into "release" 优化导出接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7222192 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 优化导出接口 See merge request: openGaussythcs00001/openGauss-workbench!352 commit 0078b406511874a9d7e058761a7ca9af8ac60c9f Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Wed Jun 28 09:22:26 2023 +0800 优化导出接口 commit 4248077805cd762fdbe6ded3001ea796d150021f Merge: d638e5da b2870bd0 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Tue Jun 27 18:49:27 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 平台过滤路径, 平台过滤路径, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 样式调整 Created-by: wuyuebin Author-id: 7158405 MR-id: 7222084 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 平台过滤路径, 平台过滤路径, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 样式调整 See merge request: openGaussythcs00001/openGauss-workbench!351 commit b2870bd0d441d512e898aa2f9d453b9c0e1d11f4 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Jun 27 18:46:42 2023 +0800 样式调整 commit 976d709bc2a0c5c34781cb499e21b68aceb1d210 Merge: edbe9dee d638e5da Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Jun 27 18:43:17 2023 +0800 Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb commit 1888aba6c9854515db6ce729d5b92cdaec57c8ea Merge: 339161ab d638e5da Author: 罗梦 <luomeng@ncti-gba.cn> Date: Tue Jun 27 18:40:02 2023 +0800 Merge remote-tracking branch 'origin/release' into release # Conflicts: # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/constants/historyDiagnosis/OptionCommon.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/model/history/point/CurrentCpuDTO.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/model/history/point/CurrentCpuUsageDTO.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/history/point/AvgCpuUsageRate.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/history/point/HistoryWaitEvent.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/history/point/WdrAnalysis.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/collection/agent/CurrentCpuUsageItem.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/collection/agent/DbProcessCurrentCpuItem.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/collection/agent/OtherProcessCurrentCpuItem.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/collection/agent/TopDbProcessItem.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/AspAnalysis.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/CurrentCpuUsage.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/CurrentSlowSql.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/CurrentWaitEvent.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/DatabaseHostLowPressure.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/DatabaseHostPressure.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/DbProcessAvgCpuUsage.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/DbProcessCurrentCpuUsage.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/DeadlockAnalysis.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/HistorySlowSql.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/LockAnalysis.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/LockTimeout.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/OtherProcessAvgCpuUsage.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/OtherProcessCurrentCpuUsage.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/historyDiagnosis/point/TopDbProcess.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/util/AgentUtil.java # plugins/observability-sql-diagnosis/src/main/resources/messages.properties # plugins/observability-sql-diagnosis/src/main/resources/messages_zh_CN.properties commit d638e5daca9d7e487d193462b011611c6d0967cd Merge: d1e38da1 d5d60bce Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Tue Jun 27 17:59:14 2023 +0800 merge feature-yangzihao-history into release merge "feature-yangzihao-history" into "release" #708877939 历史数据诊断详情，数据库进程当前使用CPU过高，优化显示样式。 Created-by: yangzihao Author-id: 7119754 MR-id: 7222043 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-history" into "release" #708877939 历史数据诊断详情，数据库进程当前使用CPU过高，优化显示样式。 See merge request: openGaussythcs00001/openGauss-workbench!350 commit d5d60bce2418e67815afac3619b8040414174cdc Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue Jun 27 17:58:06 2023 +0800 #708877939 历史数据诊断详情，数据库进程当前使用CPU过高，优化显示样式。 commit bd7d972b8326f1db6c42c254dd85e8fce0830eff Merge: 329c8aa9 526d5e4d Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Tue Jun 27 15:42:44 2023 +0800 merge bugfix-zhangcheng-0630-2 into feature-codecheck merge "bugfix-zhangcheng-0630-2" into "feature-codecheck" 代码审查 Created-by: zhangcheng Author-id: 7119759 MR-id: 7221911 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "feature-codecheck" 代码审查 See merge request: openGaussythcs00001/openGauss-workbench!349 commit d1e38da1340701a588c176523fef6f2f0417912b Merge: 886a2eda 23ee8c0a Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Tue Jun 27 15:42:01 2023 +0800 merge bugfix-zhangcheng-0630-3 into release merge "bugfix-zhangcheng-0630-3" into "release" 修复创建表中英文 Created-by: zhangcheng Author-id: 7119759 MR-id: 7221905 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-3" into "release" 修复创建表中英文 See merge request: openGaussythcs00001/openGauss-workbench!348 commit edbe9dee8361298f910ccd3cc5370f69e2739b54 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Jun 27 15:37:24 2023 +0800 平台过滤路径 commit 23ee8c0ad986ae0ac48c872f1a74f676f798b464 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Tue Jun 27 15:34:52 2023 +0800 修复创建表中英文 commit bd4141320f63e29ba8a0b1e0aeac3c73dcac74e0 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Jun 27 15:32:18 2023 +0800 平台过滤路径 commit 526d5e4d12c778070f20aed932c90b760e4ffbeb Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Tue Jun 27 15:29:13 2023 +0800 代码审查 commit 886a2eda08810da22e9aaae57321555f67dbf6f7 Merge: 865cbbdf 8a7106af Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Tue Jun 27 15:14:59 2023 +0800 merge bugfix-zhangcheng-0630-3 into release merge "bugfix-zhangcheng-0630-3" into "release" 修复创建同义词的对象名称 Created-by: zhangcheng Author-id: 7119759 MR-id: 7221892 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-3" into "release" 修复创建同义词的对象名称 See merge request: openGaussythcs00001/openGauss-workbench!347 commit 8a7106afa9683867bb88d442350fd3476bb6eca1 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Tue Jun 27 15:14:11 2023 +0800 修复创建同义词的对象名称 commit 865cbbdf111369fa59978f19cc0247629e229915 Merge: 0283f180 ce6522d9 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Tue Jun 27 12:05:17 2023 +0800 merge feature-yangzihao-instance into release merge "feature-yangzihao-instance" into "release" #708877939 历史数据诊断详情，数据库进程当前使用CPU过高，优化显示样式。, Merge branch 'feature-yangzihao-instance' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-yangzihao-instance Created-by: yangzihao Author-id: 7119754 MR-id: 7221821 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "release" #708877939 历史数据诊断详情，数据库进程当前使用CPU过高，优化显示样式。, Merge branch 'feature-yangzihao-instance' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-yangzihao-instance See merge request: openGaussythcs00001/openGauss-workbench!346 commit ce6522d96f05efe88685c7a68ebb9b852f17d005 Merge: 36910afd 71ea052e Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue Jun 27 12:02:42 2023 +0800 Merge branch 'feature-yangzihao-instance' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-yangzihao-instance commit 36910afdd97613ae2090751e887ef0439bb08d8b Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue Jun 27 12:00:58 2023 +0800 #708877939 历史数据诊断详情，数据库进程当前使用CPU过高，优化显示样式。 commit 0283f180c940e86ac48d83064d528c835ab23fcd Merge: b8e200cb c8e96c31 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Tue Jun 27 11:43:38 2023 +0800 merge feature-yangzihao-history into release merge "feature-yangzihao-history" into "release" #708879791 历史数据诊断，诊断结果时间不完整。 Created-by: yangzihao Author-id: 7119754 MR-id: 7221813 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-history" into "release" #708879791 历史数据诊断，诊断结果时间不完整。 See merge request: openGaussythcs00001/openGauss-workbench!345 commit c8e96c31b6d02bb4b67fec9fc3ddb58aa6a94023 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue Jun 27 11:42:17 2023 +0800 #708879791 历史数据诊断，诊断结果时间不完整。 commit 823a4624aa0c4d1fa5d89de7ce17ff4a970d483b Merge: 5805bca3 b8e200cb Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Tue Jun 27 10:54:46 2023 +0800 merge release into develop merge "release" into "develop" codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7221190 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!336, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7221248 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!337, 连接信息ip限制，删除连接增加提示, merge bugfix-zhangcheng-0630-3 into release merge "bugfix-zhangcheng-0630-3" into "release" 连接信息ip限制，删除连接增加提示 Created-by: zhangcheng Author-id: 7119759 MR-id: 7221433 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-3" into "release" 连接信息ip限制，删除连接增加提示 See merge request: openGaussythcs00001/openGauss-workbench!338, 更新文档, Merge branch 'bugfix-zhangcheng-0630-3' into release, merge develop into release merge "develop" into "release" merge release into develop merge "release" into "develop" 连接信息名字限制长度, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 连接信息名字限制长度 Created-by: zhangcheng Author-id: 7119759 MR-id: 7219748 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 连接信息名字限制长度 See merge request: openGaussythcs00001/openGauss-workbench!300, 更新ds的readme和预览图, 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge feature-wyb into release merge "feature-wyb" into "release" 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb Created-by: wuyuebin Author-id: 7158405 MR-id: 7219754 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb See merge request: openGaussythcs00001/openGauss-workbench!301, 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, 调整创建模式未更新描述, merge release-zwr into release merge "release-zwr" into "release" 调整创建模式未更新描述 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7219868 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 调整创建模式未更新描述 See merge request: openGaussythcs00001/openGauss-workbench!302, 修复导出文件bug、删除多余代码, merge release-zwr into release merge "release-zwr" into "release" 修复导出文件bug、删除多余代码 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7219925 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 修复导出文件bug、删除多余代码 See merge request: openGaussythcs00001/openGauss-workbench!303, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。, merge feature-wyb into release merge "feature-wyb" into "release" 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。 Created-by: wuyuebin Author-id: 7158405 MR-id: 7219983 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。 See merge request: openGaussythcs00001/openGauss-workbench!304, checkcode, merge feature-wyb into release merge "feature-wyb" into "release" checkcode Created-by: wuyuebin Author-id: 7158405 MR-id: 7220196 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" checkcode See merge request: openGaussythcs00001/openGauss-workbench!306, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220240 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!307, 更新操作手册, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220293 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!308, 修复连接信息重置的问题, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 修复连接信息重置的问题 Created-by: zhangcheng Author-i Created-by: wuyulin Author-id: 7119753 MR-id: 7221794 Commit-by: wuyulin;zhouwenruo;luomeng;zhangcheng;wuyuebin Merged-by: wuyulin Description: merge "release" into "develop" codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7221190 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!336, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7221248 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!337, 连接信息ip限制，删除连接增加提示, merge bugfix-zhangcheng-0630-3 into release merge "bugfix-zhangcheng-0630-3" into "release" 连接信息ip限制，删除连接增加提示 Created-by: zhangcheng Author-id: 7119759 MR-id: 7221433 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-3" into "release" 连接信息ip限制，删除连接增加提示 See merge request: openGaussythcs00001/openGauss-workbench!338, 更新文档, Merge branch 'bugfix-zhangcheng-0630-3' into release, merge develop into release merge "develop" into "release" merge release into develop merge "release" into "develop" 连接信息名字限制长度, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 连接信息名字限制长度 Created-by: zhangcheng Author-id: 7119759 MR-id: 7219748 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 连接信息名字限制长度 See merge request: openGaussythcs00001/openGauss-workbench!300, 更新ds的readme和预览图, 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge feature-wyb into release merge "feature-wyb" into "release" 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb Created-by: wuyuebin Author-id: 7158405 MR-id: 7219754 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb See merge request: openGaussythcs00001/openGauss-workbench!301, 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, 调整创建模式未更新描述, merge release-zwr into release merge "release-zwr" into "release" 调整创建模式未更新描述 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7219868 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 调整创建模式未更新描述 See merge request: openGaussythcs00001/openGauss-workbench!302, 修复导出文件bug、删除多余代码, merge release-zwr into release merge "release-zwr" into "release" 修复导出文件bug、删除多余代码 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7219925 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 修复导出文件bug、删除多余代码 See merge request: openGaussythcs00001/openGauss-workbench!303, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。, merge feature-wyb into release merge "feature-wyb" into "release" 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。 Created-by: wuyuebin Author-id: 7158405 MR-id: 7219983 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。 See merge request: openGaussythcs00001/openGauss-workbench!304, checkcode, merge feature-wyb into release merge "feature-wyb" into "release" checkcode Created-by: wuyuebin Author-id: 7158405 MR-id: 7220196 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" checkcode See merge request: openGaussythcs00001/openGauss-workbench!306, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220240 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!307, 更新操作手册, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220293 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!308, 修复连接信息重置的问题, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 修复连接信息重置的问题 Created-by: zhangcheng Author-i See merge request: openGaussythcs00001/openGauss-workbench!344 commit b8e200cbb49d52f01eac6410835ecdabf6578dad Merge: d8713db2 5c638fb1 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Tue Jun 27 10:54:19 2023 +0800 merge release-wyl into release merge "release-wyl" into "release" bug, bug Created-by: wuyulin Author-id: 7119753 MR-id: 7221791 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" bug, bug See merge request: openGaussythcs00001/openGauss-workbench!343 commit 34acc9d740b3e28caaf729ab098b3af0321605a1 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Tue Jun 27 10:31:52 2023 +0800 maven配置单元测试及覆盖率 commit 5c638fb15ae07617df58a3346a7fb00ff59d361c Author: wuyulin <wuyulin@ncti-gba.cn> Date: Tue Jun 27 10:07:21 2023 +0800 bug commit 4bf2ed1082486f86de314fe8348bd3fcb7af224f Author: wuyulin <wuyulin@ncti-gba.cn> Date: Tue Jun 27 10:00:02 2023 +0800 bug commit 5805bca30de6925daa1f00aa1027c22fc02f7c04 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Tue Jun 27 09:42:17 2023 +0800 修改导出模式DDL没有分号问题 cherry-pick merge request: 修改导出模式DDL没有分号问题 654ee33c712f68d02a380071881bc7ab1d73b68d This cherry-pick merge request !342 commit d8713db243f7fe7df41b988f8607fe6f06626d1b Merge: a484233e 654ee33c Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Tue Jun 27 09:42:17 2023 +0800 merge release-zwr into release merge "release-zwr" into "release" 修改导出模式DDL没有分号问题 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7221739 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 修改导出模式DDL没有分号问题 See merge request: openGaussythcs00001/openGauss-workbench!342 commit 654ee33c712f68d02a380071881bc7ab1d73b68d Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Tue Jun 27 09:41:07 2023 +0800 修改导出模式DDL没有分号问题 commit 329c8aa9bc31a553441726b6152dce3216407922 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Mon Jun 26 16:49:30 2023 +0800 codecheck修改 commit a484233e2dd4079ce5d3b7820bc90560790f2367 Merge: 5555cfb1 960ffe02 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Mon Jun 26 14:58:14 2023 +0800 merge develop into release merge "develop" into "release" merge release into develop merge "release" into "develop" 连接信息名字限制长度, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 连接信息名字限制长度 Created-by: zhangcheng Author-id: 7119759 MR-id: 7219748 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 连接信息名字限制长度 See merge request: openGaussythcs00001/openGauss-workbench!300, 更新ds的readme和预览图, 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge feature-wyb into release merge "feature-wyb" into "release" 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb Created-by: wuyuebin Author-id: 7158405 MR-id: 7219754 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb See merge request: openGaussythcs00001/openGauss-workbench!301, 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, 调整创建模式未更新描述, merge release-zwr into release merge "release-zwr" into "release" 调整创建模式未更新描述 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7219868 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 调整创建模式未更新描述 See merge request: openGaussythcs00001/openGauss-workbench!302, 修复导出文件bug、删除多余代码, merge release-zwr into release merge "release-zwr" into "release" 修复导出文件bug、删除多余代码 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7219925 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 修复导出文件bug、删除多余代码 See merge request: openGaussythcs00001/openGauss-workbench!303, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。, merge feature-wyb into release merge "feature-wyb" into "release" 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。 Created-by: wuyuebin Author-id: 7158405 MR-id: 7219983 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。 See merge request: openGaussythcs00001/openGauss-workbench!304, checkcode, merge feature-wyb into release merge "feature-wyb" into "release" checkcode Created-by: wuyuebin Author-id: 7158405 MR-id: 7220196 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" checkcode See merge request: openGaussythcs00001/openGauss-workbench!306, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220240 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!307, 更新操作手册, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220293 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!308, 修复连接信息重置的问题, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 修复连接信息重置的问题 Created-by: zhangcheng Author-id: 7119759 MR-id: 7220370 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 修复连接信息重置的问题 See merge request: openGaussythcs00001/openGauss-workbench!309, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220375 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!310, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220425 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!311, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220435 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openG Created-by: luomeng Author-id: 7119743 MR-id: 7221500 Commit-by: luomeng;罗梦 Merged-by: luomeng Description: merge "develop" into "release" merge release into develop merge "release" into "develop" 连接信息名字限制长度, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 连接信息名字限制长度 Created-by: zhangcheng Author-id: 7119759 MR-id: 7219748 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 连接信息名字限制长度 See merge request: openGaussythcs00001/openGauss-workbench!300, 更新ds的readme和预览图, 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge feature-wyb into release merge "feature-wyb" into "release" 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb Created-by: wuyuebin Author-id: 7158405 MR-id: 7219754 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb See merge request: openGaussythcs00001/openGauss-workbench!301, 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, 调整创建模式未更新描述, merge release-zwr into release merge "release-zwr" into "release" 调整创建模式未更新描述 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7219868 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 调整创建模式未更新描述 See merge request: openGaussythcs00001/openGauss-workbench!302, 修复导出文件bug、删除多余代码, merge release-zwr into release merge "release-zwr" into "release" 修复导出文件bug、删除多余代码 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7219925 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 修复导出文件bug、删除多余代码 See merge request: openGaussythcs00001/openGauss-workbench!303, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。, merge feature-wyb into release merge "feature-wyb" into "release" 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。 Created-by: wuyuebin Author-id: 7158405 MR-id: 7219983 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。 See merge request: openGaussythcs00001/openGauss-workbench!304, checkcode, merge feature-wyb into release merge "feature-wyb" into "release" checkcode Created-by: wuyuebin Author-id: 7158405 MR-id: 7220196 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" checkcode See merge request: openGaussythcs00001/openGauss-workbench!306, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220240 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!307, 更新操作手册, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220293 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!308, 修复连接信息重置的问题, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 修复连接信息重置的问题 Created-by: zhangcheng Author-id: 7119759 MR-id: 7220370 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 修复连接信息重置的问题 See merge request: openGaussythcs00001/openGauss-workbench!309, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220375 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!310, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220425 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!311, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220435 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openG See merge request: openGaussythcs00001/openGauss-workbench!341 commit 960ffe02abafa04dfbc31da2354940430f0f715c Merge: 0bc8583c d3905325 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Mon Jun 26 14:57:45 2023 +0800 merge feature-lm into develop merge "feature-lm" into "develop" merge develop into feature-lm merge "develop" into "feature-lm" 连接信息名字限制长度, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 连接信息名字限制长度 Created-by: zhangcheng Author-id: 7119759 MR-id: 7219748 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 连接信息名字限制长度 See merge request: openGaussythcs00001/openGauss-workbench!300, 更新ds的readme和预览图, 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge feature-wyb into release merge "feature-wyb" into "release" 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb Created-by: wuyuebin Author-id: 7158405 MR-id: 7219754 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb See merge request: openGaussythcs00001/openGauss-workbench!301, 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, 调整创建模式未更新描述, merge release-zwr into release merge "release-zwr" into "release" 调整创建模式未更新描述 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7219868 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 调整创建模式未更新描述 See merge request: openGaussythcs00001/openGauss-workbench!302, 修复导出文件bug、删除多余代码, merge release-zwr into release merge "release-zwr" into "release" 修复导出文件bug、删除多余代码 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7219925 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 修复导出文件bug、删除多余代码 See merge request: openGaussythcs00001/openGauss-workbench!303, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。, merge feature-wyb into release merge "feature-wyb" into "release" 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。 Created-by: wuyuebin Author-id: 7158405 MR-id: 7219983 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。 See merge request: openGaussythcs00001/openGauss-workbench!304, checkcode, merge feature-wyb into release merge "feature-wyb" into "release" checkcode Created-by: wuyuebin Author-id: 7158405 MR-id: 7220196 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" checkcode See merge request: openGaussythcs00001/openGauss-workbench!306, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220240 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!307, 更新操作手册, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220293 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!308, 修复连接信息重置的问题, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 修复连接信息重置的问题 Created-by: zhangcheng Author-id: 7119759 MR-id: 7220370 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 修复连接信息重置的问题 See merge request: openGaussythcs00001/openGauss-workbench!309, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220375 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!310, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220425 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!311, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220435 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00 Created-by: luomeng Author-id: 7119743 MR-id: 7221499 Commit-by: 罗梦;luomeng Merged-by: luomeng Description: merge "feature-lm" into "develop" merge develop into feature-lm merge "develop" into "feature-lm" 连接信息名字限制长度, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 连接信息名字限制长度 Created-by: zhangcheng Author-id: 7119759 MR-id: 7219748 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 连接信息名字限制长度 See merge request: openGaussythcs00001/openGauss-workbench!300, 更新ds的readme和预览图, 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge feature-wyb into release merge "feature-wyb" into "release" 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb Created-by: wuyuebin Author-id: 7158405 MR-id: 7219754 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb See merge request: openGaussythcs00001/openGauss-workbench!301, 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, 调整创建模式未更新描述, merge release-zwr into release merge "release-zwr" into "release" 调整创建模式未更新描述 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7219868 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 调整创建模式未更新描述 See merge request: openGaussythcs00001/openGauss-workbench!302, 修复导出文件bug、删除多余代码, merge release-zwr into release merge "release-zwr" into "release" 修复导出文件bug、删除多余代码 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7219925 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 修复导出文件bug、删除多余代码 See merge request: openGaussythcs00001/openGauss-workbench!303, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。, merge feature-wyb into release merge "feature-wyb" into "release" 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。 Created-by: wuyuebin Author-id: 7158405 MR-id: 7219983 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。 See merge request: openGaussythcs00001/openGauss-workbench!304, checkcode, merge feature-wyb into release merge "feature-wyb" into "release" checkcode Created-by: wuyuebin Author-id: 7158405 MR-id: 7220196 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" checkcode See merge request: openGaussythcs00001/openGauss-workbench!306, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220240 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!307, 更新操作手册, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220293 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!308, 修复连接信息重置的问题, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 修复连接信息重置的问题 Created-by: zhangcheng Author-id: 7119759 MR-id: 7220370 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 修复连接信息重置的问题 See merge request: openGaussythcs00001/openGauss-workbench!309, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220375 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!310, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220425 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!311, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220435 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00 See merge request: openGaussythcs00001/openGauss-workbench!340 commit d3905325287dd6302cb542acc14604382f2753ab Author: 罗梦 <luomeng@ncti-gba.cn> Date: Mon Jun 26 14:56:46 2023 +0800 更新智能诊断插件readme commit aeab1a64b061192f139d62d4761c1dfe9cb81b6f Author: 罗梦 <luomeng@ncti-gba.cn> Date: Mon Jun 26 14:53:52 2023 +0800 历史数据诊断-修复一些codeCheck修改导致的bug commit 5555cfb1285f843c3739f7b8776201048053938a Merge: e25c3d3f ad0acde6 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Mon Jun 26 12:02:28 2023 +0800 Merge branch 'bugfix-zhangcheng-0630-3' into release commit ad0acde6752dd10832ce7552bb8a218150c7182a Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Mon Jun 26 11:57:41 2023 +0800 更新文档 commit e25c3d3ff35a0f15b9ad35ca361d49e5d0ee5b6d Merge: 4c3001d4 95da9f13 Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Mon Jun 26 11:48:45 2023 +0800 merge bugfix-zhangcheng-0630-3 into release merge "bugfix-zhangcheng-0630-3" into "release" 连接信息ip限制，删除连接增加提示 Created-by: zhangcheng Author-id: 7119759 MR-id: 7221433 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-3" into "release" 连接信息ip限制，删除连接增加提示 See merge request: openGaussythcs00001/openGauss-workbench!338 commit 95da9f13e20e2ec1cdc46bf5c63514dd7b38f495 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Mon Jun 26 11:46:42 2023 +0800 连接信息ip限制，删除连接增加提示 commit 56ece996203d791631037671581dccf11245d15a Author: wuyulin <wuyulin@ncti-gba.cn> Date: Mon Jun 26 10:11:19 2023 +0800 换行修改 commit 4c3001d4308b9d9114cd12e8953ba1a05ea5dbf7 Merge: a45ebf8d 6e082a75 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Sun Jun 25 18:39:57 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7221248 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!337 commit 6e082a75f9c4744a6dfcd4e639518633af1c44b5 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Sun Jun 25 18:38:43 2023 +0800 codecheck commit 264098e6c9a0cb240f7639772717dbd3dcc73f33 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Sun Jun 25 17:27:54 2023 +0800 CodeCheck修改 commit a45ebf8d0bbcffcfad74ccb5163e4df53de950df Merge: f72a64d1 5c071607 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Sun Jun 25 16:56:54 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7221190 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!336 commit 5c071607a60d11de38126f331a35a5aa7cc28a2a Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Sun Jun 25 16:54:43 2023 +0800 codecheck commit ecd60c85556a17d174cd51c3895c4284598e7fe4 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Sun Jun 25 16:53:21 2023 +0800 codecheck修改 commit c861b5730ae4add9f59655cf1563c12e40204452 Merge: 1a9a99a3 1f9dff0c Author: wuyulin <wuyulin@ncti-gba.cn> Date: Sun Jun 25 16:43:07 2023 +0800 Merge branch 'feature-codecheck' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-codecheck commit 1a9a99a316a704bd81a64c86e00e2577bfb5cd12 Author: wuyulin <wuyulin@ncti-gba.cn> Date: Sun Jun 25 16:20:15 2023 +0800 CodeCheck异常全部修改 commit aa61ad399e9f5b931a4a24ea87fe084b8684e1fd Merge: b3c97972 0bc8583c Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Sun Jun 25 15:39:53 2023 +0800 merge develop into feature-lm merge "develop" into "feature-lm" 连接信息名字限制长度, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 连接信息名字限制长度 Created-by: zhangcheng Author-id: 7119759 MR-id: 7219748 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 连接信息名字限制长度 See merge request: openGaussythcs00001/openGauss-workbench!300, 更新ds的readme和预览图, 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge feature-wyb into release merge "feature-wyb" into "release" 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb Created-by: wuyuebin Author-id: 7158405 MR-id: 7219754 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb See merge request: openGaussythcs00001/openGauss-workbench!301, 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, 调整创建模式未更新描述, merge release-zwr into release merge "release-zwr" into "release" 调整创建模式未更新描述 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7219868 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 调整创建模式未更新描述 See merge request: openGaussythcs00001/openGauss-workbench!302, 修复导出文件bug、删除多余代码, merge release-zwr into release merge "release-zwr" into "release" 修复导出文件bug、删除多余代码 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7219925 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 修复导出文件bug、删除多余代码 See merge request: openGaussythcs00001/openGauss-workbench!303, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。, merge feature-wyb into release merge "feature-wyb" into "release" 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。 Created-by: wuyuebin Author-id: 7158405 MR-id: 7219983 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。 See merge request: openGaussythcs00001/openGauss-workbench!304, checkcode, merge feature-wyb into release merge "feature-wyb" into "release" checkcode Created-by: wuyuebin Author-id: 7158405 MR-id: 7220196 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" checkcode See merge request: openGaussythcs00001/openGauss-workbench!306, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220240 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!307, 更新操作手册, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220293 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!308, 修复连接信息重置的问题, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 修复连接信息重置的问题 Created-by: zhangcheng Author-id: 7119759 MR-id: 7220370 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 修复连接信息重置的问题 See merge request: openGaussythcs00001/openGauss-workbench!309, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220375 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!310, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220425 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!311, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220435 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!312, 删除无用代码, merge bugfix-zhangcheng-0630 Created-by: luomeng Author-id: 7119743 MR-id: 7221134 Commit-by: luomeng;yangzihao;Zihao Yang;张昊宇;wuyuebin;liupengfei;zhangcheng;zengseliang;zhouwenruo Merged-by: luomeng Description: merge "develop" into "feature-lm" 连接信息名字限制长度, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 连接信息名字限制长度 Created-by: zhangcheng Author-id: 7119759 MR-id: 7219748 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 连接信息名字限制长度 See merge request: openGaussythcs00001/openGauss-workbench!300, 更新ds的readme和预览图, 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge feature-wyb into release merge "feature-wyb" into "release" 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb Created-by: wuyuebin Author-id: 7158405 MR-id: 7219754 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb See merge request: openGaussythcs00001/openGauss-workbench!301, 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, 调整创建模式未更新描述, merge release-zwr into release merge "release-zwr" into "release" 调整创建模式未更新描述 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7219868 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 调整创建模式未更新描述 See merge request: openGaussythcs00001/openGauss-workbench!302, 修复导出文件bug、删除多余代码, merge release-zwr into release merge "release-zwr" into "release" 修复导出文件bug、删除多余代码 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7219925 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 修复导出文件bug、删除多余代码 See merge request: openGaussythcs00001/openGauss-workbench!303, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。, merge feature-wyb into release merge "feature-wyb" into "release" 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。 Created-by: wuyuebin Author-id: 7158405 MR-id: 7219983 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。 See merge request: openGaussythcs00001/openGauss-workbench!304, checkcode, merge feature-wyb into release merge "feature-wyb" into "release" checkcode Created-by: wuyuebin Author-id: 7158405 MR-id: 7220196 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" checkcode See merge request: openGaussythcs00001/openGauss-workbench!306, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220240 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!307, 更新操作手册, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220293 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!308, 修复连接信息重置的问题, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 修复连接信息重置的问题 Created-by: zhangcheng Author-id: 7119759 MR-id: 7220370 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 修复连接信息重置的问题 See merge request: openGaussythcs00001/openGauss-workbench!309, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220375 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!310, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220425 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!311, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220435 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!312, 删除无用代码, merge bugfix-zhangcheng-0630 See merge request: openGaussythcs00001/openGauss-workbench!335 commit 0bc8583c03ac9c611f8ac0af7985111c716b346f Merge: af541796 f72a64d1 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Sun Jun 25 15:39:22 2023 +0800 merge release into develop merge "release" into "develop" 连接信息名字限制长度, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 连接信息名字限制长度 Created-by: zhangcheng Author-id: 7119759 MR-id: 7219748 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 连接信息名字限制长度 See merge request: openGaussythcs00001/openGauss-workbench!300, 更新ds的readme和预览图, 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge feature-wyb into release merge "feature-wyb" into "release" 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb Created-by: wuyuebin Author-id: 7158405 MR-id: 7219754 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb See merge request: openGaussythcs00001/openGauss-workbench!301, 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, 调整创建模式未更新描述, merge release-zwr into release merge "release-zwr" into "release" 调整创建模式未更新描述 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7219868 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 调整创建模式未更新描述 See merge request: openGaussythcs00001/openGauss-workbench!302, 修复导出文件bug、删除多余代码, merge release-zwr into release merge "release-zwr" into "release" 修复导出文件bug、删除多余代码 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7219925 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 修复导出文件bug、删除多余代码 See merge request: openGaussythcs00001/openGauss-workbench!303, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。, merge feature-wyb into release merge "feature-wyb" into "release" 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。 Created-by: wuyuebin Author-id: 7158405 MR-id: 7219983 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。 See merge request: openGaussythcs00001/openGauss-workbench!304, checkcode, merge feature-wyb into release merge "feature-wyb" into "release" checkcode Created-by: wuyuebin Author-id: 7158405 MR-id: 7220196 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" checkcode See merge request: openGaussythcs00001/openGauss-workbench!306, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220240 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!307, 更新操作手册, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220293 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!308, 修复连接信息重置的问题, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 修复连接信息重置的问题 Created-by: zhangcheng Author-id: 7119759 MR-id: 7220370 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 修复连接信息重置的问题 See merge request: openGaussythcs00001/openGauss-workbench!309, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220375 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!310, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220425 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!311, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220435 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!312, 删除无用代码, merge bugfix-zhangcheng-0630-2 Created-by: luomeng Author-id: 7119743 MR-id: 7221133 Commit-by: yangzihao;Zihao Yang;张昊宇;luomeng;wuyuebin;liupengfei;zhangcheng;zengseliang;zhouwenruo Merged-by: luomeng Description: merge "release" into "develop" 连接信息名字限制长度, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 连接信息名字限制长度 Created-by: zhangcheng Author-id: 7119759 MR-id: 7219748 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 连接信息名字限制长度 See merge request: openGaussythcs00001/openGauss-workbench!300, 更新ds的readme和预览图, 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge feature-wyb into release merge "feature-wyb" into "release" 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb Created-by: wuyuebin Author-id: 7158405 MR-id: 7219754 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb See merge request: openGaussythcs00001/openGauss-workbench!301, 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, 调整创建模式未更新描述, merge release-zwr into release merge "release-zwr" into "release" 调整创建模式未更新描述 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7219868 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 调整创建模式未更新描述 See merge request: openGaussythcs00001/openGauss-workbench!302, 修复导出文件bug、删除多余代码, merge release-zwr into release merge "release-zwr" into "release" 修复导出文件bug、删除多余代码 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7219925 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 修复导出文件bug、删除多余代码 See merge request: openGaussythcs00001/openGauss-workbench!303, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。, merge feature-wyb into release merge "feature-wyb" into "release" 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。 Created-by: wuyuebin Author-id: 7158405 MR-id: 7219983 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。 See merge request: openGaussythcs00001/openGauss-workbench!304, checkcode, merge feature-wyb into release merge "feature-wyb" into "release" checkcode Created-by: wuyuebin Author-id: 7158405 MR-id: 7220196 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" checkcode See merge request: openGaussythcs00001/openGauss-workbench!306, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220240 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!307, 更新操作手册, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220293 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!308, 修复连接信息重置的问题, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 修复连接信息重置的问题 Created-by: zhangcheng Author-id: 7119759 MR-id: 7220370 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 修复连接信息重置的问题 See merge request: openGaussythcs00001/openGauss-workbench!309, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220375 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!310, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220425 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!311, codecheck, merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220435 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!312, 删除无用代码, merge bugfix-zhangcheng-0630-2 See merge request: openGaussythcs00001/openGauss-workbench!334 commit bf661eda3ff76a4ffd7b4fa518db0ec394fb9d5d Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Sun Jun 25 15:22:02 2023 +0800 增加小数位,更改topsql逻辑 commit 1f9dff0c7412d2d8a956894f6c9109cfb052dc3f Merge: af541796 5bbaaee1 Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Sun Jun 25 15:21:12 2023 +0800 merge bugfix-zhangcheng-0630-2 into feature-codecheck merge "bugfix-zhangcheng-0630-2" into "feature-codecheck" 连接信息名字限制长度, 修复连接信息重置的问题, 删除无用代码, 改变量名 Created-by: zhangcheng Author-id: 7119759 MR-id: 7221116 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "feature-codecheck" 连接信息名字限制长度, 修复连接信息重置的问题, 删除无用代码, 改变量名 See merge request: openGaussythcs00001/openGauss-workbench!333 commit 5bbaaee1883399cb73f58dbdc8b25fa7a3eadccc Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Sun Jun 25 15:19:55 2023 +0800 改变量名 commit f72a64d1eca685695b82738f7c1ca4944fdb258e Merge: 1dd249b9 8eb30b64 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Sun Jun 25 10:35:02 2023 +0800 merge feature-yangzihao-history into release merge "feature-yangzihao-history" into "release" 修复历史数据诊断前端代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7220971 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-history" into "release" 修复历史数据诊断前端代码 See merge request: openGaussythcs00001/openGauss-workbench!332 commit 8eb30b642931d1481ce0678056a8fd7e8d6a4398 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Sun Jun 25 10:33:53 2023 +0800 修复历史数据诊断前端代码 commit 1dd249b99e5985ed8370c4ce5e772788e2e20efb Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Sun Jun 25 10:03:26 2023 +0800 采集器连接数据库 commit 6d12fa1cfacb8fe68d03868f723ae90a732de009 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 20 08:47:39 2023 +0800 文档.图片 commit 04efac02327684af18c120147db631a9ce0d0a0d Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 14:21:40 2023 +0800 配置 commit 7fc3dda5e5c769c27aa7365e5d5b63b2c145b8d7 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:50:46 2023 +0800 Squashed commit of the following: commit ae724aec71fed5b5351ed9f1d05b73be72d5d292 Merge: 84970cb9 78c32bbd Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:47:30 2023 +0800 Merge branch 'develop' into dev-zhy commit 84970cb9a70db7560fac4ac6e402f6279d99e0cf Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:44:39 2023 +0800 添加字段.移除无效文件,改名 commit 8dfcab30fcf7b303be606b978e331115259454bd Merge: 5ab1258e 933581fe Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Sun Jun 25 10:16:53 2023 +0800 Merge branch 'master' of https://gitee.com/banlijam/openGauss-workbench into codecheck # Conflicts: # plugins/data-studio/web-ui/src/layout/Sidebar/index.vue # plugins/data-studio/web-ui/src/views/createTable/components/IndexesTab.vue # plugins/observability-instance/InstanceExporter/.gitignore # plugins/observability-instance/InstanceExporter/pom.xml # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/Application.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/DBmetric.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/OSmetric.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/system/cpu/LoadAvg.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/system/memory/ProcMeminfo.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/metric/system/network/SockStat.java # plugins/observability-instance/InstanceExporter/src/main/java/org/opengauss/plugin/agent/util/StringUtil.java # plugins/observability-instance/InstanceExporter/src/main/resources/application.yml # plugins/observability-instance/InstanceExporter/src/main/resources/logbak-spring.xml # plugins/observability-instance/InstanceExporter/src/main/resources/og_exporter.yml # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/dto/session/DetailStatisticDto.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/dto/topsql/TopSQLNowReq.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/handler/session/SessionHandler.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/mapper/DbConfigMapper.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/mapper/TopSqlMapper.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/SessionService.java # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/service/provider/ClusterOpsProviderManager.java # plugins/observability-instance/web-ui/src/api/observability.ts # plugins/observability-instance/web-ui/src/api/session.ts # plugins/observability-instance/web-ui/src/api/sqlDetail.ts # plugins/observability-instance/web-ui/src/api/sqlDiagnosis.ts # plugins/observability-instance/web-ui/src/assets/style/color.module.scss # plugins/observability-instance/web-ui/src/assets/svg/detail.svg # plugins/observability-instance/web-ui/src/assets/svg/info-hollow.svg # plugins/observability-instance/web-ui/src/assets/svg/tips.svg # plugins/observability-instance/web-ui/src/components/IndexBar.vue # plugins/observability-instance/web-ui/src/components/MyCard2.vue # plugins/observability-instance/web-ui/src/components/echarts/IndexLine.vue # plugins/observability-instance/web-ui/src/components/echarts/LazyLine.vue # plugins/observability-instance/web-ui/src/hooks/global.ts # plugins/observability-instance/web-ui/src/pages/dashboardV2/Index.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/common.ts # plugins/observability-instance/web-ui/src/pages/dashboardV2/instanceMonitor/Index.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/instanceMonitor/instanceMetrics/Index.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/instanceMonitor/sessionMonitor/Detail.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/instanceMonitor/sessionMonitor/Index.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/instanceMonitor/topSQL/Index.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/performanceLoad/Index.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/resourceMonitor/CPU/Index.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/resourceMonitor/IO/Index.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/resourceMonitor/Index.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/resourceMonitor/memory/Index.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/resourceMonitor/network/Index.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/systemConfiguration/Index.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/systemConfiguration/password.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/wdr/Index.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/wdr/buildWdr.vue # plugins/observability-instance/web-ui/src/pages/dashboardV2/wdr/snapshotManage.vue # plugins/observability-instance/web-ui/src/pages/sql_detail/waitEvent/Index.vue # plugins/observability-instance/web-ui/src/utils/date.ts # plugins/observability-log-search/src/main/java/com/nctigba/observability/log/controller/EnvironmentController.java # plugins/observability-sql-diagnosis/pom.xml # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/config/DataSourceIniter.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/controller/EnvironmentController.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/mapper/DiagnosisTaskResultMapper.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/model/NctigbaEnv.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/AgentService.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/diagnosis/TaskCreator.java # plugins/observability-sql-diagnosis/src/main/java/com/nctigba/observability/sql/service/diagnosis/caller/BccCaller.java # plugins/observability-sql-diagnosis/src/main/resources/messages.properties # plugins/observability-sql-diagnosis/src/main/resources/messages_en_US.properties # plugins/observability-sql-diagnosis/src/main/resources/messages_zh_CN.properties # plugins/observability-sql-diagnosis/src/main/resources/opengauss-ebpf-1.0.0-SNAPSHOT.jar # plugins/observability-sql-diagnosis/web-ui/src/components/ClusterCascader.vue # plugins/observability-sql-diagnosis/web-ui/src/components/MyCard.vue # plugins/observability-sql-diagnosis/web-ui/src/pages/datasource/task_detail/Index.vue # plugins/observability-sql-diagnosis/web-ui/src/pages/datasource/task_detail/task_info.vue commit 5ab1258e5062170e8e40918982d4b311f1d8fb61 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Sun Jun 25 10:11:38 2023 +0800 codecheck commit f28501f1b5f06b54f47500598a0de397ac9120fb Merge: db6dc7c6 44cdbdc4 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Sun Jun 25 10:09:55 2023 +0800 merge feature-yangzihao-history into release merge "feature-yangzihao-history" into "release" 修复历史数据诊断前端BUG Created-by: yangzihao Author-id: 7119754 MR-id: 7220958 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-history" into "release" 修复历史数据诊断前端BUG See merge request: openGaussythcs00001/openGauss-workbench!331 commit 44cdbdc402c19f1f5025ec1041ba037ac37cd5fd Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Sun Jun 25 10:08:34 2023 +0800 修复历史数据诊断前端BUG commit 0a415874480338971f9611ed042ebcd733c6daab Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Sun Jun 25 10:03:26 2023 +0800 采集器连接数据库 commit db6dc7c6a8d47f9682d213845904132f2d5f8bac Merge: d2ff934a d8e500b3 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Sun Jun 25 09:48:08 2023 +0800 merge feature-yangzihao-history into release merge "feature-yangzihao-history" into "release" 历史数据诊断前端修改 Created-by: yangzihao Author-id: 7119754 MR-id: 7220926 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-history" into "release" 历史数据诊断前端修改 See merge request: openGaussythcs00001/openGauss-workbench!330 commit d8e500b3e55a5b81157e87bc4ed0595c680863b1 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Sun Jun 25 09:47:32 2023 +0800 历史数据诊断前端修改 commit dfe91892963254259a7baf4d226be97aeb0dd0dc Merge: 283d4746 af541796 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Sun Jun 25 09:43:46 2023 +0800 Merge branch 'develop' into dev-zhy commit 933581fe37a77dfe35925a313f785c7e330549c6 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Sun Jun 25 09:36:36 2023 +0800 codecheck commit df2644c7884cc3e78a4d73e6aa6af400b3a39c6e Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Sun Jun 25 09:03:51 2023 +0800 codecheck commit d2ff934a3f973d9bff4b27a7bab3a5f0da61613f Merge: 7a6db4f6 af541796 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Sat Jun 24 16:55:21 2023 +0800 merge develop into release merge "develop" into "release" 历史数据诊断-CodeCheck修改, merge feature-lm into develop merge "feature-lm" into "develop" 历史数据诊断-CodeCheck修改 Created-by: luomeng Author-id: 7119743 MR-id: 7220884 Commit-by: 罗梦 Merged-by: luomeng Description: merge "feature-lm" into "develop" 历史数据诊断-CodeCheck修改 See merge request: openGaussythcs00001/openGauss-workbench!328 Created-by: luomeng Author-id: 7119743 MR-id: 7220885 Commit-by: luomeng;罗梦 Merged-by: luomeng Description: merge "develop" into "release" 历史数据诊断-CodeCheck修改, merge feature-lm into develop merge "feature-lm" into "develop" 历史数据诊断-CodeCheck修改 Created-by: luomeng Author-id: 7119743 MR-id: 7220884 Commit-by: 罗梦 Merged-by: luomeng Description: merge "feature-lm" into "develop" 历史数据诊断-CodeCheck修改 See merge request: openGaussythcs00001/openGauss-workbench!328 See merge request: openGaussythcs00001/openGauss-workbench!329 commit af541796d853d559b2b769b64e9639e15a4ae7c4 Merge: 2b584d58 b3c97972 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Sat Jun 24 16:54:57 2023 +0800 merge feature-lm into develop merge "feature-lm" into "develop" 历史数据诊断-CodeCheck修改 Created-by: luomeng Author-id: 7119743 MR-id: 7220884 Commit-by: 罗梦 Merged-by: luomeng Description: merge "feature-lm" into "develop" 历史数据诊断-CodeCheck修改 See merge request: openGaussythcs00001/openGauss-workbench!328 commit b3c979729259f44203678af8d2d49a79d9185569 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Sat Jun 24 16:53:39 2023 +0800 历史数据诊断-CodeCheck修改 commit 7a6db4f60fd32b7e6960a14aec7c2abb2073bb16 Merge: e54c1d24 2b584d58 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Fri Jun 23 20:35:41 2023 +0800 merge develop into release merge "develop" into "release" merge develop into feature-lm merge "develop" into "feature-lm" 提交等待事件统计代码, 修改样式, Squashed commit of the following: commit ae724aec71fed5b5351ed9f1d05b73be72d5d292 Merge: 84970cb9 78c32bbd Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:47:30 2023 +0800 Merge branch 'develop' into dev-zhy commit 84970cb9a70db7560fac4ac6e402f6279d99e0cf Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:44:39 2023 +0800 添加字段.移除无效文件,改名, 配置, 打包, 更新用户操作手册, merge release-zwr into release merge "release-zwr" into "release" 更新用户操作手册 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7218971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 更新用户操作手册 See merge request: openGaussythcs00001/openGauss-workbench!285, 修复编辑表的关闭winId、默认列类型，新建表索引访问方式, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 修复编辑表的关闭winId、默认列类型，新建表索引访问方式 Created-by: zhangcheng Author-id: 7119759 MR-id: 7218984 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 修复编辑表的关闭winId、默认列类型，新建表索引访问方式 See merge request: openGaussythcs00001/openGauss-workbench!286, merge develop into release merge "develop" into "release" merge release into develop merge "release" into "develop" merge develop into release merge "develop" into "release" merge develop into feature-lm merge "develop" into "feature-lm" 修改sqlite初始化方式, Revert "提交代码" This reverts commit e103ff955ec521cc063adca87b25257b28405b0f, sqliteinit, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 告警中心前端代码, 告警中心后端代码, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge develop into release merge "develop" into "release" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 调整部分编辑表的功能, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 Created-by: zhangcheng Author-id: 7119759 MR-id: 7209563 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 See merge request: openGaussythcs00001/openGauss-workbench!126, 数据更新联调问题修复, merge feature-wyl into develop merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7209762 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 See merge request: openGaussythcs00001/openGauss-workbench!127, 生成函数覆盖率报告, Merge remote-tracking branch 'origin/develop' into feature-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/util/DebugUtils.java # plugins/data-studio/src/main/resources/messages_en_US.properties # plugins/data-studio/src/main/resources/messages_zh_CN.properties, 生成函数覆盖率报告, merge feature-zwr into develop merge "feature-zwr" into "develop" 生成函数覆盖率报告 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7209971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 生成函数覆盖率报告 See merge request: openGaussythcs00001/openGauss-workbench!128, 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 Created-by: zhangcheng Author-id: 7119759 MR-id: 7210033 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 See merge request: openGaussythcs00001/openGauss-workbench!130, 调整文件, 生成函数覆盖率报告, 导出视图、序列DDL功能, 导出DDL页面, 创建表, resultSet添加try去捕获, 添加导出函数，模式DDL接口, merge feature-zwr into develop merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7210854 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 See merge request: openGaussythcs00001/openGauss-workbench!131, 1, merge feature-wyl into develop merge "feature-wyl" into "develop" 创建表, 1 Created-by: wuyulin Author-id: 7119753 MR-id: 7210950 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 创建表, 1 See merge request: openGaussythcs00001/openGauss-workbench!132, Merge remote-tracking branch 'origin/develop' into feature-wyl, 导出DDL接口联调, 添加导出表数据接口, merge feature-zwr into develop merge "feature-zwr" into "develop" 添加导出表数据接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7211802 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" Created-by: luomeng Author-id: 7119743 MR-id: 7220853 Commit-by: luomeng;罗梦 Merged-by: luomeng Description: merge "develop" into "release" merge develop into feature-lm merge "develop" into "feature-lm" 提交等待事件统计代码, 修改样式, Squashed commit of the following: commit ae724aec71fed5b5351ed9f1d05b73be72d5d292 Merge: 84970cb9 78c32bbd Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:47:30 2023 +0800 Merge branch 'develop' into dev-zhy commit 84970cb9a70db7560fac4ac6e402f6279d99e0cf Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:44:39 2023 +0800 添加字段.移除无效文件,改名, 配置, 打包, 更新用户操作手册, merge release-zwr into release merge "release-zwr" into "release" 更新用户操作手册 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7218971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 更新用户操作手册 See merge request: openGaussythcs00001/openGauss-workbench!285, 修复编辑表的关闭winId、默认列类型，新建表索引访问方式, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 修复编辑表的关闭winId、默认列类型，新建表索引访问方式 Created-by: zhangcheng Author-id: 7119759 MR-id: 7218984 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 修复编辑表的关闭winId、默认列类型，新建表索引访问方式 See merge request: openGaussythcs00001/openGauss-workbench!286, merge develop into release merge "develop" into "release" merge release into develop merge "release" into "develop" merge develop into release merge "develop" into "release" merge develop into feature-lm merge "develop" into "feature-lm" 修改sqlite初始化方式, Revert "提交代码" This reverts commit e103ff955ec521cc063adca87b25257b28405b0f, sqliteinit, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 告警中心前端代码, 告警中心后端代码, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge develop into release merge "develop" into "release" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 调整部分编辑表的功能, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 Created-by: zhangcheng Author-id: 7119759 MR-id: 7209563 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 See merge request: openGaussythcs00001/openGauss-workbench!126, 数据更新联调问题修复, merge feature-wyl into develop merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7209762 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 See merge request: openGaussythcs00001/openGauss-workbench!127, 生成函数覆盖率报告, Merge remote-tracking branch 'origin/develop' into feature-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/util/DebugUtils.java # plugins/data-studio/src/main/resources/messages_en_US.properties # plugins/data-studio/src/main/resources/messages_zh_CN.properties, 生成函数覆盖率报告, merge feature-zwr into develop merge "feature-zwr" into "develop" 生成函数覆盖率报告 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7209971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 生成函数覆盖率报告 See merge request: openGaussythcs00001/openGauss-workbench!128, 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 Created-by: zhangcheng Author-id: 7119759 MR-id: 7210033 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 See merge request: openGaussythcs00001/openGauss-workbench!130, 调整文件, 生成函数覆盖率报告, 导出视图、序列DDL功能, 导出DDL页面, 创建表, resultSet添加try去捕获, 添加导出函数，模式DDL接口, merge feature-zwr into develop merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7210854 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 See merge request: openGaussythcs00001/openGauss-workbench!131, 1, merge feature-wyl into develop merge "feature-wyl" into "develop" 创建表, 1 Created-by: wuyulin Author-id: 7119753 MR-id: 7210950 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 创建表, 1 See merge request: openGaussythcs00001/openGauss-workbench!132, Merge remote-tracking branch 'origin/develop' into feature-wyl, 导出DDL接口联调, 添加导出表数据接口, merge feature-zwr into develop merge "feature-zwr" into "develop" 添加导出表数据接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7211802 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" See merge request: openGaussythcs00001/openGauss-workbench!327 commit 2b584d587145201df70548d9ed64eb01eb7d8a67 Merge: 91c0b01f 12eb27f0 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Fri Jun 23 20:35:03 2023 +0800 merge feature-lm into develop merge "feature-lm" into "develop" merge develop into feature-lm merge "develop" into "feature-lm" 提交等待事件统计代码, 修改样式, Squashed commit of the following: commit ae724aec71fed5b5351ed9f1d05b73be72d5d292 Merge: 84970cb9 78c32bbd Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:47:30 2023 +0800 Merge branch 'develop' into dev-zhy commit 84970cb9a70db7560fac4ac6e402f6279d99e0cf Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:44:39 2023 +0800 添加字段.移除无效文件,改名, 配置, 打包, 更新用户操作手册, merge release-zwr into release merge "release-zwr" into "release" 更新用户操作手册 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7218971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 更新用户操作手册 See merge request: openGaussythcs00001/openGauss-workbench!285, 修复编辑表的关闭winId、默认列类型，新建表索引访问方式, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 修复编辑表的关闭winId、默认列类型，新建表索引访问方式 Created-by: zhangcheng Author-id: 7119759 MR-id: 7218984 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 修复编辑表的关闭winId、默认列类型，新建表索引访问方式 See merge request: openGaussythcs00001/openGauss-workbench!286, merge develop into release merge "develop" into "release" merge release into develop merge "release" into "develop" merge develop into release merge "develop" into "release" merge develop into feature-lm merge "develop" into "feature-lm" 修改sqlite初始化方式, Revert "提交代码" This reverts commit e103ff955ec521cc063adca87b25257b28405b0f, sqliteinit, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 告警中心前端代码, 告警中心后端代码, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge develop into release merge "develop" into "release" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 调整部分编辑表的功能, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 Created-by: zhangcheng Author-id: 7119759 MR-id: 7209563 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 See merge request: openGaussythcs00001/openGauss-workbench!126, 数据更新联调问题修复, merge feature-wyl into develop merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7209762 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 See merge request: openGaussythcs00001/openGauss-workbench!127, 生成函数覆盖率报告, Merge remote-tracking branch 'origin/develop' into feature-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/util/DebugUtils.java # plugins/data-studio/src/main/resources/messages_en_US.properties # plugins/data-studio/src/main/resources/messages_zh_CN.properties, 生成函数覆盖率报告, merge feature-zwr into develop merge "feature-zwr" into "develop" 生成函数覆盖率报告 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7209971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 生成函数覆盖率报告 See merge request: openGaussythcs00001/openGauss-workbench!128, 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 Created-by: zhangcheng Author-id: 7119759 MR-id: 7210033 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 See merge request: openGaussythcs00001/openGauss-workbench!130, 调整文件, 生成函数覆盖率报告, 导出视图、序列DDL功能, 导出DDL页面, 创建表, resultSet添加try去捕获, 添加导出函数，模式DDL接口, merge feature-zwr into develop merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7210854 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 See merge request: openGaussythcs00001/openGauss-workbench!131, 1, merge feature-wyl into develop merge "feature-wyl" into "develop" 创建表, 1 Created-by: wuyulin Author-id: 7119753 MR-id: 7210950 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 创建表, 1 See merge request: openGaussythcs00001/openGauss-workbench!132, Merge remote-tracking branch 'origin/develop' into feature-wyl, 导出DDL接口联调, 添加导出表数据接口, merge feature-zwr into develop merge "feature-zwr" into "develop" 添加导出表数据接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7211802 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "devel Created-by: luomeng Author-id: 7119743 MR-id: 7220852 Commit-by: 罗梦;luomeng Merged-by: luomeng Description: merge "feature-lm" into "develop" merge develop into feature-lm merge "develop" into "feature-lm" 提交等待事件统计代码, 修改样式, Squashed commit of the following: commit ae724aec71fed5b5351ed9f1d05b73be72d5d292 Merge: 84970cb9 78c32bbd Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:47:30 2023 +0800 Merge branch 'develop' into dev-zhy commit 84970cb9a70db7560fac4ac6e402f6279d99e0cf Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:44:39 2023 +0800 添加字段.移除无效文件,改名, 配置, 打包, 更新用户操作手册, merge release-zwr into release merge "release-zwr" into "release" 更新用户操作手册 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7218971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 更新用户操作手册 See merge request: openGaussythcs00001/openGauss-workbench!285, 修复编辑表的关闭winId、默认列类型，新建表索引访问方式, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 修复编辑表的关闭winId、默认列类型，新建表索引访问方式 Created-by: zhangcheng Author-id: 7119759 MR-id: 7218984 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 修复编辑表的关闭winId、默认列类型，新建表索引访问方式 See merge request: openGaussythcs00001/openGauss-workbench!286, merge develop into release merge "develop" into "release" merge release into develop merge "release" into "develop" merge develop into release merge "develop" into "release" merge develop into feature-lm merge "develop" into "feature-lm" 修改sqlite初始化方式, Revert "提交代码" This reverts commit e103ff955ec521cc063adca87b25257b28405b0f, sqliteinit, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 告警中心前端代码, 告警中心后端代码, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge develop into release merge "develop" into "release" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 调整部分编辑表的功能, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 Created-by: zhangcheng Author-id: 7119759 MR-id: 7209563 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 See merge request: openGaussythcs00001/openGauss-workbench!126, 数据更新联调问题修复, merge feature-wyl into develop merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7209762 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 See merge request: openGaussythcs00001/openGauss-workbench!127, 生成函数覆盖率报告, Merge remote-tracking branch 'origin/develop' into feature-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/util/DebugUtils.java # plugins/data-studio/src/main/resources/messages_en_US.properties # plugins/data-studio/src/main/resources/messages_zh_CN.properties, 生成函数覆盖率报告, merge feature-zwr into develop merge "feature-zwr" into "develop" 生成函数覆盖率报告 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7209971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 生成函数覆盖率报告 See merge request: openGaussythcs00001/openGauss-workbench!128, 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 Created-by: zhangcheng Author-id: 7119759 MR-id: 7210033 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 See merge request: openGaussythcs00001/openGauss-workbench!130, 调整文件, 生成函数覆盖率报告, 导出视图、序列DDL功能, 导出DDL页面, 创建表, resultSet添加try去捕获, 添加导出函数，模式DDL接口, merge feature-zwr into develop merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7210854 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 See merge request: openGaussythcs00001/openGauss-workbench!131, 1, merge feature-wyl into develop merge "feature-wyl" into "develop" 创建表, 1 Created-by: wuyulin Author-id: 7119753 MR-id: 7210950 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 创建表, 1 See merge request: openGaussythcs00001/openGauss-workbench!132, Merge remote-tracking branch 'origin/develop' into feature-wyl, 导出DDL接口联调, 添加导出表数据接口, merge feature-zwr into develop merge "feature-zwr" into "develop" 添加导出表数据接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7211802 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "devel See merge request: openGaussythcs00001/openGauss-workbench!326 commit e54c1d241747e5d09be80fc05ea80dd8b969e3e7 Merge: fe977123 71ea052e Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Fri Jun 23 15:27:47 2023 +0800 merge feature-yangzihao-instance into release merge "feature-yangzihao-instance" into "release" 修复实例监控前端代码 Created-by: yangzihao Author-id: 7119754 MR-id: 7220844 Commit-by: yangzihao;Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "release" 修复实例监控前端代码 See merge request: openGaussythcs00001/openGauss-workbench!325 commit 71ea052e429f54c6b56b10b4409a5adc3867ebdc Merge: c21df64e fe977123 Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Fri Jun 23 15:27:35 2023 +0800 解决冲突 commit c21df64ed0429603a8be196f2e5a69d75f5d2aa1 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Fri Jun 23 15:25:11 2023 +0800 修复实例监控前端代码 commit fe977123bb6e5b5181d83e9116b5334e42bf1d05 Merge: d0435d9e f862443b Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Thu Jun 22 00:00:35 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220820 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!324 commit f862443bf9f32dfbf3657ad5651373c2f89745a3 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Jun 21 23:57:09 2023 +0800 codecheck commit d0435d9e67ed071014b0d7d6dcba0c9d8ae35100 Merge: c9c273ea 5062fc0c Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Wed Jun 21 19:23:51 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" codecheck, codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220812 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck, codecheck See merge request: openGaussythcs00001/openGauss-workbench!323 commit 5062fc0cd545e92fb276ef290518ee7120bb7235 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Jun 21 19:22:48 2023 +0800 codecheck commit d06af9ee823e20f69bc2bf348ccea2a022924281 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Jun 21 19:20:40 2023 +0800 codecheck commit 12eb27f0775f0ed98f27219bac6810452f5c1a44 Author: 罗梦 <luomeng@ncti-gba.cn> Date: Wed Jun 21 17:56:05 2023 +0800 历史数据诊断-CodeCheck修改 commit 7a3a19fbb9e8e7e6b0f7a35ddbe892a5de780719 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Jun 21 17:52:37 2023 +0800 codecheck commit b6177439ab94bae2392058791474dfd68424770d Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Jun 21 17:44:40 2023 +0800 codecheck commit c9c273eaccb0a5e5b0499fb5ee2d00a3e13a6516 Merge: 63c9acd5 c683416f Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Wed Jun 21 17:39:18 2023 +0800 merge feature-yangzihao-instance into release merge "feature-yangzihao-instance" into "release" 修复实例监控前端BUG Created-by: yangzihao Author-id: 7119754 MR-id: 7220779 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "release" 修复实例监控前端BUG See merge request: openGaussythcs00001/openGauss-workbench!322 commit c683416f10e918e2542e761e96fd0420066f9083 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Wed Jun 21 17:32:02 2023 +0800 修复实例监控前端BUG commit a1530284835e98111f28864c843efcbd9b3d3aa5 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Jun 21 17:29:38 2023 +0800 codecheck commit 63c9acd5a20af45034acbc51bbafa4b378725121 Merge: 019cbc6a add3b1f4 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Wed Jun 21 17:29:06 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220774 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!321 commit add3b1f41a54da7b25afba29b38e7c394c1cb792 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Jun 21 17:28:24 2023 +0800 codecheck commit 27dd8794445d525bb4290af6e75e5ada62de03db Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Jun 21 17:19:16 2023 +0800 codecheck commit 6f5373dd0f8828cf1a8b5d90fef8db705dc54cbf Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Jun 21 17:09:46 2023 +0800 codecheck commit 019cbc6a42ca462339743ff13f3cb8a63927e41e Merge: ccb9dd2e ba2c7c6d Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Wed Jun 21 17:08:11 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220760 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!320 commit ba2c7c6d4b6b0d2abe98cb513cff4aadc72119e0 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Jun 21 17:07:13 2023 +0800 codecheck commit ccb9dd2e293ff95f8baadae4f09062e4e5b0e95c Merge: c299321d e23eedee Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Wed Jun 21 16:05:16 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220722 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!319 commit e23eedee8ebba4513188e4c96e9658b648b26745 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Jun 21 16:02:49 2023 +0800 codecheck commit 53e04f4c639f22a24db60f0aa7e4401cf8ff3ae7 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Jun 21 11:29:37 2023 +0800 codecheck commit c299321d4b4719cb45b4e89a2ac2c38bc5a92ce7 Merge: 664a2e32 7a12949c Author: yangzihao <72fabdbb97a94ca08d29cf6d35e47ffc@example.com> Date: Wed Jun 21 10:59:48 2023 +0800 merge feature-yangzihao-instance into release merge "feature-yangzihao-instance" into "release" 修改图表表笑，内存数据不正确的问题, 修复实例监控前端问题 Created-by: yangzihao Author-id: 7119754 MR-id: 7220592 Commit-by: Zihao Yang Merged-by: yangzihao Description: merge "feature-yangzihao-instance" into "release" 修改图表表笑，内存数据不正确的问题, 修复实例监控前端问题 See merge request: openGaussythcs00001/openGauss-workbench!318 commit 7a12949c9171df0227703594a5c2b1f5190adfc3 Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Wed Jun 21 10:51:34 2023 +0800 修复实例监控前端问题 commit 554a4a3a9f4c2f682babaf284d83a23c5dc90f2c Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Jun 21 10:30:36 2023 +0800 codecheck commit 7895be77e18d8ed025331a71688bb3a6c74ddc63 Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Jun 21 10:23:21 2023 +0800 codecheck commit 664a2e328c36ec2538fe62e0ce0cb9f626f607e5 Merge: ae37e887 ffcdf254 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Wed Jun 21 10:09:27 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220559 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!317 commit ffcdf2543eadd076399cd232bd2dccbdd0c50b4a Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Jun 21 10:08:16 2023 +0800 codecheck commit ad7e15e235facc747733b16327e1b77d6373e15c Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Jun 21 09:34:44 2023 +0800 codecheck commit b1240a46cf95c6ffd72d56908a00131fe4fc74bb Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Wed Jun 21 09:29:55 2023 +0800 codecheck commit ae37e8879d5ada9eed79199f3454bd64bdd6cd5a Merge: 88ac8c44 91c0b01f Author: liupengfei <liupengfei@ncti-gba.cn> Date: Wed Jun 21 09:19:11 2023 +0800 Merge branch 'develop' into release commit 91c0b01f7509b0f773072e643c17c54a01e32777 Merge: d594473f 84be1f6e Author: liupengfei <liupengfei@ncti-gba.cn> Date: Wed Jun 21 09:17:58 2023 +0800 Merge branch 'international' into develop commit 84be1f6e07ccff1da344543c56ba9a9c42b23553 Author: liupengfei <liupengfei@ncti-gba.cn> Date: Wed Jun 21 09:15:43 2023 +0800 添加实例监控国际化异常 commit 88ac8c44a751dfc68b0d9f67211a6470af492266 Merge: 6ad52942 0ac032a1 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Wed Jun 21 02:14:19 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220537 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!316 commit 0ac032a14e9fd493867e1b7028a76fcaaf7c6341 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Jun 21 02:12:43 2023 +0800 codecheck commit 6ad52942e867274fadd12a0c79abf4efbafd5597 Merge: e17e1cf4 7f37af16 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Wed Jun 21 01:49:59 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220536 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!315 commit 7f37af16c401b94f561b8e166e54a26e68e7d7d8 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Wed Jun 21 01:47:01 2023 +0800 codecheck commit a054865f638fdc45f1a342b7066d2371c6eddfcb Author: Zihao Yang <yangzihao@ncti-gba.cn> Date: Tue Jun 20 20:44:51 2023 +0800 修改图表表笑，内存数据不正确的问题 commit e17e1cf42bea769bd00164eeeeca1cc1e1db3d40 Merge: c2b0c20e 13754b1d Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Tue Jun 20 19:18:08 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220498 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!314 commit 13754b1d0a0fdd0aa2394ecf57ecc43bc65b78d3 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Jun 20 19:16:44 2023 +0800 codecheck commit c2b0c20ee92f3a197b82ff67618c0488e97d651f Merge: 2f321f10 8e0a22a0 Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Tue Jun 20 18:24:50 2023 +0800 merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 删除无用代码 Created-by: zhangcheng Author-id: 7119759 MR-id: 7220477 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 删除无用代码 See merge request: openGaussythcs00001/openGauss-workbench!313 commit 8e0a22a01506b8e5a01451b6985d185e7ab7a2d4 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Tue Jun 20 18:23:47 2023 +0800 删除无用代码 commit 2f321f10ccce910f999040904fe9c0a8cf3457ab Merge: 83367e31 ff721b38 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Tue Jun 20 17:27:51 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220435 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!312 commit ff721b3830c6f1a9e2d1a707d56a782ff341ca33 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Jun 20 17:26:38 2023 +0800 codecheck commit 83367e31d772d9f7f9ddd75ef85095341f55ade6 Merge: 17df5490 5a051d9b Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Tue Jun 20 17:07:41 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220425 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!311 commit 5a051d9b0e00fe36d9ff9a67d535413b9ed39d00 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Jun 20 17:05:52 2023 +0800 codecheck commit 17df549029ff8e125822099cc833b04dfc04341e Merge: a8c6d9eb 18046332 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Tue Jun 20 15:57:40 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220375 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!310 commit 180463324bcaf7e14725562744cb6277ffdf0ed4 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Jun 20 15:56:19 2023 +0800 codecheck commit a8c6d9eb17f2812782225c1302591374ef0e316c Merge: 40a7d06c 1240d2ff Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Tue Jun 20 15:39:06 2023 +0800 merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 修复连接信息重置的问题 Created-by: zhangcheng Author-id: 7119759 MR-id: 7220370 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 修复连接信息重置的问题 See merge request: openGaussythcs00001/openGauss-workbench!309 commit 1240d2ffea1a56f7a49c7674330de6d63a609b4a Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Tue Jun 20 15:36:32 2023 +0800 修复连接信息重置的问题 commit 40a7d06c58221ed9e322008508397a1b930d1d43 Merge: 6d588477 920a3bca Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Tue Jun 20 12:08:32 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220293 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!308 commit 920a3bca0492ddccc7c9c78d8c9e10fbbdffa16f Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Jun 20 12:06:56 2023 +0800 codecheck commit 6d5884770776a99455b759ac96033aece8e1b6e0 Author: zengseliang <zengseliang@ncti-gba.cn> Date: Tue Jun 20 11:35:53 2023 +0800 更新操作手册 commit 14360758f39259a79da081aee259afe9b197fc68 Merge: 279978fc b2328927 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Tue Jun 20 10:29:30 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" codecheck Created-by: wuyuebin Author-id: 7158405 MR-id: 7220240 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" codecheck See merge request: openGaussythcs00001/openGauss-workbench!307 commit b23289272d2e2d7573fd582442192d7aa2242369 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Jun 20 10:27:05 2023 +0800 codecheck commit 279978fcc53fd555873698566e09b0bea49bb6be Merge: a633cb73 ee2a26fa Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Tue Jun 20 09:42:38 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" checkcode Created-by: wuyuebin Author-id: 7158405 MR-id: 7220196 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" checkcode See merge request: openGaussythcs00001/openGauss-workbench!306 commit ee2a26fa09d607d8de2aedfbf899f9c51ea565a2 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Tue Jun 20 09:40:30 2023 +0800 checkcode commit 0be59d845ac93fa9bf8511c1250acc1857c74537 Merge: 03ce68cc d594473f Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Tue Jun 20 08:56:52 2023 +0800 merge develop into feature-lm merge "develop" into "feature-lm" 修改异常处理, Merge remote-tracking branch 'origin/release' into release, merge develop into release merge "develop" into "release" merge develop into feature-lm merge "develop" into "feature-lm" 修改pg_default问题, 编辑表刷新和关闭更新winId，导出接口做500的错误判断, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 编辑表刷新和关闭更新winId，导出接口做500的错误判断 Created-by: zhangcheng Author-id: 7119759 MR-id: 7217451 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 编辑表刷新和关闭更新winId，导出接口做500的错误判断 See merge request: openGaussythcs00001/openGauss-workbench!247, Merge remote-tracking branch 'origin/release' into release-wyl, Merge remote-tracking branch 'origin/release' into release-wyl, merge develop into release merge "develop" into "release" 版权信息, merge release into develop merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 Created-by: wuyulin Author-id: 7119753 MR-id: 7217325 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 See merge request: openGaussythcs00001/openGauss-workbench!236, merge release into develop merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 Created-by: wuyulin Author-id: 7119753 MR-id: 7217342 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 See merge request: openGaussythcs00001/openGauss-workbench!238, merge release into develop merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 Created-by: wuyulin Author-id: 7119753 MR-id: 7217355 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 See merge request: openGaussythcs00001/openGauss-workbench!240, 缩进和版权, 配置, 仅添加java文件版权, merge release into develop merge "release" into "develop" 分区表问题修改, merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 Created-by: wuyulin Author-id: 7119753 MR-id: 7217395 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 分区表问题修改, merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 See merge request: openGaussythcs00001/openGauss-workbench!242, merge release into develop merge "release" into "develop" 代码格式化, merge feature-wyb into release merge "feature-wyb" into "release" 代码格式化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7217417 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!243, 代码格式化, merge feature-zwr into release merge "feature-zwr" into "release" 代码格式化 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217433 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!244 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217436 Commit-by: zhouwenruo;wuyue Created-by: luomeng Author-id: 7119743 MR-id: 7220155 Commit-by: zhouwenruo;wuyulin;hw73730920/wuguobiao;luomeng Merged-by: luomeng Description: merge "develop" into "feature-lm" 修改异常处理, Merge remote-tracking branch 'origin/release' into release, merge develop into release merge "develop" into "release" merge develop into feature-lm merge "develop" into "feature-lm" 修改pg_default问题, 编辑表刷新和关闭更新winId，导出接口做500的错误判断, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 编辑表刷新和关闭更新winId，导出接口做500的错误判断 Created-by: zhangcheng Author-id: 7119759 MR-id: 7217451 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 编辑表刷新和关闭更新winId，导出接口做500的错误判断 See merge request: openGaussythcs00001/openGauss-workbench!247, Merge remote-tracking branch 'origin/release' into release-wyl, Merge remote-tracking branch 'origin/release' into release-wyl, merge develop into release merge "develop" into "release" 版权信息, merge release into develop merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 Created-by: wuyulin Author-id: 7119753 MR-id: 7217325 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 See merge request: openGaussythcs00001/openGauss-workbench!236, merge release into develop merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 Created-by: wuyulin Author-id: 7119753 MR-id: 7217342 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 See merge request: openGaussythcs00001/openGauss-workbench!238, merge release into develop merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 Created-by: wuyulin Author-id: 7119753 MR-id: 7217355 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 See merge request: openGaussythcs00001/openGauss-workbench!240, 缩进和版权, 配置, 仅添加java文件版权, merge release into develop merge "release" into "develop" 分区表问题修改, merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 Created-by: wuyulin Author-id: 7119753 MR-id: 7217395 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 分区表问题修改, merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 See merge request: openGaussythcs00001/openGauss-workbench!242, merge release into develop merge "release" into "develop" 代码格式化, merge feature-wyb into release merge "feature-wyb" into "release" 代码格式化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7217417 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!243, 代码格式化, merge feature-zwr into release merge "feature-zwr" into "release" 代码格式化 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217433 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!244 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217436 Commit-by: zhouwenruo;wuyue See merge request: openGaussythcs00001/openGauss-workbench!305 commit 283d47463008b9c42df92327af559f1458503f9b Merge: d6855cbc d594473f Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 20 08:52:09 2023 +0800 Merge branch 'develop' into dev-zhy commit d6855cbc2ea26cc573f5a9deb6dfd7244c048b5c Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 20 08:47:39 2023 +0800 文档.图片 commit a633cb73ab75f9f4997579d91fbb29f963618bd2 Merge: b2ac55e3 b1a12189 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Mon Jun 19 16:26:42 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。 Created-by: wuyuebin Author-id: 7158405 MR-id: 7219983 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, 选择告警时间范围，告警记录列表没刷新。 See merge request: openGaussythcs00001/openGauss-workbench!304 commit b1a12189fb4bb0293aae96557c078ae6075aa6d3 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Jun 19 16:25:18 2023 +0800 选择告警时间范围，告警记录列表没刷新。 commit 452fd921f53696927d3d50a7c428e80baf55db5f Merge: 0be3321b b2ac55e3 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Jun 19 16:23:29 2023 +0800 Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb commit d594473f8d5759cd13dbe3bd08836792a1554e9a Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Mon Jun 19 14:53:05 2023 +0800 修复导出文件bug、删除多余代码 cherry-pick merge request: 修复导出文件bug、删除多余代码 53684947b76b5f92df48e7abedbc22b66ea1e686 This cherry-pick merge request !303 commit b2ac55e3043e5723d2184cd503170b791ee2777d Merge: 202c7837 53684947 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Mon Jun 19 14:53:05 2023 +0800 merge release-zwr into release merge "release-zwr" into "release" 修复导出文件bug、删除多余代码 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7219925 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 修复导出文件bug、删除多余代码 See merge request: openGaussythcs00001/openGauss-workbench!303 commit 53684947b76b5f92df48e7abedbc22b66ea1e686 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Mon Jun 19 14:51:12 2023 +0800 修复导出文件bug、删除多余代码 commit f3403570ddbb894ac87b179240cf7466860c97e4 Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Mon Jun 19 11:50:18 2023 +0800 调整创建模式未更新描述 cherry-pick merge request: 调整创建模式未更新描述 53cb0acee1ca5b2996a1a7f02d24376d9e0cbc93 This cherry-pick merge request !302 commit 202c78370d3227ae471132593e0b8cdde3ce558d Merge: 81a8eb5c 53cb0ace Author: zhouwenruo <2a38e55c962e4ddfbfd6b9b94c6be090@example.com> Date: Mon Jun 19 11:50:18 2023 +0800 merge release-zwr into release merge "release-zwr" into "release" 调整创建模式未更新描述 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7219868 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 调整创建模式未更新描述 See merge request: openGaussythcs00001/openGauss-workbench!302 commit 53cb0acee1ca5b2996a1a7f02d24376d9e0cbc93 Author: zhouwenruo <zhouwenruo@ncti-gba.cn> Date: Mon Jun 19 11:49:15 2023 +0800 调整创建模式未更新描述 commit 0be3321bf05ce4eafefe7f29d562bffe87a9c4ff Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Jun 19 11:44:30 2023 +0800 修复相关bug: 告警规则，规则名称搜索框应支持模糊搜索。 告警记录，搜索条件集群/实例没有清空按钮。 告警规则，查看，告警通知复选框应置灰。 commit 81a8eb5cbfae5fbbf96c9d4b8d45f80393833d58 Merge: af7168e7 47f08c16 Author: wuyuebin <58e112e4c6c44af7adca90776a8eecc3@example.com> Date: Mon Jun 19 09:16:39 2023 +0800 merge feature-wyb into release merge "feature-wyb" into "release" 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb Created-by: wuyuebin Author-id: 7158405 MR-id: 7219754 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 修改操作手册； 修复相关bug, Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb See merge request: openGaussythcs00001/openGauss-workbench!301 commit 47f08c1600799fbc5c1afc711d263e08ccb96f0a Merge: b83027b3 af7168e7 Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Jun 19 09:14:59 2023 +0800 Merge branch 'release' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb commit b83027b344a7996743b256d4c1ffc6164b2b1ebd Author: wuyuebin <wuyuebin@ncti-gba.cn> Date: Mon Jun 19 09:13:59 2023 +0800 修改操作手册； 修复相关bug commit af7168e75be0483eae30d5fee1c26ff0c1bd8b01 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Mon Jun 19 09:09:14 2023 +0800 更新ds的readme和预览图 commit 7b2e238d135f7fb56366ef81e22aa9acd04bdf08 Merge: 59682143 f7c86af2 Author: zhangcheng <e4db2493e2624868a2886fe6bcc91b32@example.com> Date: Mon Jun 19 09:02:44 2023 +0800 merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 连接信息名字限制长度 Created-by: zhangcheng Author-id: 7119759 MR-id: 7219748 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 连接信息名字限制长度 See merge request: openGaussythcs00001/openGauss-workbench!300 commit f7c86af26df821968550a82934cc2af48b62fb95 Author: zhangcheng <zhangcheng@ncti-gba.cn> Date: Mon Jun 19 09:01:37 2023 +0800 连接信息名字限制长度 commit c8507823eed2f3cbf22d46791ed575e8e46d7a16 Merge: c6dcfdf3 59682143 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Fri Jun 16 17:38:20 2023 +0800 merge release into develop merge "release" into "develop" 修改异常处理, Merge remote-tracking branch 'origin/release' into release, merge develop into release merge "develop" into "release" merge develop into feature-lm merge "develop" into "feature-lm" 修改pg_default问题, 编辑表刷新和关闭更新winId，导出接口做500的错误判断, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 编辑表刷新和关闭更新winId，导出接口做500的错误判断 Created-by: zhangcheng Author-id: 7119759 MR-id: 7217451 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 编辑表刷新和关闭更新winId，导出接口做500的错误判断 See merge request: openGaussythcs00001/openGauss-workbench!247, Merge remote-tracking branch 'origin/release' into release-wyl, Merge remote-tracking branch 'origin/release' into release-wyl, merge develop into release merge "develop" into "release" 版权信息, merge release into develop merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 Created-by: wuyulin Author-id: 7119753 MR-id: 7217325 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 See merge request: openGaussythcs00001/openGauss-workbench!236, merge release into develop merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 Created-by: wuyulin Author-id: 7119753 MR-id: 7217342 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 See merge request: openGaussythcs00001/openGauss-workbench!238, merge release into develop merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 Created-by: wuyulin Author-id: 7119753 MR-id: 7217355 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 See merge request: openGaussythcs00001/openGauss-workbench!240, 缩进和版权, 配置, 仅添加java文件版权, merge release into develop merge "release" into "develop" 分区表问题修改, merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 Created-by: wuyulin Author-id: 7119753 MR-id: 7217395 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 分区表问题修改, merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 See merge request: openGaussythcs00001/openGauss-workbench!242, merge release into develop merge "release" into "develop" 代码格式化, merge feature-wyb into release merge "feature-wyb" into "release" 代码格式化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7217417 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!243, 代码格式化, merge feature-zwr into release merge "feature-zwr" into "release" 代码格式化 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217433 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!244 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217436 Commit-by: zhouwenruo;wuyuebin Created-by: wuyulin Author-id: 7119753 MR-id: 7219562 Commit-by: wuyulin;hw73730920/wuguobiao;luomeng Merged-by: wuyulin Description: merge "release" into "develop" 修改异常处理, Merge remote-tracking branch 'origin/release' into release, merge develop into release merge "develop" into "release" merge develop into feature-lm merge "develop" into "feature-lm" 修改pg_default问题, 编辑表刷新和关闭更新winId，导出接口做500的错误判断, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 编辑表刷新和关闭更新winId，导出接口做500的错误判断 Created-by: zhangcheng Author-id: 7119759 MR-id: 7217451 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 编辑表刷新和关闭更新winId，导出接口做500的错误判断 See merge request: openGaussythcs00001/openGauss-workbench!247, Merge remote-tracking branch 'origin/release' into release-wyl, Merge remote-tracking branch 'origin/release' into release-wyl, merge develop into release merge "develop" into "release" 版权信息, merge release into develop merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 Created-by: wuyulin Author-id: 7119753 MR-id: 7217325 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 See merge request: openGaussythcs00001/openGauss-workbench!236, merge release into develop merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 Created-by: wuyulin Author-id: 7119753 MR-id: 7217342 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 See merge request: openGaussythcs00001/openGauss-workbench!238, merge release into develop merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 Created-by: wuyulin Author-id: 7119753 MR-id: 7217355 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 See merge request: openGaussythcs00001/openGauss-workbench!240, 缩进和版权, 配置, 仅添加java文件版权, merge release into develop merge "release" into "develop" 分区表问题修改, merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 Created-by: wuyulin Author-id: 7119753 MR-id: 7217395 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 分区表问题修改, merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 See merge request: openGaussythcs00001/openGauss-workbench!242, merge release into develop merge "release" into "develop" 代码格式化, merge feature-wyb into release merge "feature-wyb" into "release" 代码格式化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7217417 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!243, 代码格式化, merge feature-zwr into release merge "feature-zwr" into "release" 代码格式化 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217433 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!244 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217436 Commit-by: zhouwenruo;wuyuebin See merge request: openGaussythcs00001/openGauss-workbench!299 commit 596821434a16b203e97d2b1ef631a1ae0a05fe09 Merge: d9b37b08 f07e0561 Author: wuyulin <a52d5096b0da4f89b1845beab2bf4026@example.com> Date: Fri Jun 16 17:36:33 2023 +0800 merge release-wyl into release merge "release-wyl" into "release" 修改列问题修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7219559 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改列问题修复 See merge request: openGaussythcs00001/openGauss-workbench!298 commit f07e0561fd5ad2c53318f72bfa7374f805b2a4cf Author: wuyulin <wuyulin@ncti-gba.cn> Date: Fri Jun 16 17:35:13 2023 +0800 修改列问题修复 commit d9b37b0899a4c533e750098e6767544b4d70ff53 Merge: 0ab08bc0 4920e038 Author: hw73730920/wuguobiao <4027thg32*Wug126> Date: Fri Jun 16 15:54:44 2023 +0800 Merge remote-tracking branch 'origin/release' into release commit 0ab08bc05f2ceff96c2ec6942ad2230fc7b30342 Author: hw73730920/wuguobiao <4027thg32*Wug126> Date: Fri Jun 16 15:54:17 2023 +0800 修改异常处理 commit 4920e03852b79fcf8b129c86811a61cfe069a683 Merge: f0b453d9 c6dcfdf3 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Fri Jun 16 15:17:36 2023 +0800 merge develop into release merge "develop" into "release" merge develop into feature-lm merge "develop" into "feature-lm" 修改pg_default问题, 编辑表刷新和关闭更新winId，导出接口做500的错误判断, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 编辑表刷新和关闭更新winId，导出接口做500的错误判断 Created-by: zhangcheng Author-id: 7119759 MR-id: 7217451 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 编辑表刷新和关闭更新winId，导出接口做500的错误判断 See merge request: openGaussythcs00001/openGauss-workbench!247, Merge remote-tracking branch 'origin/release' into release-wyl, Merge remote-tracking branch 'origin/release' into release-wyl, merge develop into release merge "develop" into "release" 版权信息, merge release into develop merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 Created-by: wuyulin Author-id: 7119753 MR-id: 7217325 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 See merge request: openGaussythcs00001/openGauss-workbench!236, merge release into develop merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 Created-by: wuyulin Author-id: 7119753 MR-id: 7217342 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 See merge request: openGaussythcs00001/openGauss-workbench!238, merge release into develop merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 Created-by: wuyulin Author-id: 7119753 MR-id: 7217355 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 See merge request: openGaussythcs00001/openGauss-workbench!240, 缩进和版权, 配置, 仅添加java文件版权, merge release into develop merge "release" into "develop" 分区表问题修改, merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 Created-by: wuyulin Author-id: 7119753 MR-id: 7217395 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 分区表问题修改, merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 See merge request: openGaussythcs00001/openGauss-workbench!242, merge release into develop merge "release" into "develop" 代码格式化, merge feature-wyb into release merge "feature-wyb" into "release" 代码格式化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7217417 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!243, 代码格式化, merge feature-zwr into release merge "feature-zwr" into "release" 代码格式化 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217433 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!244 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217436 Commit-by: zhouwenruo;wuyuebin Merged-by: zhouwenruo Description: merge "release" into "develop" 代码格式化, merge feature-wyb into release merge "feature-wyb" i Created-by: luomeng Author-id: 7119743 MR-id: 7219460 Commit-by: luomeng;罗梦;wuyulin Merged-by: luomeng Description: merge "develop" into "release" merge develop into feature-lm merge "develop" into "feature-lm" 修改pg_default问题, 编辑表刷新和关闭更新winId，导出接口做500的错误判断, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 编辑表刷新和关闭更新winId，导出接口做500的错误判断 Created-by: zhangcheng Author-id: 7119759 MR-id: 7217451 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 编辑表刷新和关闭更新winId，导出接口做500的错误判断 See merge request: openGaussythcs00001/openGauss-workbench!247, Merge remote-tracking branch 'origin/release' into release-wyl, Merge remote-tracking branch 'origin/release' into release-wyl, merge develop into release merge "develop" into "release" 版权信息, merge release into develop merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 Created-by: wuyulin Author-id: 7119753 MR-id: 7217325 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 See merge request: openGaussythcs00001/openGauss-workbench!236, merge release into develop merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 Created-by: wuyulin Author-id: 7119753 MR-id: 7217342 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 See merge request: openGaussythcs00001/openGauss-workbench!238, merge release into develop merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 Created-by: wuyulin Author-id: 7119753 MR-id: 7217355 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 See merge request: openGaussythcs00001/openGauss-workbench!240, 缩进和版权, 配置, 仅添加java文件版权, merge release into develop merge "release" into "develop" 分区表问题修改, merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 Created-by: wuyulin Author-id: 7119753 MR-id: 7217395 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 分区表问题修改, merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 See merge request: openGaussythcs00001/openGauss-workbench!242, merge release into develop merge "release" into "develop" 代码格式化, merge feature-wyb into release merge "feature-wyb" into "release" 代码格式化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7217417 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!243, 代码格式化, merge feature-zwr into release merge "feature-zwr" into "release" 代码格式化 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217433 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!244 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217436 Commit-by: zhouwenruo;wuyuebin Merged-by: zhouwenruo Description: merge "release" into "develop" 代码格式化, merge feature-wyb into release merge "feature-wyb" i See merge request: openGaussythcs00001/openGauss-workbench!297 commit 03ce68cc20bd42fc602b6723d44bf0bc8c338e67 Merge: 999bb462 c6dcfdf3 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Fri Jun 16 15:17:02 2023 +0800 merge develop into feature-lm merge "develop" into "feature-lm" 提交等待事件统计代码, 修改样式, Squashed commit of the following: commit ae724aec71fed5b5351ed9f1d05b73be72d5d292 Merge: 84970cb9 78c32bbd Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:47:30 2023 +0800 Merge branch 'develop' into dev-zhy commit 84970cb9a70db7560fac4ac6e402f6279d99e0cf Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:44:39 2023 +0800 添加字段.移除无效文件,改名, 配置, 打包, 更新用户操作手册, merge release-zwr into release merge "release-zwr" into "release" 更新用户操作手册 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7218971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 更新用户操作手册 See merge request: openGaussythcs00001/openGauss-workbench!285, 修复编辑表的关闭winId、默认列类型，新建表索引访问方式, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 修复编辑表的关闭winId、默认列类型，新建表索引访问方式 Created-by: zhangcheng Author-id: 7119759 MR-id: 7218984 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 修复编辑表的关闭winId、默认列类型，新建表索引访问方式 See merge request: openGaussythcs00001/openGauss-workbench!286, merge develop into release merge "develop" into "release" merge release into develop merge "release" into "develop" merge develop into release merge "develop" into "release" merge develop into feature-lm merge "develop" into "feature-lm" 修改sqlite初始化方式, Revert "提交代码" This reverts commit e103ff955ec521cc063adca87b25257b28405b0f, sqliteinit, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 告警中心前端代码, 告警中心后端代码, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge develop into release merge "develop" into "release" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 调整部分编辑表的功能, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 Created-by: zhangcheng Author-id: 7119759 MR-id: 7209563 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 See merge request: openGaussythcs00001/openGauss-workbench!126, 数据更新联调问题修复, merge feature-wyl into develop merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7209762 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 See merge request: openGaussythcs00001/openGauss-workbench!127, 生成函数覆盖率报告, Merge remote-tracking branch 'origin/develop' into feature-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/util/DebugUtils.java # plugins/data-studio/src/main/resources/messages_en_US.properties # plugins/data-studio/src/main/resources/messages_zh_CN.properties, 生成函数覆盖率报告, merge feature-zwr into develop merge "feature-zwr" into "develop" 生成函数覆盖率报告 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7209971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 生成函数覆盖率报告 See merge request: openGaussythcs00001/openGauss-workbench!128, 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 Created-by: zhangcheng Author-id: 7119759 MR-id: 7210033 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 See merge request: openGaussythcs00001/openGauss-workbench!130, 调整文件, 生成函数覆盖率报告, 导出视图、序列DDL功能, 导出DDL页面, 创建表, resultSet添加try去捕获, 添加导出函数，模式DDL接口, merge feature-zwr into develop merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7210854 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 See merge request: openGaussythcs00001/openGauss-workbench!131, 1, merge feature-wyl into develop merge "feature-wyl" into "develop" 创建表, 1 Created-by: wuyulin Author-id: 7119753 MR-id: 7210950 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 创建表, 1 See merge request: openGaussythcs00001/openGauss-workbench!132, Merge remote-tracking branch 'origin/develop' into feature-wyl, 导出DDL接口联调, 添加导出表数据接口, merge feature-zwr into develop merge "feature-zwr" into "develop" 添加导出表数据接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7211802 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 添加导出表数据接口 See merge request: openGaussythcs00001/openGauss-w Created-by: luomeng Author-id: 7119743 MR-id: 7219459 Commit-by: luomeng;wuyulin;liupengfei;张昊宇;zhangcheng;yangzihao;zhouwenruo;Zihao Yang Merged-by: luomeng Description: merge "develop" into "feature-lm" 提交等待事件统计代码, 修改样式, Squashed commit of the following: commit ae724aec71fed5b5351ed9f1d05b73be72d5d292 Merge: 84970cb9 78c32bbd Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:47:30 2023 +0800 Merge branch 'develop' into dev-zhy commit 84970cb9a70db7560fac4ac6e402f6279d99e0cf Author: 张昊宇 <zhanghaoyu@ncti-gba.cn> Date: Tue Jun 13 08:44:39 2023 +0800 添加字段.移除无效文件,改名, 配置, 打包, 更新用户操作手册, merge release-zwr into release merge "release-zwr" into "release" 更新用户操作手册 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7218971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "release-zwr" into "release" 更新用户操作手册 See merge request: openGaussythcs00001/openGauss-workbench!285, 修复编辑表的关闭winId、默认列类型，新建表索引访问方式, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 修复编辑表的关闭winId、默认列类型，新建表索引访问方式 Created-by: zhangcheng Author-id: 7119759 MR-id: 7218984 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 修复编辑表的关闭winId、默认列类型，新建表索引访问方式 See merge request: openGaussythcs00001/openGauss-workbench!286, merge develop into release merge "develop" into "release" merge release into develop merge "release" into "develop" merge develop into release merge "develop" into "release" merge develop into feature-lm merge "develop" into "feature-lm" 修改sqlite初始化方式, Revert "提交代码" This reverts commit e103ff955ec521cc063adca87b25257b28405b0f, sqliteinit, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 告警中心前端代码, 告警中心后端代码, Merge branch 'develop' of https://codehub-cn-south-1.devcloud.huaweicloud.com/openGaussythcs00001/openGauss-workbench into feature-wyb, merge develop into release merge "develop" into "release" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, sqliteinit # Conflicts: # plugins/observability-instance/src/main/java/com/nctigba/observability/instance/config/ParamInfoInitConfig.java, 调整部分编辑表的功能, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 Created-by: zhangcheng Author-id: 7119759 MR-id: 7209563 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 调整部分编辑表的功能 See merge request: openGaussythcs00001/openGauss-workbench!126, 数据更新联调问题修复, merge feature-wyl into develop merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 Created-by: wuyulin Author-id: 7119753 MR-id: 7209762 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 抽取表列语句, 修改数据结构, Merge remote-tracking branch 'origin/develop' into feature-wyl, 增加异常提示, 数据更新联调问题修复 See merge request: openGaussythcs00001/openGauss-workbench!127, 生成函数覆盖率报告, Merge remote-tracking branch 'origin/develop' into feature-zwr # Conflicts: # plugins/data-studio/src/main/java/com/nctigba/datastudio/util/DebugUtils.java # plugins/data-studio/src/main/resources/messages_en_US.properties # plugins/data-studio/src/main/resources/messages_zh_CN.properties, 生成函数覆盖率报告, merge feature-zwr into develop merge "feature-zwr" into "develop" 生成函数覆盖率报告 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7209971 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 生成函数覆盖率报告 See merge request: openGaussythcs00001/openGauss-workbench!128, 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告, merge feature-zhangcheng into develop merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 Created-by: zhangcheng Author-id: 7119759 MR-id: 7210033 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "feature-zhangcheng" into "develop" 修复编辑表事件循环的一些问题, 函数覆盖率提示生成报告 See merge request: openGaussythcs00001/openGauss-workbench!130, 调整文件, 生成函数覆盖率报告, 导出视图、序列DDL功能, 导出DDL页面, 创建表, resultSet添加try去捕获, 添加导出函数，模式DDL接口, merge feature-zwr into develop merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7210854 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" resultSet添加try去捕获, 添加导出函数，模式DDL接口 See merge request: openGaussythcs00001/openGauss-workbench!131, 1, merge feature-wyl into develop merge "feature-wyl" into "develop" 创建表, 1 Created-by: wuyulin Author-id: 7119753 MR-id: 7210950 Commit-by: wuyulin Merged-by: wuyulin Description: merge "feature-wyl" into "develop" 创建表, 1 See merge request: openGaussythcs00001/openGauss-workbench!132, Merge remote-tracking branch 'origin/develop' into feature-wyl, 导出DDL接口联调, 添加导出表数据接口, merge feature-zwr into develop merge "feature-zwr" into "develop" 添加导出表数据接口 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7211802 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "develop" 添加导出表数据接口 See merge request: openGaussythcs00001/openGauss-w See merge request: openGaussythcs00001/openGauss-workbench!296 commit c6dcfdf3dc43c04551490dea840b21f040bc1eb0 Merge: 4dd2a41e 999bb462 Author: luomeng <033f7c27cfa74dec80c01188e9630834@example.com> Date: Fri Jun 16 15:16:35 2023 +0800 merge feature-lm into develop merge "feature-lm" into "develop" merge develop into feature-lm merge "develop" into "feature-lm" 修改pg_default问题, 编辑表刷新和关闭更新winId，导出接口做500的错误判断, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 编辑表刷新和关闭更新winId，导出接口做500的错误判断 Created-by: zhangcheng Author-id: 7119759 MR-id: 7217451 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 编辑表刷新和关闭更新winId，导出接口做500的错误判断 See merge request: openGaussythcs00001/openGauss-workbench!247, Merge remote-tracking branch 'origin/release' into release-wyl, Merge remote-tracking branch 'origin/release' into release-wyl, merge develop into release merge "develop" into "release" 版权信息, merge release into develop merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 Created-by: wuyulin Author-id: 7119753 MR-id: 7217325 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 See merge request: openGaussythcs00001/openGauss-workbench!236, merge release into develop merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 Created-by: wuyulin Author-id: 7119753 MR-id: 7217342 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 See merge request: openGaussythcs00001/openGauss-workbench!238, merge release into develop merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 Created-by: wuyulin Author-id: 7119753 MR-id: 7217355 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 See merge request: openGaussythcs00001/openGauss-workbench!240, 缩进和版权, 配置, 仅添加java文件版权, merge release into develop merge "release" into "develop" 分区表问题修改, merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 Created-by: wuyulin Author-id: 7119753 MR-id: 7217395 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 分区表问题修改, merge release-wyl into release merge "release-wyl" into "release" 分区表问题修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217394 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 分区表问题修改 See merge request: openGaussythcs00001/openGauss-workbench!241 See merge request: openGaussythcs00001/openGauss-workbench!242, merge release into develop merge "release" into "develop" 代码格式化, merge feature-wyb into release merge "feature-wyb" into "release" 代码格式化 Created-by: wuyuebin Author-id: 7158405 MR-id: 7217417 Commit-by: wuyuebin Merged-by: wuyuebin Description: merge "feature-wyb" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!243, 代码格式化, merge feature-zwr into release merge "feature-zwr" into "release" 代码格式化 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217433 Commit-by: zhouwenruo Merged-by: zhouwenruo Description: merge "feature-zwr" into "release" 代码格式化 See merge request: openGaussythcs00001/openGauss-workbench!244 Created-by: zhouwenruo Author-id: 7119763 MR-id: 7217436 Commit-by: zhouwenruo;wuyuebin Merged-by: zhouwenruo Description: merge "release" into "develop" 代码格式化, merge feature-wyb into release merge "feature-wyb Created-by: luomeng Author-id: 7119743 MR-id: 7219458 Commit-by: 罗梦;luomeng Merged-by: luomeng Description: merge "feature-lm" into "develop" merge develop into feature-lm merge "develop" into "feature-lm" 修改pg_default问题, 编辑表刷新和关闭更新winId，导出接口做500的错误判断, merge bugfix-zhangcheng-0630-2 into release merge "bugfix-zhangcheng-0630-2" into "release" 编辑表刷新和关闭更新winId，导出接口做500的错误判断 Created-by: zhangcheng Author-id: 7119759 MR-id: 7217451 Commit-by: zhangcheng Merged-by: zhangcheng Description: merge "bugfix-zhangcheng-0630-2" into "release" 编辑表刷新和关闭更新winId，导出接口做500的错误判断 See merge request: openGaussythcs00001/openGauss-workbench!247, Merge remote-tracking branch 'origin/release' into release-wyl, Merge remote-tracking branch 'origin/release' into release-wyl, merge develop into release merge "develop" into "release" 版权信息, merge release into develop merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 Created-by: wuyulin Author-id: 7119753 MR-id: 7217325 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 添加中英, merge release-wyl into release merge "release-wyl" into "release" 添加中英 Created-by: wuyulin Author-id: 7119753 MR-id: 7217324 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 添加中英 See merge request: openGaussythcs00001/openGauss-workbench!235 See merge request: openGaussythcs00001/openGauss-workbench!236, merge release into develop merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 Created-by: wuyulin Author-id: 7119753 MR-id: 7217342 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 判断逻辑修改, merge release-wyl into release merge "release-wyl" into "release" 判断逻辑修改 Created-by: wuyulin Author-id: 7119753 MR-id: 7217340 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 判断逻辑修改 See merge request: openGaussythcs00001/openGauss-workbench!237 See merge request: openGaussythcs00001/openGauss-workbench!238, merge release into develop merge "release" into "develop" 修改判断逻辑, merge release-wyl into release merge "release-wyl" into "release" 修改判断逻辑 Created-by: wuyulin Author-id: 7119753 MR-id: 7217351 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release-wyl" into "release" 修改判断逻辑 See merge request: openGaussythcs00001/openGauss-workbench!239 Created-by: wuyulin Author-id: 7119753 MR-id: 7217355 Commit-by: wuyulin Merged-by: wuyulin Description: merge "release" into "develop" 修改判断逻辑, | 2 年前 |
| 1230版本代码提交 | 2 年前 |
| 0630版本代码 | 2 年前 |
| 0630版本代码 | 2 年前 |