diff --git a/eladmin/eladmin-common/src/main/java/me/zhengjie/utils/SecurityUtils.java b/eladmin/eladmin-common/src/main/java/me/zhengjie/utils/SecurityUtils.java index e3ddda5..4e0f9b0 100644 --- a/eladmin/eladmin-common/src/main/java/me/zhengjie/utils/SecurityUtils.java +++ b/eladmin/eladmin-common/src/main/java/me/zhengjie/utils/SecurityUtils.java @@ -136,9 +136,10 @@ public class SecurityUtils { if (bearerToken != null && bearerToken.startsWith(tokenStartWith)) { // 去掉令牌前缀 return bearerToken.replace(tokenStartWith, ""); - } else { - log.debug("非法Token:{}", bearerToken); } + // else { + // log.debug("非法Token:{}", bearerToken); + // } return null; } } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/front/rest/BusUserController.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/front/rest/BusUserController.java index f938207..2862bd8 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/front/rest/BusUserController.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/front/rest/BusUserController.java @@ -19,6 +19,7 @@ import me.zhengjie.modules.system.service.BusUserService; import me.zhengjie.utils.FileUtil; import me.zhengjie.utils.PageResult; import me.zhengjie.utils.SecurityUtils; +import me.zhengjie.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -66,13 +67,19 @@ public class BusUserController { @Log("信息修改") @ApiOperation("修改用户信息") @PostMapping(value = "/update") - public ResponseEntity updateInfo(@RequestBody BusUserVo user) { + public ResponseEntity updateInfo(BusUserVo user) { JwtUserDto jwtUser = (JwtUserDto) SecurityUtils.getCurrentUser(); BusUser upd = new BusUser(); upd.setId(jwtUser.getUser().getId()); - upd.setAvatar(user.getAvatar()); - upd.setNickname(user.getNickname()); - upd.setPhone(user.getPhone()); + if (StringUtils.isNotBlank(user.getAvatar())) { + upd.setAvatar(user.getAvatar()); + } + if (StringUtils.isNotBlank(user.getNickname())) { + upd.setNickname(user.getNickname()); + } + if (StringUtils.isNotBlank(user.getPhone())) { + upd.setPhone(user.getPhone()); + } busUserService.updateById(upd); return new ResponseEntity<>("修改成功", HttpStatus.OK); } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/front/service/impl/WeChatServiceImpl.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/front/service/impl/WeChatServiceImpl.java index 098fb8f..bf8b093 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/front/service/impl/WeChatServiceImpl.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/front/service/impl/WeChatServiceImpl.java @@ -70,9 +70,9 @@ public class WeChatServiceImpl implements WeChatService { // response.setOpenId("123456"); String openId = response.getOpenId(); String type = "login"; - BusUser BusUser = BusUserMapper.getUserByOpenId(openId); - if (ObjectUtil.isNotNull(BusUser)) { - if (BusUser.getStatus().equals(0)) { throw new BadRequestException("当前账户已禁用,请联系管理员!"); } + BusUser busUser = BusUserMapper.getUserByOpenId(openId); + if (ObjectUtil.isNotNull(busUser)) { + if (busUser.getStatus().equals(0)) { throw new BadRequestException("当前账户已禁用,请联系管理员!"); } } else { BusUser add = new BusUser(); add.setSex(0); @@ -81,16 +81,16 @@ public class WeChatServiceImpl implements WeChatService { add.setToken(openId); add.setAvatar(DEFAULT_AVATAR); BusUserMapper.insert(add); - BusUser = add; + busUser = add; type = "register"; } loginVo.setType(type); - loginVo.setUid(BusUser.getId()); - loginVo.setNikeName(BusUser.getNickname()); - loginVo.setPhone(BusUser.getPhone()); - loginVo.setAvatar(BusUser.getAvatar()); + loginVo.setUid(busUser.getId()); + loginVo.setNikeName(busUser.getNickname()); + loginVo.setPhone(busUser.getPhone()); + loginVo.setAvatar(busUser.getAvatar()); // 生成令牌 - JwtUserDto jwtUserDto = busUserService.addUserCache(BusUser); + JwtUserDto jwtUserDto = busUserService.addUserCache(busUser); String token = tokenProvider.createToken(jwtUserDto); loginVo.setToken(properties.getTokenStartWith() + token); // 保存在线信息