网页添加服务器

master
duhui 2021-08-26 16:28:02 +08:00
parent b346ca72ab
commit 24054c5e6f
4 changed files with 38 additions and 18 deletions

View File

@ -67,7 +67,7 @@ public class ServerInfoController {
serverInfoVo.setVersion(cServerOpenTime.getVersion());
serverInfoVo.setRestartTime(cServerOpenTime.getRestartTime());
}
serverInfoVo.setIp_port(serverInfo.getIP()+":"+serverInfo.getPort());
serverInfoVo.setIp_port(serverInfo.getIp()+":"+serverInfo.getPort());
String openT = "手动开服";
AutoServerSetting setting = RedisUtil.getInstence().getMapValue(RedisUserKey.AUTO_START_SERVER_SETTING, "1", "1", AutoServerSetting.class, -1);

View File

@ -20,7 +20,7 @@ public class ServerInfo implements Comparable {
private String name;
@Field(value = "ip")
private String IP;
private String ip;
@Field(value = "port")
private String port;
@ -56,7 +56,9 @@ public class ServerInfo implements Comparable {
@Field(value = "is_new")
private String is_new;
/* 服务器启动类型 0手动开启 1 按时 2 按量*/
/**
* 0 1 2
*/
@Field(value = "open_type")
private String open_type;
@ -78,6 +80,9 @@ public class ServerInfo implements Comparable {
this.name = name;
}
public ServerInfo() {
}
public int get_id() {
return _id;
}
@ -94,12 +99,12 @@ public class ServerInfo implements Comparable {
this.name = name;
}
public String getIP() {
return IP;
public String getIp() {
return ip;
}
public void setIP(String IP) {
this.IP = IP;
public void setIp(String ip) {
this.ip = ip;
}
public String getPort() {
@ -186,12 +191,28 @@ public class ServerInfo implements Comparable {
this.coreName = coreName;
}
public String getServer_version() {
return server_version;
}
public void setServer_version(String server_version) {
this.server_version = server_version;
}
public String getIsWhite() {
return isWhite;
}
public void setIsWhite(String isWhite) {
this.isWhite = isWhite;
}
@Override
public String toString() {
return "ServerInfo{" +
"_id=" + _id +
", name='" + name + '\'' +
", IP='" + IP + '\'' +
", ip='" + ip + '\'' +
", port='" + port + '\'' +
", server_id='" + server_id + '\'' +
", channel='" + channel + '\'' +

View File

@ -155,14 +155,14 @@ public class AutoServerManager {
public void delUser(ServerInfo serverInfo){
String path = "/data/jieling/deluser.sh";
if (serverInfo.getIP() == null || "".equals(serverInfo.getIP())
if (serverInfo.getIp() == null || "".equals(serverInfo.getIp())
|| serverInfo.getServer_id() == null || "".equals(serverInfo.getServer_id())
|| serverInfo.getCoreName() == null || "".equals(serverInfo.getCoreName())){
LOGGER.error("删除操作参数不全,执行失败:参数:{}",serverInfo.toString());
return;
}
String command = "sh " + path + " 500 " + serverInfo.getIP() + " " + serverInfo.getServer_id() + " " + serverInfo.getCoreName();
String command = "sh " + path + " 500 " + serverInfo.getIp() + " " + serverInfo.getServer_id() + " " + serverInfo.getCoreName();
LOGGER.info("=================清库命令:{}",command);
Process exec = null;

View File

@ -242,11 +242,11 @@
var server_version = $("input[name='server_version']").val();
var isWhite = $("input[name='isWhite']").val();
var reg = new RegExp(/^-?[A-Za-z0-9]$/i);
if (!reg.test(server_id) || !reg.test(_id) || !reg.test(name) || !reg.test(ip) ||
!reg.test(port) || !reg.test(channel) || !reg.test(sub_channel) || !reg.test(status) ||
!reg.test(plat) || !reg.test(open_time) || !reg.test(is_new) || !reg.test(open_type) ||
!reg.test(register_state) || !reg.test(coreName) || !reg.test(server_version) || !reg.test(isWhite)){
var reg = new RegExp(/[\s\S]/i);
if (!reg.test(server_id) || !reg.test(_id) || !reg.test(name) || !reg.test(ip) ||
!reg.test(port) || !reg.test(channel) || !reg.test(sub_channel) || !reg.test(status) ||
!reg.test(plat) || !reg.test(open_time) || !reg.test(is_new) || !reg.test(open_type) ||
!reg.test(register_state) || !reg.test(coreName) || !reg.test(server_version) || !reg.test(isWhite)){
alert("参数不能为空,或者特殊字符");
return false;
}
@ -257,7 +257,7 @@
JSON.stringify({
"_id": _id,
"name": name,
"IP": ip,
"ip": ip,
"port": port,
"server_id":server_id,
"channel": channel,
@ -271,8 +271,7 @@
"coreName":coreName,
"server_version":server_version,
"isWhite":isWhite
})
,
}),
url: "/addServer",
dataType: "json",
contentType: 'application/json',