diff --git a/src/main/java/vvpkassistant/User/controller/UserController.java b/src/main/java/vvpkassistant/User/controller/UserController.java index cf693ed..a8e8992 100644 --- a/src/main/java/vvpkassistant/User/controller/UserController.java +++ b/src/main/java/vvpkassistant/User/controller/UserController.java @@ -1,5 +1,6 @@ package vvpkassistant.User.controller; import cn.dev33.satoken.stp.StpUtil; +import cn.hutool.core.bean.BeanUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import vvpkassistant.CoinRecords.CoinRecords; @@ -171,9 +172,13 @@ public class UserController { userDao.updateById(oldUser); } - result.put("info",tempModel); + UserModelVO userModelVO = BeanUtil.copyProperties(tempModel, UserModelVO.class); + StpUtil.login(userModelVO.getId()); + userModelVO.setToken(StpUtil.getTokenValue()); + result.put("info",userModelVO); result.put("newAccount",true); result.put("chatInfo",wxChatParam); + return ResponseData.success(result); } diff --git a/src/main/java/vvpkassistant/User/model/UserModelVO.java b/src/main/java/vvpkassistant/User/model/UserModelVO.java index 927a9e2..cbda940 100644 --- a/src/main/java/vvpkassistant/User/model/UserModelVO.java +++ b/src/main/java/vvpkassistant/User/model/UserModelVO.java @@ -23,4 +23,5 @@ public class UserModelVO { private String token; private Boolean newAccount; private WxChatParam chatInfo; + private Integer mailVerification; }