diff --git a/ApiTest/pom.xml b/ApiTest/pom.xml
index 3ebbbe510a964fe06b5810926a6373643c81d37c..2b0fe5ff06c04ef1795eccf5495da05698960893 100644
--- a/ApiTest/pom.xml
+++ b/ApiTest/pom.xml
@@ -20,7 +20,7 @@
5.3.5
9.1.0
2.13.0
- 5.3.0
+ 5.4.0
src/test/resources/testng.xml
diff --git a/openGauss-datakit/visualtool-common/pom.xml b/openGauss-datakit/visualtool-common/pom.xml
index b648757b58419a4caac581a276b81b0e93c05a32..153df99e2a78219b50c098acf3402aa168861ae6 100644
--- a/openGauss-datakit/visualtool-common/pom.xml
+++ b/openGauss-datakit/visualtool-common/pom.xml
@@ -137,7 +137,6 @@
com.alibaba
easyexcel
- 3.1.1
diff --git a/openGauss-datakit/visualtool-service/src/main/java/org/opengauss/admin/system/service/ops/impl/HostServiceImpl.java b/openGauss-datakit/visualtool-service/src/main/java/org/opengauss/admin/system/service/ops/impl/HostServiceImpl.java
index dd2a024ff666044c572d1b25580d08fac4a5919b..f099ea5d50085ff103a44024f2e4eeff9531475d 100644
--- a/openGauss-datakit/visualtool-service/src/main/java/org/opengauss/admin/system/service/ops/impl/HostServiceImpl.java
+++ b/openGauss-datakit/visualtool-service/src/main/java/org/opengauss/admin/system/service/ops/impl/HostServiceImpl.java
@@ -242,7 +242,12 @@ public class HostServiceImpl extends ServiceImpl i
private List readExcelFile(InputStream inputStream) {
HostRecordDataListener hostRecordDataListener = new HostRecordDataListener(this, isSwitchingLanguage);
- return EasyExcel.read(inputStream, HostRecord.class, hostRecordDataListener).sheet().doReadSync();
+ try {
+ return EasyExcel.read(inputStream, HostRecord.class, hostRecordDataListener).sheet().doReadSync();
+ } catch (Exception e) {
+ log.error("Failed to parse data.", e);
+ throw new OpsException("Failed to parse data.");
+ }
}
private Map> groupHostRecordsByIP(List hostRecords) {
@@ -447,25 +452,22 @@ public class HostServiceImpl extends ServiceImpl i
@Transactional(rollbackFor = Exception.class)
public boolean edit(String hostId, HostBody hostBody) {
OpsHostEntity hostEntity = checkHostExist(hostId);
-
if (StringUtils.isBlank(hostBody.getName())) {
throw new OpsException("Host name cannot be empty");
}
if (ObjectUtils.isEmpty(hostBody.getPort())) {
throw new OpsException("Host port cannot be empty");
}
- if (!hostEntity.getPrivateIp().equals(hostBody.getPrivateIp())
- || !hostEntity.getPublicIp().equals(hostBody.getPublicIp())) {
+ if (!hostEntity.getPrivateIp().equals(hostBody.getPrivateIp()) || !hostEntity.getPublicIp()
+ .equals(hostBody.getPublicIp())) {
throw new OpsException("Host public and private IP cannot be modified");
}
if (StringUtils.isAnyBlank(hostBody.getUsername(), hostBody.getPassword())) {
throw new OpsException("Host username and password cannot be empty");
}
-
SshLogin sshLogin = new SshLogin(hostBody.getPublicIp(), hostBody.getPort(), hostBody.getUsername(),
- encryptionUtils.decrypt(hostBody.getPassword()));
+ encryptionUtils.decrypt(hostBody.getPassword()));
HostInfoVo hostInfoVo = getHostInfoVo(jschExecutorService.createSession(sshLogin));
-
hostEntity.setName(hostBody.getName());
hostEntity.setPort(hostBody.getPort());
hostEntity.setRemark(hostBody.getRemark());
@@ -474,7 +476,6 @@ public class HostServiceImpl extends ServiceImpl i
hostEntity.setCpuArch(hostInfoVo.getCpuArch());
hostEntity.setHostname(hostInfoVo.getHostname());
updateById(hostEntity);
-
opsHostTagRelService.cleanHostTag(hostId);
opsHostTagService.addTag(HostTagInputDto.of(hostBody.getTags(), hostId));
return true;
diff --git a/plugins/alert-monitor/pom.xml b/plugins/alert-monitor/pom.xml
index 1ade8eb9f153433ac1d9e66b220f1a231c39e2fa..dca1425ad5f0a6fcc0a599d54fd15bcda22d588d 100644
--- a/plugins/alert-monitor/pom.xml
+++ b/plugins/alert-monitor/pom.xml
@@ -163,12 +163,10 @@
org.apache.poi
poi
- 4.1.2
org.apache.poi
poi-ooxml
- 4.1.2
org.springframework.boot
diff --git a/plugins/base-ops/pom.xml b/plugins/base-ops/pom.xml
index 561e318b2c0290609a2b5c516d7d177cec250fb1..f1c0c0cf79d4bd222186ccf56f5add96ee4ac66b 100644
--- a/plugins/base-ops/pom.xml
+++ b/plugins/base-ops/pom.xml
@@ -14,7 +14,6 @@
jar
4.13
- 3.1.1
false
@@ -38,7 +37,14 @@
com.alibaba
easyexcel
- ${easyexcel.version}
+
+
+ commons-io
+ commons-io
+
+
+ com.gitee.starblues
+ spring-brick-bootstrap
com.gitee.starblues
diff --git a/pom.xml b/pom.xml
index 507533738f268e62e5f611c2de9d98b2ee46b77e..3470e071d5a79d2378abb9fb79db61a6f96d53b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
2.1.4
3.5.2
1.3.1
- 2.14.0
+ 2.18.0
1.4
3.2.2
1.2.83
@@ -35,7 +35,8 @@
5.3.5
3.0.0
4.0.1
-
+ 4.0.3
+ 5.4.0
@@ -186,7 +187,21 @@
spring-brick-bootstrap
${spring-brick.version}
-
+
+ com.alibaba
+ easyexcel
+ ${easyexcel.version}
+
+
+ org.apache.poi
+ poi
+ ${poi.version}
+
+
+ org.apache.poi
+ poi-ooxml
+ ${poi.version}
+
com.gitee.starblues
spring-brick-maven-packager
@@ -270,6 +285,8 @@
${java.version}
${java.version}
${project.build.sourceEncoding}
+ 4096m
+ 4096m
@@ -280,6 +297,10 @@
org.apache.maven.plugins
maven-surefire-plugin
3.0.0-M7
+
+
+ -Xmx512m
+
org.jacoco