|
@@ -68,7 +68,7 @@ public class TokenController {
|
|
// 用户登录
|
|
// 用户登录
|
|
LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword(), form.getTenantId());
|
|
LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword(), form.getTenantId());
|
|
// 获取登录token
|
|
// 获取登录token
|
|
- return ApiResult.success(tokenService.createToken(userInfo));
|
|
|
|
|
|
+ return ApiResult.success(tokenService.createToken(userInfo,""));
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -84,6 +84,7 @@ public class TokenController {
|
|
sysUser.setRoles(rolePermission);
|
|
sysUser.setRoles(rolePermission);
|
|
SysPerson sysPerson = sysPersonService.getsysPerson(userInfo.getUserId());
|
|
SysPerson sysPerson = sysPersonService.getsysPerson(userInfo.getUserId());
|
|
sysUser.setSysPerson(sysPerson);
|
|
sysUser.setSysPerson(sysPerson);
|
|
|
|
+ String openId = form.getOpenId();
|
|
|
|
|
|
if(StringUtils.isNotEmpty(form.getType())){
|
|
if(StringUtils.isNotEmpty(form.getType())){
|
|
Long userId = userInfo.getUserId();
|
|
Long userId = userInfo.getUserId();
|
|
@@ -99,7 +100,6 @@ public class TokenController {
|
|
}
|
|
}
|
|
}else if(type.equals("wx")){
|
|
}else if(type.equals("wx")){
|
|
String phone = form.getPhone();
|
|
String phone = form.getPhone();
|
|
- String openId = form.getOpenId();
|
|
|
|
if(count > 0){
|
|
if(count > 0){
|
|
userMapper.updateMbUser(phone,openId,userId,null, userInfo.getUserName());
|
|
userMapper.updateMbUser(phone,openId,userId,null, userInfo.getUserName());
|
|
}else {
|
|
}else {
|
|
@@ -141,7 +141,7 @@ public class TokenController {
|
|
|
|
|
|
|
|
|
|
// 获取登录token
|
|
// 获取登录token
|
|
- return ApiResult.success(tokenService.createToken(sysUser));
|
|
|
|
|
|
+ return ApiResult.success(tokenService.createToken(sysUser,openId));
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|