From 55fdf0e6db7f7e3e783d190cd8d135ca32e5de03 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期二, 10 九月 2024 17:22:19 +0800 Subject: [PATCH] # --- zy-acs-flow/.env | 1 - zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/UserController.java | 3 +++ zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/AuthController.java | 1 + 3 files changed, 4 insertions(+), 1 deletions(-) diff --git a/zy-acs-flow/.env b/zy-acs-flow/.env index 964b23d..5ad1587 100644 --- a/zy-acs-flow/.env +++ b/zy-acs-flow/.env @@ -1,6 +1,5 @@ COOL_BASE_IP = '10.242.136.69' # COOL_BASE_IP = 'localhost' # COOL_BASE_IP = '192.168.4.36' -# COOL_BASE_PORT = 9090 diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/AuthController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/AuthController.java index 28ee3ac..b107b95 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/AuthController.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/AuthController.java @@ -46,6 +46,7 @@ @PostMapping("/login") public R login(@RequestBody LoginParam param, HttpServletRequest request) { +// System.out.println(userService.encodePassword("123456")); String username = param.getUsername(); Long tenantId = param.getTenantId(); User user = userService.getByUsername(username, tenantId); diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/UserController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/UserController.java index dc86572..2a49134 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/UserController.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/UserController.java @@ -113,6 +113,9 @@ @PostMapping("/user/update") @Transactional public R update(@RequestBody User user) { + if (user.getPassword() != null && user.getPassword().equals("")) { + user.setPassword(null); + } if (!Cools.isEmpty(user.getUsername()) && userService.count(new LambdaQueryWrapper<User>() .eq(User::getUsername, user.getUsername()) .ne(User::getId, user.getId())) > 0) { -- Gitblit v1.9.1