tangzheng/totus-nline
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整

Browse Source
This commit is contained in:
tangzh 2025-07-15 20:53:57 +08:00
parent 077805bac6
commit 9bae6bd66b
3 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
eladmin/eladmin-common/src/main/java/me/zhengjie/utils/SecurityUtils.java
View File

@ -136,9 +136,10 @@ public class SecurityUtils {
if (bearerToken != null && bearerToken.startsWith(tokenStartWith)) { if (bearerToken != null && bearerToken.startsWith(tokenStartWith)) {
// 去掉令牌前缀 // 去掉令牌前缀
return bearerToken.replace(tokenStartWith, ""); return bearerToken.replace(tokenStartWith, "");
} else {
log.debug("非法Token：{}", bearerToken);
} }
// else {
// log.debug("非法Token：{}", bearerToken);
// }
return null; return null;
} }
} }

15
eladmin/eladmin-system/src/main/java/me/zhengjie/modules/front/rest/BusUserController.java
View File

@ -19,6 +19,7 @@ import me.zhengjie.modules.system.service.BusUserService;
import me.zhengjie.utils.FileUtil; import me.zhengjie.utils.FileUtil;
import me.zhengjie.utils.PageResult; import me.zhengjie.utils.PageResult;
import me.zhengjie.utils.SecurityUtils; import me.zhengjie.utils.SecurityUtils;
import me.zhengjie.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
@ -66,13 +67,19 @@ public class BusUserController {
@Log("信息修改") @Log("信息修改")
@ApiOperation("修改用户信息") @ApiOperation("修改用户信息")
@PostMapping(value = "/update") @PostMapping(value = "/update")
public ResponseEntity<String> updateInfo(@RequestBody BusUserVo user) { public ResponseEntity<String> updateInfo(BusUserVo user) {
JwtUserDto jwtUser = (JwtUserDto) SecurityUtils.getCurrentUser(); JwtUserDto jwtUser = (JwtUserDto) SecurityUtils.getCurrentUser();
BusUser upd = new BusUser(); BusUser upd = new BusUser();
upd.setId(jwtUser.getUser().getId()); upd.setId(jwtUser.getUser().getId());
upd.setAvatar(user.getAvatar()); if (StringUtils.isNotBlank(user.getAvatar())) {
upd.setNickname(user.getNickname()); upd.setAvatar(user.getAvatar());
upd.setPhone(user.getPhone()); }
if (StringUtils.isNotBlank(user.getNickname())) {
upd.setNickname(user.getNickname());
}
if (StringUtils.isNotBlank(user.getPhone())) {
upd.setPhone(user.getPhone());
}
busUserService.updateById(upd); busUserService.updateById(upd);
return new ResponseEntity<>("修改成功", HttpStatus.OK); return new ResponseEntity<>("修改成功", HttpStatus.OK);
} }

18
eladmin/eladmin-system/src/main/java/me/zhengjie/modules/front/service/impl/WeChatServiceImpl.java
View File

@ -70,9 +70,9 @@ public class WeChatServiceImpl implements WeChatService {
// response.setOpenId("123456"); // response.setOpenId("123456");
String openId = response.getOpenId(); String openId = response.getOpenId();
String type = "login"; String type = "login";
BusUser BusUser = BusUserMapper.getUserByOpenId(openId); BusUser busUser = BusUserMapper.getUserByOpenId(openId);
if (ObjectUtil.isNotNull(BusUser)) { if (ObjectUtil.isNotNull(busUser)) {
if (BusUser.getStatus().equals(0)) { throw new BadRequestException("当前账户已禁用，请联系管理员！"); } if (busUser.getStatus().equals(0)) { throw new BadRequestException("当前账户已禁用，请联系管理员！"); }
} else { } else {
BusUser add = new BusUser(); BusUser add = new BusUser();
add.setSex(0); add.setSex(0);
@ -81,16 +81,16 @@ public class WeChatServiceImpl implements WeChatService {
add.setToken(openId); add.setToken(openId);
add.setAvatar(DEFAULT_AVATAR); add.setAvatar(DEFAULT_AVATAR);
BusUserMapper.insert(add); BusUserMapper.insert(add);
BusUser = add; busUser = add;
type = "register"; type = "register";
} }
loginVo.setType(type); loginVo.setType(type);
loginVo.setUid(BusUser.getId()); loginVo.setUid(busUser.getId());
loginVo.setNikeName(BusUser.getNickname()); loginVo.setNikeName(busUser.getNickname());
loginVo.setPhone(BusUser.getPhone()); loginVo.setPhone(busUser.getPhone());
loginVo.setAvatar(BusUser.getAvatar()); loginVo.setAvatar(busUser.getAvatar());
// 生成令牌 // 生成令牌
JwtUserDto jwtUserDto = busUserService.addUserCache(BusUser); JwtUserDto jwtUserDto = busUserService.addUserCache(busUser);
String token = tokenProvider.createToken(jwtUserDto); String token = tokenProvider.createToken(jwtUserDto);
loginVo.setToken(properties.getTokenStartWith() + token); loginVo.setToken(properties.getTokenStartWith() + token);
// 保存在线信息 // 保存在线信息