From d349a2faa344efd2ba5bbf7d9c4463a0189cebee Mon Sep 17 00:00:00 2001 From: xiaoCJ <406612557@qq.com> Date: Mon, 13 May 2024 17:27:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E5=92=8Cmapper=20xml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/tea/UserController.java | 35 +++++++------------ 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java index 2034ca6..3f106bd 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java +++ b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java @@ -70,7 +70,6 @@ public class UserController { public ResultEntity login(@RequestParam(required = false) String passwordEncode, @RequestParam(required = false) String userName, HttpServletRequest request, - @RequestParam int roleId, @RequestParam(required = false) String TOKEN) { JwtUser jwtUser; String passWord; @@ -97,31 +96,23 @@ public class UserController { return new ResultEntity(HttpStatus.BAD_REQUEST, "密码错误"); } StuUser user1 = stuUsers.get(0); - if (!Objects.equals(roleId, user1.getRoleId())) { - return new ResultEntity(HttpStatus.BAD_REQUEST, "用户权限错误！"); - } else { // 保存用户的登录信息 - Map map = new HashMap<>(); - StuUser user = stuUsers.get(0); - map.put("name", user.getName()); - map.put("username", user.getUsername()); - map.put("roleId", user.getRoleId()); - map.put("phone", user.getPhone()); - map.put("schoolId", user.getSchoolId()); - map.put("classId", user.getClassId()); - map.put("userId", user.getUserid()); - String uuid = getIPAndPlace(request, user.getName(), user.getUserid(), user.getStudentId()); - map.put("logId", uuid); - map.put("token", token); - return new ResultEntity(HttpStatus.OK, map); - } + Map map = new HashMap<>(); + StuUser user = stuUsers.get(0); + map.put("name", user.getName()); + map.put("username", user.getUsername()); + map.put("roleId", user.getRoleId()); + map.put("phone", user.getPhone()); + map.put("schoolId", user.getSchoolId()); + map.put("classId", user.getClassId()); + map.put("userId", user.getUserid()); + String uuid = getIPAndPlace(request, user.getName(), user.getUserid(), user.getStudentId()); + map.put("logId", uuid); + map.put("token", token); + return new ResultEntity(HttpStatus.OK, map); } else { // 2、智云单点登录 jwtUser = TokenProvider.getJWTUserByZhiYun(TOKEN); - int roleId1 = jwtUser.getRoleId(); - if (!Objects.equals(roleId, roleId1)) { - return new ResultEntity(HttpStatus.BAD_REQUEST, "用户权限错误！"); - } jwtUser = TzApi.foreignExchangeTradingLogin(jwtUser.getUsername(), jwtUser.getPassword()); if (jwtUser == null) { throw new UnAuthorizedException("用户名或密码错误");