zhuyijun/nacos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Beldon 2019-09-18 21:20:27 +08:00
parent 977e2f76b7
commit 514ae80c9a
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
naming/src/main/java/com/alibaba/nacos/naming/controllers/OperatorController.java
View File

@ -37,7 +37,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
@ -173,7 +172,6 @@ public class OperatorController {
public JSONObject distroStatus(@RequestParam(defaultValue = "view") String action) { public JSONObject distroStatus(@RequestParam(defaultValue = "view") String action) {
JSONObject result = new JSONObject(); JSONObject result = new JSONObject();
String action = WebUtils.optional(request, "action", "view");
if (StringUtils.equals(SwitchEntry.ACTION_VIEW, action)) { if (StringUtils.equals(SwitchEntry.ACTION_VIEW, action)) {
result.put("status", serverListManager.getDistroConfig()); result.put("status", serverListManager.getDistroConfig());
@ -220,13 +218,10 @@ public class OperatorController {
@RequestParam(defaultValue = StringUtils.EMPTY) String keyword) { @RequestParam(defaultValue = StringUtils.EMPTY) String keyword) {
JSONObject result = new JSONObject(); JSONObject result = new JSONObject();
int page = Integer.parseInt(WebUtils.required(request, "pageNo"));
int pageSize = Integer.parseInt(WebUtils.required(request, "pageSize"));
String keyword = WebUtils.optional(request, "keyword", StringUtils.EMPTY);
List<RaftPeer> raftPeerLists = new ArrayList<>(); List<RaftPeer> raftPeerLists = new ArrayList<>();
int total = serviceManager.getPagedClusterState(namespaceId, page - 1, pageSize, keyword, raftPeerLists); int total = serviceManager.getPagedClusterState(namespaceId, pageNo - 1, pageSize, keyword, raftPeerLists);
if (CollectionUtils.isEmpty(raftPeerLists)) { if (CollectionUtils.isEmpty(raftPeerLists)) {
result.put("clusterStateList", Collections.emptyList()); result.put("clusterStateList", Collections.emptyList());