王新海版本

master
zengwh 4 years ago
parent ba1ab8c1f9
commit bcfdfe0e0a

@ -305,7 +305,7 @@ public class PageController {
} }
} }
@RequestMapping("getEcharts4") /*@RequestMapping("getEcharts4")
@ResponseBody @ResponseBody
public Msg getEcharts4(){ public Msg getEcharts4(){
try { try {
@ -342,5 +342,5 @@ public class PageController {
e.printStackTrace(); e.printStackTrace();
return Msg.fail(e.getMessage()); return Msg.fail(e.getMessage());
} }
} }*/
} }

@ -11,14 +11,6 @@ $(function() {
//提交更改 //提交更改
$('#btn_submit').click(function () { $('#btn_submit').click(function () {
/*if($("#userPwd").val() == ""){
toastr.warning("旧密码不能为空!")
return false;
}
if($("#userPwd").val().length < 8){
toastr.warning("旧密码长度小于8位")
return false;
}*/
if($("#newUserPwd").val() == ""){ if($("#newUserPwd").val() == ""){
toastr.warning("新密码不能为空!") toastr.warning("新密码不能为空!")
return false; return false;
@ -93,7 +85,6 @@ $(function() {
* @constructor * @constructor
*/ */
function AnalyzePasswordSecurityLevel(passName) { function AnalyzePasswordSecurityLevel(passName) {
debugger
var password =$("#"+passName).val(); var password =$("#"+passName).val();
var pwdArray = new Array(); var pwdArray = new Array();
var securityLevelFlag = 0; var securityLevelFlag = 0;

@ -1,7 +1,6 @@
package com.manage.util; package com.manage.util;
import org.hyperic.sigar.Sigar;
import java.io.File; import java.io.File;
@ -19,7 +18,7 @@ import java.io.File;
* @Version: 1.0 * @Version: 1.0
*/ */
public class SigarUtils{ public class SigarUtils{
public static Sigar initSigar() { /*public static Sigar initSigar() {
try { try {
//此处只为得到依赖库文件的目录,可根据实际项目自定义 //此处只为得到依赖库文件的目录,可根据实际项目自定义
String tomcatBinPath = System.getProperty("user.dir"); String tomcatBinPath = System.getProperty("user.dir");
@ -52,5 +51,5 @@ public class SigarUtils{
if (OS.indexOf("win") >= 0) { if (OS.indexOf("win") >= 0) {
return true; return true;
} else return false; } else return false;
} }*/
} }

@ -3,7 +3,6 @@ package com.manage.service.ipml;
import com.manage.dao.Power_UserMapper; import com.manage.dao.Power_UserMapper;
import com.manage.service.cache.CacheManager; import com.manage.service.cache.CacheManager;
import com.manage.util.SigarUtils; import com.manage.util.SigarUtils;
import org.hyperic.sigar.*;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -171,7 +170,7 @@ public class PageServiceImpl {
return returnMap; return returnMap;
} }
public int getEcharts4() throws Exception{ /*public int getEcharts4() throws Exception{
SigarUtils s = new SigarUtils(); SigarUtils s = new SigarUtils();
s.initSigar(); s.initSigar();
int cpuCount = cpu(); int cpuCount = cpu();
@ -239,7 +238,7 @@ public class PageServiceImpl {
list.add(totalPhysicalMemorySize); list.add(totalPhysicalMemorySize);
list.add(user); list.add(user);
return list; return list;
} }*/
//获取当月所有天 //获取当月所有天
/** /**

Loading…
Cancel
Save