tt/OneKeyCallVideoTablet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复登录时上传设备平台

Browse Source
This commit is contained in:
tongtongstudio
2025-09-23 09:07:08 +08:00
parent 9b03e11919
commit 6a55ac47e3
4 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/onekeycall/videotablet/controller/pub/RegisterController.java
View File

@@ -50,8 +50,10 @@ public class RegisterController {
@PostMapping("/phone_register")
public Result registerByPhone(
@RequestParam String phone, @RequestParam String code,
@RequestParam(value = "verify_key") String verifyKey, @RequestParam(value = "Device-ID") String deviceId) {
logger.info("registerByPhone: phone={}, code={}, verifyKey={}, deviceId={}", phone, code, verifyKey, deviceId);
@RequestParam(value = "verify_key") String verifyKey,
@RequestParam(value = "Device-ID") String deviceId,
@RequestParam(value = "mobile_platform", defaultValue = "0") Integer mobilePlatform) {
logger.info("registerByPhone: phone={}, code={}, verifyKey={}, deviceId={}, mobilePlatform={}", phone, code, verifyKey, deviceId, mobilePlatform);
// if (TextUtils.isEmpty(verifyKey)) {
// return Result.error().message("verify key is empty", HttpStatus.BAD_REQUEST);
@@ -67,7 +69,7 @@ public class RegisterController {
return Result.error().message("code is not same");
}
try {
User user = userService.registerByPhone(phone, code, deviceId, new Date());
User user = userService.registerByPhone(phone, code, deviceId, mobilePlatform, new Date());
logger.info("loginByPhoneCode: user={}", user.toString());
TokenPair tokenPair = jwtUtil.generateTokenPair(user.getUserId(), deviceId);
//返回给app保存，access_token用来加入header请求接口，refresh_token用来更换access_token

1
src/main/java/com/onekeycall/videotablet/controller/sn/DevicesController.java
View File

@@ -152,6 +152,7 @@ public class DevicesController {
apkIconFileInfo.setOriginFileName(originName);
apkIconFileInfo.setFileName(fileName);
apkIconFileInfo.setFilSize(file.getSize());
apkIconService.save(apkIconFileInfo);
return Result.ok();

7
src/main/java/com/onekeycall/videotablet/entity/User.java
View File

@@ -59,8 +59,11 @@ public class User implements UserDetails {
@Column(name = "gender")
private String gender;
@Column(name = "mobile_system")
private Integer mobileSystem;
/**
* 0未知，1Android，2 iphone
*/
@Column(name = "mobile_platform")
private Integer mobilePlatform;
@Override
public Collection<? extends GrantedAuthority> getAuthorities() {

6
src/main/java/com/onekeycall/videotablet/service/UserService.java
View File

@@ -47,7 +47,7 @@ public class UserService implements UserDetailsService {
return userRepository.save(user);
}
public User registerByPhone(String phone, String code, String deviceId, Date createTime) {
public User registerByPhone(String phone, String code, String deviceId,Integer mobilePlatform, Date createTime) {
// 1. 验证验证码
Map<String, Object> codeMap = (Map<String, Object>) redisTemplate.opsForValue().get(phone);
if (codeMap == null || !code.equals(codeMap.get("code").toString())) {
@@ -61,6 +61,8 @@ public class UserService implements UserDetailsService {
user.setDeviceId(deviceId);
user.setLastLoginTime(createTime);
user.setUpdateTime(createTime);
user.setMobilePlatform(mobilePlatform);
userRepository.save(user);
return user;
} else {
// 3. 创建新用户
@@ -73,7 +75,7 @@ public class UserService implements UserDetailsService {
user.setUserId(SecureIdGenerator.generateSecureId(12));
user.setUsername(SecureIdGenerator.generateSecureUserName(8));
user.setDeviceId(deviceId);
user.setMobilePlatform(mobilePlatform);
return userRepository.save(user);
}
}