Commit c9d6ed4c authored by libin's avatar libin

Merge branch 'user-thrid-authorization' into dev

# Conflicts:
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUserController.java
parents 39c0592a a7469795
......@@ -229,6 +229,7 @@ public class AppUserController extends CommonBaseController{
appUserAlipayBiz.getUserInfo(userVo.getAliCode(),request);
}
}
return ObjectRestResponse.succ();
}
......@@ -337,7 +338,7 @@ public class AppUserController extends CommonBaseController{
}
@PostMapping("/bind")
private ObjectRestResponse accountBinding(AccountBindDTO accountBindDTO, HttpServletRequest request){
private ObjectRestResponse accountBinding(@RequestBody AccountBindDTO accountBindDTO,HttpServletRequest request){
try {
IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
return appUserLoginBiz.bindAccount(accountBindDTO, Integer.valueOf(infoFromToken.getId()), request);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment