generated from root/miduo_server
合服显示
parent
e20aa9d4db
commit
254ef14284
|
|
@ -31,7 +31,8 @@ public class ServerInfoDaoImpl implements ServerInfoDao {
|
|||
@Override
|
||||
public List<ServerInfo> getAllServerInfo() throws Exception {
|
||||
MongoTemplate mongoTemplate = connect.getMongoTemplete(dbName);
|
||||
List<ServerInfo> serverInfos = mongoTemplate.find(new Query(), ServerInfo.class);
|
||||
Query query = new Query(Criteria.where("isSlave").is(0));
|
||||
List<ServerInfo> serverInfos = mongoTemplate.find(query, ServerInfo.class);
|
||||
return serverInfos.stream().sorted().collect(Collectors.toList());
|
||||
}
|
||||
|
||||
|
|
@ -115,6 +116,7 @@ public class ServerInfoDaoImpl implements ServerInfoDao {
|
|||
if (serverInfo.getCoreName() != null && !"".equals(serverInfo.getCoreName())){
|
||||
update.set("coreName",serverInfo.getCoreName());
|
||||
}
|
||||
update.set("isSlave",serverInfo.getIsSlave());
|
||||
|
||||
MongoTemplate mongoTemplate = connect.getMongoTemplete(dbName);
|
||||
Query query = new Query(Criteria.where("server_id").is(serverInfo.getServer_id()));
|
||||
|
|
|
|||
|
|
@ -197,6 +197,7 @@ public class HeFuManager {
|
|||
slaveServer.setIp(masterServer.getIp());
|
||||
slaveServer.setPort(masterServer.getPort());
|
||||
slaveServer.setCoreName(masterServer.getCoreName());
|
||||
slaveServer.setIsSlave(1);
|
||||
serverInfoDao.updateServerInfo(slaveServer);
|
||||
LOGGER.info("处理IP和端口完成:{}",slaveServer.toString());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -65,6 +65,9 @@ public class ServerInfo implements Comparable,Cloneable {
|
|||
@Field(value = "server_version")
|
||||
private int server_version;
|
||||
|
||||
@Field(value = "isSlave")
|
||||
private int isSlave;
|
||||
|
||||
/**
|
||||
* 没啥用,但是不能删,删除需要先去登陆服兼容一下
|
||||
*/
|
||||
|
|
@ -149,6 +152,14 @@ public class ServerInfo implements Comparable,Cloneable {
|
|||
return status;
|
||||
}
|
||||
|
||||
public int getIsSlave() {
|
||||
return isSlave;
|
||||
}
|
||||
|
||||
public void setIsSlave(int isSlave) {
|
||||
this.isSlave = isSlave;
|
||||
}
|
||||
|
||||
public int getStatusInt() {
|
||||
if (status == null){
|
||||
status = "0";
|
||||
|
|
@ -237,6 +248,7 @@ public class ServerInfo implements Comparable,Cloneable {
|
|||
", coreName='" + coreName + '\'' +
|
||||
", isWhite='" + isWhite + '\'' +
|
||||
", server_version=" + server_version +
|
||||
", isSlave=" + isSlave +
|
||||
", open_type='" + open_type + '\'' +
|
||||
", open_time='" + open_time + '\'' +
|
||||
'}';
|
||||
|
|
|
|||
|
|
@ -276,6 +276,7 @@
|
|||
"status":status,
|
||||
"plat": plat,
|
||||
"is_new": is_new,
|
||||
"isSlave": 0,
|
||||
"register_state":register_state,
|
||||
"coreName":coreName,
|
||||
"server_version":server_version,
|
||||
|
|
|
|||
Loading…
Reference in New Issue