From 14d772cf6d99ecc2de16ab4b0de8fd8b1bd29835 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Wed, 26 Feb 2025 14:21:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/sys/web/user/UserController.java | 40 +++++++------ .../views/modules/sys/user/userInfo.html | 60 ++++++++++++------- 2 files changed, 62 insertions(+), 38 deletions(-) diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/UserController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/UserController.java index efa533e5..8ffd6634 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/UserController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/UserController.java @@ -4,18 +4,6 @@ */ package com.jeesite.modules.sys.web.user; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; - import com.alibaba.fastjson.JSONValidator; import com.jeesite.common.codec.DesUtils; import com.jeesite.common.codec.EncodeUtils; @@ -28,9 +16,20 @@ import com.jeesite.modules.sys.entity.User; import com.jeesite.modules.sys.service.UserService; import com.jeesite.modules.sys.utils.PwdUtils; import com.jeesite.modules.sys.utils.UserUtils; - +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import springfox.documentation.annotations.ApiIgnore; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + + /** * 用户Controller * @author ThinkGem @@ -78,12 +77,18 @@ public class UserController extends BaseController { */ @RequiresPermissions("user") @RequestMapping(value = "info") - public String info(User user, String op, Model model) { + public String info(String op, Model model) { if (StringUtils.isBlank(op)){ op = "base"; } + User u = UserUtils.getUser(); model.addAttribute("op", op); - model.addAttribute("user", UserUtils.getUser()); + model.addAttribute("user", u); + if (StringUtils.equals(op, "pqa")){ + model.addAttribute("pwdQuestion", u.getPwdQuestion()); + model.addAttribute("pwdQuestion2", u.getPwdQuestion2()); + model.addAttribute("pwdQuestion3", u.getPwdQuestion3()); + } return "modules/sys/user/userInfo"; } @@ -93,7 +98,7 @@ public class UserController extends BaseController { @RequiresPermissions("user") @PostMapping(value = "infoSaveBase") @ResponseBody - public String infoSaveBase(User user, HttpServletRequest request) { + public String infoSaveBase(User user) { if (StringUtils.isBlank(user.getUserName())){ return renderResult(Global.FALSE, text("sys.user.userNameNotBlank")); } @@ -116,8 +121,7 @@ public class UserController extends BaseController { @RequiresPermissions("user") @PostMapping(value = "infoSavePwd") @ResponseBody - public String infoSavePwd(User user, String oldPassword, String newPassword, - String confirmNewPassword) { + public String infoSavePwd(String oldPassword, String newPassword, String confirmNewPassword) { User currentUser = UserUtils.getUser(); // 登录密码解密（解决密码明文传输安全问题） String secretKey = Global.getProperty("shiro.loginSubmit.secretKey"); diff --git a/modules/core/src/main/resources/views/modules/sys/user/userInfo.html b/modules/core/src/main/resources/views/modules/sys/user/userInfo.html index 53e2f046..406fcfed 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/userInfo.html +++ b/modules/core/src/main/resources/views/modules/sys/user/userInfo.html @@ -157,8 +157,8 @@
-
-
+
+
 
@@ -177,8 +177,8 @@
- -
+ +
@@ -187,39 +187,49 @@ <% }else{ %>
${text('旧的密保问题及答案')}
-
+
- +
+
+
- +
+
+
- +
+
+
- +
+
+
- +
+
+
- +
@@ -229,39 +239,49 @@ <% } %>
${text('新的密保问题及答案')}
-
+
- +
+
+
- +
+
+
- +
+
+
- +
+
+
- +
+
+
- +
@@ -270,8 +290,8 @@
-
-
+
+