diff --git a/power-admin/src/main/java/com/manage/controller/UserController.java b/power-admin/src/main/java/com/manage/controller/UserController.java index d090b9b..3d572cf 100644 --- a/power-admin/src/main/java/com/manage/controller/UserController.java +++ b/power-admin/src/main/java/com/manage/controller/UserController.java @@ -30,6 +30,7 @@ import org.springframework.web.multipart.commons.CommonsMultipartResolver; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; import java.nio.charset.Charset; import java.text.SimpleDateFormat; import java.util.Date; @@ -160,17 +161,23 @@ public class UserController { } } - @OptionalLog(module = "重置密码",methods = "用户管理",fieldName = "userName",tableName = "power_user") - @RequiresPermissions(value="/user/resetPassword") @RequestMapping("/resetPassword") @ResponseBody - public Msg update(Integer userId) throws Exception{ + public Msg update(String ids) throws Exception{ ServletRequestAttributes attr=(ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); HttpServletRequest request =attr.getRequest(); - Power_UserVo powerUser = powerUserService.selectByPrimaryKey(userId); - powerUser.setUserPwd(Base64.encode(MD5.KL("000000"))); - powerUserService.updateByPrimaryKeySelective(powerUser,request); - CacheManager.addExcCount("noExc"); +// Power_UserVo powerUser = powerUserService.selectByPrimaryKey(userId); +// powerUser.setUserPwd(Base64.encode(MD5.KL("000000"))); +// powerUserService.updateByPrimaryKeySelective(powerUser,request); +// CacheManager.addExcCount("noExc"); + //取得当前登录账号 + HttpSession session= request.getSession(); + Power_User powerUser1 =(Power_User) session.getAttribute("CURRENT_USER"); + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");//设置日期格式 + String date = df.format(new Date());// new Date()为获取当前系统时间 + String userName = powerUser1.getUserName(); + String encode = Base64.encode(MD5.KL("000000")); + powerUserService.updateUserPass(ids,userName,encode,date); return Msg.success(); } @RequestMapping("/selectUser") diff --git a/power-admin/src/main/resources/config/config.properties b/power-admin/src/main/resources/config/config.properties index 982a973..30977df 100644 --- a/power-admin/src/main/resources/config/config.properties +++ b/power-admin/src/main/resources/config/config.properties @@ -1,7 +1,7 @@ # \u62E6\u622A\u83DC\u5355\u914D\u7F6E\u6587\u4EF6 ljx 2019-4-27 #interceptRequest \u672A\u767B\u5F55\u4E4B\u524D\u653E\u884C\u3002\u9ED8\u8BA4\u4E3Anone #ajaxRequest ajax\u8BF7\u6C42\u6CA1\u6709\u5BF9\u5E94\u6A21\u5757\uFF0C\u9700\u8981\u653E\u884C\u3002 \u9ED8\u8BA4\u4E3Anone -releaseRequest = /login,/logout,/services,/font,/refuse,/swagger-ui.html,/webjars,/swagger-resources,/v2 +releaseRequest = /login,/logout,/services,/font,/refuse,/swagger-ui.html,/webjars,/swagger-resources,/v2,/collector ajaxRequest = none #session\u8FC7\u671F\u65F6\u95F4,\u5355\u4F4D\u79D2 diff --git a/power-admin/src/main/resources/config/jdbc.properties b/power-admin/src/main/resources/config/jdbc.properties index 6602083..76b90e7 100644 --- a/power-admin/src/main/resources/config/jdbc.properties +++ b/power-admin/src/main/resources/config/jdbc.properties @@ -1,8 +1,8 @@ #jdbc.url=jdbc\:mysql\://200.100.104.40\:3306/power?useUnicode\=true&characterEncoding\=utf-8 #jdbc.password=AbcXyz123 -jdbc.url=jdbc\:mysql\://localhost\:3306/gmpower?useUnicode\=true&characterEncoding\=utf-8 -jdbc.password=docus702 +jdbc.url=jdbc\:mysql\://localhost\:3306/gm_power?useUnicode\=true&characterEncoding\=utf-8 +jdbc.password=root jdbc.driver=com.mysql.jdbc.Driver jdbc.username=root diff --git a/power-admin/src/main/webapp/WEB-INF/jspf/webSocket.jspf b/power-admin/src/main/webapp/WEB-INF/jspf/webSocket.jspf index 122fc1f..93b80b3 100644 --- a/power-admin/src/main/webapp/WEB-INF/jspf/webSocket.jspf +++ b/power-admin/src/main/webapp/WEB-INF/jspf/webSocket.jspf @@ -71,7 +71,6 @@ } function narn (type,title,text,noticeId) { - debugger naranja()[type]({ title: title, text: text, diff --git a/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp b/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp index 81d40b6..d077cc5 100644 --- a/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp +++ b/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp @@ -155,40 +155,40 @@
@@ -244,7 +244,7 @@