From 6a55ac47e35600b6f59cd7878a4cb1c0b3a2823a Mon Sep 17 00:00:00 2001 From: tongtongstudio Date: Tue, 23 Sep 2025 09:07:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=99=BB=E5=BD=95=E6=97=B6?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=AE=BE=E5=A4=87=E5=B9=B3=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../videotablet/controller/pub/RegisterController.java | 8 +++++--- .../videotablet/controller/sn/DevicesController.java | 1 + src/main/java/com/onekeycall/videotablet/entity/User.java | 7 +++++-- .../com/onekeycall/videotablet/service/UserService.java | 6 ++++-- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/onekeycall/videotablet/controller/pub/RegisterController.java b/src/main/java/com/onekeycall/videotablet/controller/pub/RegisterController.java index 20d17ba..0d68fb8 100644 --- a/src/main/java/com/onekeycall/videotablet/controller/pub/RegisterController.java +++ b/src/main/java/com/onekeycall/videotablet/controller/pub/RegisterController.java @@ -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 diff --git a/src/main/java/com/onekeycall/videotablet/controller/sn/DevicesController.java b/src/main/java/com/onekeycall/videotablet/controller/sn/DevicesController.java index e5555c4..be0dc87 100644 --- a/src/main/java/com/onekeycall/videotablet/controller/sn/DevicesController.java +++ b/src/main/java/com/onekeycall/videotablet/controller/sn/DevicesController.java @@ -152,6 +152,7 @@ public class DevicesController { apkIconFileInfo.setOriginFileName(originName); apkIconFileInfo.setFileName(fileName); apkIconFileInfo.setFilSize(file.getSize()); + apkIconService.save(apkIconFileInfo); return Result.ok(); diff --git a/src/main/java/com/onekeycall/videotablet/entity/User.java b/src/main/java/com/onekeycall/videotablet/entity/User.java index 25aef08..52ff5c4 100644 --- a/src/main/java/com/onekeycall/videotablet/entity/User.java +++ b/src/main/java/com/onekeycall/videotablet/entity/User.java @@ -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 getAuthorities() { diff --git a/src/main/java/com/onekeycall/videotablet/service/UserService.java b/src/main/java/com/onekeycall/videotablet/service/UserService.java index 5331b34..0b69bd2 100644 --- a/src/main/java/com/onekeycall/videotablet/service/UserService.java +++ b/src/main/java/com/onekeycall/videotablet/service/UserService.java @@ -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 codeMap = (Map) 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); } }