Commit 45638f679cfd77644cd2317642e4fed0dd82cc05
1 parent
c32c280ee0
Exists in
master
update
Showing 1 changed file with 9 additions and 1 deletions
talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/UserContoller.java
View file @
45638f6
| ... | ... | @@ -22,6 +22,7 @@ |
| 22 | 22 | import lombok.extern.log4j.Log4j2; |
| 23 | 23 | import org.springframework.beans.factory.annotation.Autowired; |
| 24 | 24 | import org.springframework.beans.factory.annotation.Value; |
| 25 | +import org.springframework.cglib.beans.BeanMap; | |
| 25 | 26 | import org.springframework.util.DigestUtils; |
| 26 | 27 | import org.springframework.validation.BindingResult; |
| 27 | 28 | import org.springframework.validation.annotation.Validated; |
| 28 | 29 | |
| ... | ... | @@ -275,9 +276,16 @@ |
| 275 | 276 | public BaseResponse getUserByToken(@RequestHeader String authorization){ |
| 276 | 277 | BaseResponse baseResponse=new BaseResponse(); |
| 277 | 278 | baseResponse.setErrormsg(""); |
| 279 | + Map<String,Object> rs=new HashMap<>(); | |
| 278 | 280 | try { |
| 279 | 281 | LymsUser curUser=lymsUserService.getUserByToken(authorization); |
| 280 | - baseResponse.setObject(curUser); | |
| 282 | + Map<String,Object> hxMap=new HashMap<>(); | |
| 283 | + hxMap.put("hxuser",hxuser); | |
| 284 | + hxMap.put("hxpasswd",hxpasswd); | |
| 285 | + rs.put("hx",hxMap); | |
| 286 | + rs.put("curUser",curUser); | |
| 287 | + | |
| 288 | + baseResponse.setObject(rs); | |
| 281 | 289 | baseResponse.setErrorcode(0); |
| 282 | 290 | } catch (Exception e) { |
| 283 | 291 | log.error(e.getMessage()); |