diff --git a/power-admin/src/main/java/com/manage/controller/PageController.java b/power-admin/src/main/java/com/manage/controller/PageController.java index cb5badf..1268870 100644 --- a/power-admin/src/main/java/com/manage/controller/PageController.java +++ b/power-admin/src/main/java/com/manage/controller/PageController.java @@ -305,7 +305,7 @@ public class PageController { } } - @RequestMapping("getEcharts4") + /*@RequestMapping("getEcharts4") @ResponseBody public Msg getEcharts4(){ try { @@ -342,5 +342,5 @@ public class PageController { e.printStackTrace(); return Msg.fail(e.getMessage()); } - } + }*/ } diff --git a/power-admin/src/main/webapp/static/js/updatePassword.js b/power-admin/src/main/webapp/static/js/updatePassword.js index 2c05559..ea8d028 100644 --- a/power-admin/src/main/webapp/static/js/updatePassword.js +++ b/power-admin/src/main/webapp/static/js/updatePassword.js @@ -11,14 +11,6 @@ $(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() == ""){ toastr.warning("新密码不能为空!") return false; @@ -93,7 +85,6 @@ $(function() { * @constructor */ function AnalyzePasswordSecurityLevel(passName) { - debugger var password =$("#"+passName).val(); var pwdArray = new Array(); var securityLevelFlag = 0; diff --git a/power-foundaton/src/main/java/com/manage/util/SigarUtils.java b/power-foundaton/src/main/java/com/manage/util/SigarUtils.java index 2c5766c..a6c8f28 100644 --- a/power-foundaton/src/main/java/com/manage/util/SigarUtils.java +++ b/power-foundaton/src/main/java/com/manage/util/SigarUtils.java @@ -1,7 +1,6 @@ package com.manage.util; -import org.hyperic.sigar.Sigar; import java.io.File; @@ -19,7 +18,7 @@ import java.io.File; * @Version: 1.0 */ public class SigarUtils{ - public static Sigar initSigar() { + /*public static Sigar initSigar() { try { //此处只为得到依赖库文件的目录,可根据实际项目自定义 String tomcatBinPath = System.getProperty("user.dir"); @@ -52,5 +51,5 @@ public class SigarUtils{ if (OS.indexOf("win") >= 0) { return true; } else return false; - } + }*/ } diff --git a/power-service/src/main/java/com/manage/service/ipml/PageServiceImpl.java b/power-service/src/main/java/com/manage/service/ipml/PageServiceImpl.java index ee88811..902d85d 100644 --- a/power-service/src/main/java/com/manage/service/ipml/PageServiceImpl.java +++ b/power-service/src/main/java/com/manage/service/ipml/PageServiceImpl.java @@ -3,7 +3,6 @@ package com.manage.service.ipml; import com.manage.dao.Power_UserMapper; import com.manage.service.cache.CacheManager; import com.manage.util.SigarUtils; -import org.hyperic.sigar.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -171,7 +170,7 @@ public class PageServiceImpl { return returnMap; } - public int getEcharts4() throws Exception{ + /*public int getEcharts4() throws Exception{ SigarUtils s = new SigarUtils(); s.initSigar(); int cpuCount = cpu(); @@ -239,7 +238,7 @@ public class PageServiceImpl { list.add(totalPhysicalMemorySize); list.add(user); return list; - } + }*/ //获取当月所有天 /**