OpenIMApiClient 替换
This commit is contained in:
@@ -7,10 +7,11 @@ import com.tailbet.model.vo.LoginUserVo;
|
||||
import com.tailbet.model.vo.LoginVo;
|
||||
import com.tailbet.model.vo.R;
|
||||
import com.tailbet.model.vo.UserContext;
|
||||
import com.tailbet.openim.OpenIMClient;
|
||||
import com.tailbet.openim.OpenIMApiClient;
|
||||
import com.tailbet.service.IUserService;
|
||||
import com.tailbet.util.JwtUtil;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
/**
|
||||
@@ -23,13 +24,13 @@ public class UserController {
|
||||
|
||||
private final IUserService userService;
|
||||
private final JwtUtil jwtUtil;
|
||||
private final OpenIMClient openIMClient;
|
||||
private final OpenIMApiClient openIMApiClient;
|
||||
|
||||
/**
|
||||
* 注册
|
||||
*/
|
||||
@PostMapping("/register")
|
||||
public R<Void> register(@RequestBody RegisterDTO dto) {
|
||||
public R<Void> register(@RequestBody @Validated RegisterDTO dto) {
|
||||
userService.register(dto.getUsername(), dto.getPassword());
|
||||
return R.ok();
|
||||
|
||||
@@ -39,10 +40,10 @@ public class UserController {
|
||||
* 登录
|
||||
*/
|
||||
@PostMapping("/login")
|
||||
public R<LoginVo> login(@RequestBody LoginDTO dto) {
|
||||
public R<LoginVo> login(@RequestBody @Validated LoginDTO dto) {
|
||||
Long userId = userService.login(dto.getUsername(), dto.getPassword());
|
||||
String token = jwtUtil.generateToken(userId, dto.getUsername());
|
||||
String openIMToken = openIMClient.getUserToken(String.valueOf(userId));
|
||||
String openIMToken = openIMApiClient.getUserToken(String.valueOf(userId), 2); // platformID 2=Android
|
||||
|
||||
LoginVo vo = new LoginVo();
|
||||
vo.setToken(token);
|
||||
|
||||
Reference in New Issue
Block a user