jiulinxiri/rocketmq-dashboard
1
0
Fork 0
mirror of https://github.com/apache/rocketmq-dashboard.git synced 2026-02-21 04:45:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

[ISSUE #62]Uses the YML format instead of the Properties format. (#63)

Browse Source 
* [ISSUE #62]Uses the YML format instead of the Properties format.

* retrigger ci

* Solve the apache-rat check

Co-authored-by: zhangjidi <zhangjidi@cmss.chinamobile.com>
This commit is contained in:
zhangjidi2016
2022-01-08 22:05:21 +08:00
committed by GitHub
parent 529501c007
commit e281b74456
8 changed files with 84 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/org/apache/rocketmq/dashboard/config/RMQConfigure.java
View File

@@ -16,7 +16,8 @@
*/
package org.apache.rocketmq.dashboard.config;
import com.google.common.base.Splitter;
import java.util.ArrayList;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.rocketmq.common.MixAll;
import org.slf4j.Logger;
@@ -59,7 +60,7 @@ public class RMQConfigure {
private Long timeoutMillis;
private String namesrvAddrs;
private List<String> namesrvAddrs = new ArrayList<>();
public String getAccessKey() {
return accessKey;
@@ -81,17 +82,14 @@ public class RMQConfigure {
return namesrvAddr;
}
public String getNamesrvAddrs() {
public List<String> getNamesrvAddrs() {
return namesrvAddrs;
}
public void setNamesrvAddrs(String namesrvAddrs) {
if (StringUtils.isNotBlank(namesrvAddrs)) {
this.namesrvAddrs = namesrvAddrs;
List<String> nameSrvAddrList = Splitter.on("@").splitToList(this.namesrvAddrs);
if (!nameSrvAddrList.isEmpty()) {
this.setNamesrvAddr(nameSrvAddrList.get(0));
}
public void setNamesrvAddrs(List<String> namesrvAddrs) {
this.namesrvAddrs = namesrvAddrs;
if (CollectionUtils.isNotEmpty(namesrvAddrs)) {
this.setNamesrvAddr(namesrvAddrs.get(0));
}
}

3
src/main/java/org/apache/rocketmq/dashboard/service/impl/OpsServiceImpl.java
View File

@@ -16,7 +16,6 @@
*/
package org.apache.rocketmq.dashboard.service.impl;
import com.google.common.base.Splitter;
import com.google.common.collect.Maps;
import java.util.List;
import java.util.Map;
@@ -47,7 +46,7 @@ public class OpsServiceImpl extends AbstractCommonService implements OpsService
public Map<String, Object> homePageInfo() {
Map<String, Object> homePageInfoMap = Maps.newHashMap();
homePageInfoMap.put("currentNamesrv", configure.getNamesrvAddr());
homePageInfoMap.put("namesvrAddrList", Splitter.on("@").splitToList(configure.getNamesrvAddrs()));
homePageInfoMap.put("namesvrAddrList", configure.getNamesrvAddrs());
homePageInfoMap.put("useVIPChannel", Boolean.valueOf(configure.getIsVIPChannel()));
homePageInfoMap.put("useTLS", configure.isUseTLS());
return homePageInfoMap;