+
+
+
diff --git a/cachecloud-web/src/main/webapp/WEB-INF/jsp/app/appDetail.jsp b/cachecloud-web/src/main/webapp/WEB-INF/jsp/app/appDetail.jsp
index 4f3d56f2..b17748ee 100644
--- a/cachecloud-web/src/main/webapp/WEB-INF/jsp/app/appDetail.jsp
+++ b/cachecloud-web/src/main/webapp/WEB-INF/jsp/app/appDetail.jsp
@@ -117,6 +117,8 @@
应用描述 |
${appDetail.appDesc.intro} |
+ 淘汰策略 |
+ ${appDetail.appDesc.maxmemoryPolicyDesc} |
diff --git a/cachecloud-web/src/main/webapp/WEB-INF/jsp/app/appInit.jsp b/cachecloud-web/src/main/webapp/WEB-INF/jsp/app/appInit.jsp
index 49a05257..e0c28dc4 100644
--- a/cachecloud-web/src/main/webapp/WEB-INF/jsp/app/appInit.jsp
+++ b/cachecloud-web/src/main/webapp/WEB-INF/jsp/app/appInit.jsp
@@ -264,6 +264,26 @@
+
+
diff --git a/cachecloud-web/src/main/webapp/WEB-INF/jsp/app/jobIndex/appInit.jsp b/cachecloud-web/src/main/webapp/WEB-INF/jsp/app/jobIndex/appInit.jsp
index df064c93..ba89ed64 100644
--- a/cachecloud-web/src/main/webapp/WEB-INF/jsp/app/jobIndex/appInit.jsp
+++ b/cachecloud-web/src/main/webapp/WEB-INF/jsp/app/jobIndex/appInit.jsp
@@ -286,6 +286,26 @@
+
+
diff --git a/cachecloud-web/src/main/webapp/WEB-INF/jsp/manage/appAudit/deploy/appDeployDetail.jsp b/cachecloud-web/src/main/webapp/WEB-INF/jsp/manage/appAudit/deploy/appDeployDetail.jsp
index 96d342d0..62722f7b 100644
--- a/cachecloud-web/src/main/webapp/WEB-INF/jsp/manage/appAudit/deploy/appDeployDetail.jsp
+++ b/cachecloud-web/src/main/webapp/WEB-INF/jsp/manage/appAudit/deploy/appDeployDetail.jsp
@@ -108,6 +108,8 @@
申请安装Redis模块 |
${appAudit.param3} |
+ 淘汰策略 |
+ ${appDesc.maxmemoryPolicyDesc} |
diff --git a/cachecloud-web/src/main/webapp/WEB-INF/jsp/manage/appOps/appInfoAndAudit.jsp b/cachecloud-web/src/main/webapp/WEB-INF/jsp/manage/appOps/appInfoAndAudit.jsp
index 593c053f..83e272c2 100644
--- a/cachecloud-web/src/main/webapp/WEB-INF/jsp/manage/appOps/appInfoAndAudit.jsp
+++ b/cachecloud-web/src/main/webapp/WEB-INF/jsp/manage/appOps/appInfoAndAudit.jsp
@@ -82,6 +82,8 @@
内存报警阀值 |
${appDesc.memAlertValue}% |
+ 淘汰策略 |
+ ${appDesc.maxmemoryPolicyDesc} |
diff --git a/cachecloud-web/src/main/webapp/WEB-INF/jsp/manage/appOps/appMigrate.jsp b/cachecloud-web/src/main/webapp/WEB-INF/jsp/manage/appOps/appMigrate.jsp
index 47eacc89..9256ac31 100644
--- a/cachecloud-web/src/main/webapp/WEB-INF/jsp/manage/appOps/appMigrate.jsp
+++ b/cachecloud-web/src/main/webapp/WEB-INF/jsp/manage/appOps/appMigrate.jsp
@@ -340,7 +340,7 @@ function autoSelectMachine(type,machineNum,mem,masterNum,slaveNum) {
' '+machine.mem+'G | \n' +
' '+(machine.mem-(machine.applyMem/1024/1024/1024)).toFixed(2)+'G | \n' +
' '+machine.instanceNum+" / "+machine.cpu+' | \n' +
- ' '+machineDeployStat.masterNum+" / "+machineDeployStat.slaveNum+" / "+machineDeployStat.sentinelNum+' | \n' +
+ // ' '+machineDeployStat.masterNum+" / "+machineDeployStat.slaveNum+" / "+machineDeployStat.sentinelNum+' | \n' +
' '+machine.realIp+" / "+machine.rack+' | \n' +
" 查看\n" +
''
diff --git a/cachecloud-web/src/main/webapp/WEB-INF/jsp/manage/total/totalList.jsp b/cachecloud-web/src/main/webapp/WEB-INF/jsp/manage/total/totalList.jsp
index bbb6246e..c87017de 100644
--- a/cachecloud-web/src/main/webapp/WEB-INF/jsp/manage/total/totalList.jsp
+++ b/cachecloud-web/src/main/webapp/WEB-INF/jsp/manage/total/totalList.jsp
@@ -42,6 +42,7 @@
| 命中率 |
天数 |
申请状态 |
+ 淘汰策略 |
操作 |
@@ -148,6 +149,16 @@
+
+
+
+ 默认
+
+
+ ${appDetail.appDesc.maxmemoryPolicyDesc}
+
+
+ |
diff --git a/cachecloud-web/src/main/webapp/WEB-INF/jsp/manage/totalstat/totalList.jsp b/cachecloud-web/src/main/webapp/WEB-INF/jsp/manage/totalstat/totalList.jsp
index 81e69c10..6d21d98e 100644
--- a/cachecloud-web/src/main/webapp/WEB-INF/jsp/manage/totalstat/totalList.jsp
+++ b/cachecloud-web/src/main/webapp/WEB-INF/jsp/manage/totalstat/totalList.jsp
@@ -82,8 +82,8 @@
机房 |
- 机器使用内存(使用内存/总内存) |
- 实例分配内存(使用内存/总内存) |
+ 机器使用内存(分配内存/机器内存) |
+ 实例分配内存(使用内存/分配内存) |
|