Skip to content

Commit

Permalink
add cachecloud version
Browse files Browse the repository at this point in the history
  • Loading branch information
@carlosfu
carlosfu committed Aug 30, 2016
1 parent 620a925 commit c91fc75
Show file tree
Hide file tree
Showing 4 changed files with 309 additions and 0 deletions.
5 changes: 5 additions & 0 deletions cachecloud-open-common/src/main/java/com/sohu/cache/util/ConstUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,11 @@ public class ConstUtils {

// 表示空字符串
public static final String EMPTY = "";

/**
* 服务端版本
*/
public static final String CACHECLOUD_VERSION = "1.2";

/**
* 机器报警阀值
Expand Down
1 change: 1 addition & 0 deletions cachecloud-open-web/src/main/webapp/WEB-INF/include/headMenu.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
</c:if>
<li><a href="/admin/app/list.do"><i class="fa fa-user"></i>应用列表</a></li>
<li><a href="/admin/app/init.do"><i class="fa fa-user"></i>应用申请</a></li>
<li><a href="javascript:alert('CacheCloud <%=ConstUtils.CACHECLOUD_VERSION%>版本')" ><i class="fa fa-user"></i>关于</a></li>
<li><a href="/manage/logout.do"><i class="fa fa-user"></i>注销</a></li>
</ul>
</li>
Expand Down
27 changes: 27 additions & 0 deletions cachecloud-open-web/src/main/webapp/WEB-INF/jsp/manage/instanceAlert/init.jsp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<%@ page language="java" contentType="text/html; charset=UTF-8"
pageEncoding="UTF-8"%>
<%@ include file="/WEB-INF/jsp/manage/commons/taglibs.jsp"%>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>CacheCloud管理后台</title>
<meta http-equiv="X-UA-Compatible" content="IE=edge">

<%@include file="/WEB-INF/jsp/manage/include/cache_cloud_main_css.jsp" %>

</head>

<body class="page-header-fixed">
<%@include file="/WEB-INF/jsp/manage/include/head.jsp" %>

<%@include file="/WEB-INF/jsp/manage/include/left.jsp" %>

<%@include file="initConfigDetail.jsp" %>

<%@include file="/WEB-INF/jsp/manage/include/foot.jsp" %>

<%@include file="/WEB-INF/jsp/manage/include/cache_cloud_main_js.jsp" %>

</body>
</html>
276 changes: 276 additions & 0 deletions cachecloud-open-web/src/main/webapp/WEB-INF/jsp/manage/instanceAlert/initConfigDetail.jsp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,276 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@ include file="/WEB-INF/jsp/manage/commons/taglibs.jsp"%>

<script type="text/javascript">
function removeConfig(configKey) {
if (confirm("确认要删除key="+configKey+"配置?")) {
$.get(
'/manage/instanceAlert/remove.json',
{
configKey: configKey
},
function(data){
var status = data.status;
if (status == 1) {
alert("删除成功!");
} else {
alert("删除失败, msg: " + result.message);
}
window.location.reload();
}
);
}
}
function changeConfig(configKey) {
var alertValue = document.getElementById("alertValue" + configKey);
var info = document.getElementById("info" + configKey);
var status = document.getElementById("status" + configKey);
var compareType = document.getElementById("compareType" + configKey)
$.get(
'/manage/instanceAlert/update.json',
{
configKey: configKey,
alertValue: alertValue.value,
info: info.value,
status: status.value,
compareType: compareType.value
},
function(data){
var status = data.status;
if (status == 1) {
alert("修改成功！");
window.location.reload();
} else {
alert("修改失败！" + data.message);
}
}
);
}
function saveInstanceAlert() {
var configKey = document.getElementById("configKey");
if (configKey.value == ""){
alert("请填写配置名");
configKey.focus();
return false;
}
var alertValue = document.getElementById("alertValue");
var info = document.getElementById("configInfo");
if (info.value == "") {
alert("请填写配置说明");
info.focus();
return false;
}
var orderId = document.getElementById("orderId");
var compareType = document.getElementById("compareType")
$.get(
'/manage/instanceAlert/add.json',
{
configKey: configKey.value,
alertValue: alertValue.value,
info: info.value,
orderId: orderId.value,
compareType: compareType.value
},
function(data){
var status = data.status;
if (status == 1) {
alert("添加成功！");
} else {
alert("添加失败！" + data.message);
}
window.location.reload();
}
);
}
</script>

<div class="page-container">
<div class="page-content">
<div class="table-toolbar">
<div class="btn-group">
<button id="sample_editable_1_new" class="btn green" data-target="#addInstanceAlertModal" data-toggle="modal">
添加新实例报警项 <i class="fa fa-plus"></i>
</button>
</div>
</div>

<div class="row">
<div class="col-md-12">
<div class="portlet box light-grey">
<div class="portlet-title">
<div class="caption">
<i class="fa fa-globe"></i>
填写实例报警项:
&nbsp;
</div>
<div class="tools">
<a href="javascript:;" class="collapse"></a>
</div>
</div>


<c:forEach items="${instanceAlertList}" var="config" varStatus="stats">
<div class="form">
<form class="form-horizontal form-bordered form-row-stripped">
<div class="form-body">
<div class="form-group">
<label class="control-label col-md-2">
<c:choose>
<c:when test="${config.status == 0}">
<font color='red'>（无效配置）</font>
</c:when>
</c:choose>
${config.configKey}:
</label>
<div class="col-md-2">
<input id="info${config.configKey}" type="text" name="info" class="form-control" value="${config.info}" />
</div>

<div class="col-md-2">
<select id="compareType${config.configKey}" name="compareType" class="form-control">
<option value="-1" <c:if test="${config.compareType == -1}">selected</c:if>>
小于
</option>
<option value="0" <c:if test="${config.compareType == 0}">selected</c:if>>
等于
</option>
<option value="1" <c:if test="${config.compareType == 1}">selected</c:if>>
大于
</option>
</select>
</div>

<div class="col-md-2">
<input id="alertValue${config.configKey}" type="text" name="info" class="form-control" value="${config.alertValue}" />
</div>


<div class="col-md-2">
<select id="status${config.configKey}" name="status" class="form-control">
<option value="1" <c:if test="${config.status == 1}">selected</c:if>>
有效
</option>
<option value="0" <c:if test="${config.status == 0}">selected</c:if>>
无效
</option>
</select>
</div>
<div class="col-md-2">
<button type="button" class="btn btn-small" onclick="changeConfig('${config.configKey}')">
修改
</button>
<button type="button" class="btn btn-small" onclick="removeConfig('${config.configKey}')">
删除
</button>
</div>
</div>
</div>
<input type="hidden" name="configKey" value="${config.configKey}">
</form>
<!-- END FORM-->
</div>
</c:forEach>
</div>
<!-- END TABLE PORTLET-->
</div>
</div>
</div>
</div>

<div id="addInstanceAlertModal" class="modal fade" tabindex="-1" data-width="400">
<div class="modal-dialog">
<div class="modal-content">

<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
<h4 class="modal-title">添加实例报警项</h4>
</div>

<form class="form-horizontal form-bordered form-row-stripped">
<div class="modal-body">
<div class="row">
<!-- 控件开始 -->
<div class="col-md-12">
<!-- form-body开始 -->
<div class="form-body">
<div class="form-group">
<label class="control-label col-md-3">
配置名:
</label>
<div class="col-md-5">
<input type="text" name="configKey" id="configKey"
class="form-control" />
</div>
</div>

<div class="form-group">
<label class="control-label col-md-3">
类型:
</label>
<div class="col-md-5">
<select name="compareType" id="compareType" class="form-control select2_category">
<option value="-1">
小于
</option>
<option value="0">
等于
</option>
<option value="1" >
大于
</option>
</select>
</div>
</div>

<div class="form-group">
<label class="control-label col-md-3">
阀值:
</label>
<div class="col-md-5">
<input type="text" name="alertValue" id="alertValue"
class="form-control" />
</div>
</div>

<div class="form-group">
<label class="control-label col-md-3">
说明:
</label>
<div class="col-md-5">
<input type="text" name="info" id="configInfo"
class="form-control" />
</div>
</div>

<div class="form-group">
<label class="control-label col-md-3">
序号:
</label>
<div class="col-md-5">
<input type="text" name="orderId" id="orderId"
class="form-control" />
</div>
</div>


</div>
<!-- form-body 结束 -->
</div>
</div>
</div>

<div class="modal-footer">
<button type="button" data-dismiss="modal" class="btn" >Close</button>
<button type="button" id="configBtn" class="btn red" onclick="saveInstanceAlert()">Ok</button>
</div>

</form>
</div>
</div>
</div>

0 comments on commit c91fc75

Please sign in to comment.