diff --git a/pom.xml b/pom.xml index cf53816..b7cf7a1 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ 3.5.4 - com.ttstd + com.onekeycall VideoTablet 0.0.1-SNAPSHOT VideoTablet diff --git a/src/main/java/com/ttstd/videotablet/VideoTabletApplication.java b/src/main/java/com/onekeycall/videotablet/VideoTabletApplication.java similarity index 89% rename from src/main/java/com/ttstd/videotablet/VideoTabletApplication.java rename to src/main/java/com/onekeycall/videotablet/VideoTabletApplication.java index b223510..a0e114a 100644 --- a/src/main/java/com/ttstd/videotablet/VideoTabletApplication.java +++ b/src/main/java/com/onekeycall/videotablet/VideoTabletApplication.java @@ -1,4 +1,4 @@ -package com.ttstd.videotablet; +package com.onekeycall.videotablet; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/src/main/java/com/ttstd/videotablet/config/CommonConfig.java b/src/main/java/com/onekeycall/videotablet/config/CommonConfig.java similarity index 90% rename from src/main/java/com/ttstd/videotablet/config/CommonConfig.java rename to src/main/java/com/onekeycall/videotablet/config/CommonConfig.java index 3c8af43..9971602 100644 --- a/src/main/java/com/ttstd/videotablet/config/CommonConfig.java +++ b/src/main/java/com/onekeycall/videotablet/config/CommonConfig.java @@ -1,4 +1,4 @@ -package com.ttstd.videotablet.config; +package com.onekeycall.videotablet.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/ttstd/videotablet/config/RedisConfig.java b/src/main/java/com/onekeycall/videotablet/config/RedisConfig.java similarity index 96% rename from src/main/java/com/ttstd/videotablet/config/RedisConfig.java rename to src/main/java/com/onekeycall/videotablet/config/RedisConfig.java index da18221..0721c92 100644 --- a/src/main/java/com/ttstd/videotablet/config/RedisConfig.java +++ b/src/main/java/com/onekeycall/videotablet/config/RedisConfig.java @@ -1,4 +1,4 @@ -package com.ttstd.videotablet.config; +package com.onekeycall.videotablet.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/ttstd/videotablet/config/SecurityConfig.java b/src/main/java/com/onekeycall/videotablet/config/SecurityConfig.java similarity index 97% rename from src/main/java/com/ttstd/videotablet/config/SecurityConfig.java rename to src/main/java/com/onekeycall/videotablet/config/SecurityConfig.java index 980645f..84df6ac 100644 --- a/src/main/java/com/ttstd/videotablet/config/SecurityConfig.java +++ b/src/main/java/com/onekeycall/videotablet/config/SecurityConfig.java @@ -1,4 +1,4 @@ -package com.ttstd.videotablet.config; +package com.onekeycall.videotablet.config; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/com/ttstd/videotablet/controller/HelloController.java b/src/main/java/com/onekeycall/videotablet/controller/HelloController.java similarity index 93% rename from src/main/java/com/ttstd/videotablet/controller/HelloController.java rename to src/main/java/com/onekeycall/videotablet/controller/HelloController.java index 8912fb7..1aae104 100644 --- a/src/main/java/com/ttstd/videotablet/controller/HelloController.java +++ b/src/main/java/com/onekeycall/videotablet/controller/HelloController.java @@ -1,6 +1,6 @@ -package com.ttstd.videotablet.controller; +package com.onekeycall.videotablet.controller; -import com.ttstd.videotablet.result.Result; +import com.onekeycall.videotablet.result.Result; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/com/ttstd/videotablet/controller/LoginController.java b/src/main/java/com/onekeycall/videotablet/controller/LoginController.java similarity index 96% rename from src/main/java/com/ttstd/videotablet/controller/LoginController.java rename to src/main/java/com/onekeycall/videotablet/controller/LoginController.java index 7784fe9..f552543 100644 --- a/src/main/java/com/ttstd/videotablet/controller/LoginController.java +++ b/src/main/java/com/onekeycall/videotablet/controller/LoginController.java @@ -1,8 +1,8 @@ -package com.ttstd.videotablet.controller; +package com.onekeycall.videotablet.controller; -import com.ttstd.videotablet.entity.User; -import com.ttstd.videotablet.service.UserService; -import com.ttstd.videotablet.utils.TextUtils; +import com.onekeycall.videotablet.entity.User; +import com.onekeycall.videotablet.service.UserService; +import com.onekeycall.videotablet.utils.TextUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/ttstd/videotablet/controller/SmsController.java b/src/main/java/com/onekeycall/videotablet/controller/SmsController.java similarity index 96% rename from src/main/java/com/ttstd/videotablet/controller/SmsController.java rename to src/main/java/com/onekeycall/videotablet/controller/SmsController.java index 97c6af5..2da4308 100644 --- a/src/main/java/com/ttstd/videotablet/controller/SmsController.java +++ b/src/main/java/com/onekeycall/videotablet/controller/SmsController.java @@ -1,10 +1,10 @@ -package com.ttstd.videotablet.controller; +package com.onekeycall.videotablet.controller; import com.aliyun.dysmsapi20170525.models.SendSmsResponse; import com.aliyun.tea.TeaException; -import com.ttstd.videotablet.result.Result; -import com.ttstd.videotablet.sms.SendSms; -import com.ttstd.videotablet.utils.TextUtils; +import com.onekeycall.videotablet.result.Result; +import com.onekeycall.videotablet.sms.SendSms; +import com.onekeycall.videotablet.utils.TextUtils; import org.apache.commons.lang3.RandomStringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; diff --git a/src/main/java/com/ttstd/videotablet/dto/TokenPair.java b/src/main/java/com/onekeycall/videotablet/dto/TokenPair.java similarity index 98% rename from src/main/java/com/ttstd/videotablet/dto/TokenPair.java rename to src/main/java/com/onekeycall/videotablet/dto/TokenPair.java index f10d51f..6e97eb9 100644 --- a/src/main/java/com/ttstd/videotablet/dto/TokenPair.java +++ b/src/main/java/com/onekeycall/videotablet/dto/TokenPair.java @@ -1,7 +1,6 @@ -package com.ttstd.videotablet.dto; +package com.onekeycall.videotablet.dto; import lombok.Data; -import java.util.Date; /** * 双Token认证令牌对（AccessToken + RefreshToken） diff --git a/src/main/java/com/ttstd/videotablet/entity/User.java b/src/main/java/com/onekeycall/videotablet/entity/User.java similarity index 98% rename from src/main/java/com/ttstd/videotablet/entity/User.java rename to src/main/java/com/onekeycall/videotablet/entity/User.java index 44c6b84..f0083f9 100644 --- a/src/main/java/com/ttstd/videotablet/entity/User.java +++ b/src/main/java/com/onekeycall/videotablet/entity/User.java @@ -1,4 +1,4 @@ -package com.ttstd.videotablet.entity; +package com.onekeycall.videotablet.entity; import jakarta.persistence.*; import org.springframework.security.core.GrantedAuthority; diff --git a/src/main/java/com/ttstd/videotablet/handler/GlobalExceptionHandler.java b/src/main/java/com/onekeycall/videotablet/handler/GlobalExceptionHandler.java similarity index 97% rename from src/main/java/com/ttstd/videotablet/handler/GlobalExceptionHandler.java rename to src/main/java/com/onekeycall/videotablet/handler/GlobalExceptionHandler.java index 452c187..61855e7 100644 --- a/src/main/java/com/ttstd/videotablet/handler/GlobalExceptionHandler.java +++ b/src/main/java/com/onekeycall/videotablet/handler/GlobalExceptionHandler.java @@ -1,6 +1,6 @@ -package com.ttstd.videotablet.handler; +package com.onekeycall.videotablet.handler; -import com.ttstd.videotablet.result.Result; +import com.onekeycall.videotablet.result.Result; import org.springframework.http.HttpStatus; import org.springframework.validation.FieldError; import org.springframework.web.bind.MethodArgumentNotValidException; diff --git a/src/main/java/com/ttstd/videotablet/repository/UserRepository.java b/src/main/java/com/onekeycall/videotablet/repository/UserRepository.java similarity index 80% rename from src/main/java/com/ttstd/videotablet/repository/UserRepository.java rename to src/main/java/com/onekeycall/videotablet/repository/UserRepository.java index fcb5f05..c12d8f0 100644 --- a/src/main/java/com/ttstd/videotablet/repository/UserRepository.java +++ b/src/main/java/com/onekeycall/videotablet/repository/UserRepository.java @@ -1,6 +1,6 @@ -package com.ttstd.videotablet.repository; +package com.onekeycall.videotablet.repository; -import com.ttstd.videotablet.entity.User; +import com.onekeycall.videotablet.entity.User; import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; diff --git a/src/main/java/com/ttstd/videotablet/result/JsonData.java b/src/main/java/com/onekeycall/videotablet/result/JsonData.java similarity index 96% rename from src/main/java/com/ttstd/videotablet/result/JsonData.java rename to src/main/java/com/onekeycall/videotablet/result/JsonData.java index f915d9d..dd292c9 100644 --- a/src/main/java/com/ttstd/videotablet/result/JsonData.java +++ b/src/main/java/com/onekeycall/videotablet/result/JsonData.java @@ -1,4 +1,4 @@ -package com.ttstd.videotablet.result; +package com.onekeycall.videotablet.result; /** * 接口返回工具类 diff --git a/src/main/java/com/ttstd/videotablet/result/Result.java b/src/main/java/com/onekeycall/videotablet/result/Result.java similarity index 98% rename from src/main/java/com/ttstd/videotablet/result/Result.java rename to src/main/java/com/onekeycall/videotablet/result/Result.java index 0386200..5c46d6d 100644 --- a/src/main/java/com/ttstd/videotablet/result/Result.java +++ b/src/main/java/com/onekeycall/videotablet/result/Result.java @@ -1,4 +1,4 @@ -package com.ttstd.videotablet.result; +package com.onekeycall.videotablet.result; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/ttstd/videotablet/result/ResultCodeEnum.java b/src/main/java/com/onekeycall/videotablet/result/ResultCodeEnum.java similarity index 95% rename from src/main/java/com/ttstd/videotablet/result/ResultCodeEnum.java rename to src/main/java/com/onekeycall/videotablet/result/ResultCodeEnum.java index 9dc87fe..7bfc412 100644 --- a/src/main/java/com/ttstd/videotablet/result/ResultCodeEnum.java +++ b/src/main/java/com/onekeycall/videotablet/result/ResultCodeEnum.java @@ -1,4 +1,4 @@ -package com.ttstd.videotablet.result; +package com.onekeycall.videotablet.result; /** * 状态码 diff --git a/src/main/java/com/ttstd/videotablet/service/UserService.java b/src/main/java/com/onekeycall/videotablet/service/UserService.java similarity index 95% rename from src/main/java/com/ttstd/videotablet/service/UserService.java rename to src/main/java/com/onekeycall/videotablet/service/UserService.java index aa75c1e..e009b36 100644 --- a/src/main/java/com/ttstd/videotablet/service/UserService.java +++ b/src/main/java/com/onekeycall/videotablet/service/UserService.java @@ -1,7 +1,7 @@ -package com.ttstd.videotablet.service; +package com.onekeycall.videotablet.service; -import com.ttstd.videotablet.entity.User; -import com.ttstd.videotablet.repository.UserRepository; +import com.onekeycall.videotablet.entity.User; +import com.onekeycall.videotablet.repository.UserRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.security.core.userdetails.UserDetails; diff --git a/src/main/java/com/ttstd/videotablet/sms/SendSms.java b/src/main/java/com/onekeycall/videotablet/sms/SendSms.java similarity index 99% rename from src/main/java/com/ttstd/videotablet/sms/SendSms.java rename to src/main/java/com/onekeycall/videotablet/sms/SendSms.java index 863177f..598c8bd 100644 --- a/src/main/java/com/ttstd/videotablet/sms/SendSms.java +++ b/src/main/java/com/onekeycall/videotablet/sms/SendSms.java @@ -1,4 +1,4 @@ -package com.ttstd.videotablet.sms; +package com.onekeycall.videotablet.sms; // This file is auto-generated, don't edit it. Thanks. diff --git a/src/main/java/com/ttstd/videotablet/utils/HashUtils.java b/src/main/java/com/onekeycall/videotablet/utils/HashUtils.java similarity index 98% rename from src/main/java/com/ttstd/videotablet/utils/HashUtils.java rename to src/main/java/com/onekeycall/videotablet/utils/HashUtils.java index d9234e8..ae19141 100644 --- a/src/main/java/com/ttstd/videotablet/utils/HashUtils.java +++ b/src/main/java/com/onekeycall/videotablet/utils/HashUtils.java @@ -1,4 +1,4 @@ -package com.ttstd.videotablet.utils; +package com.onekeycall.videotablet.utils; import java.io.File; import java.io.FileInputStream; diff --git a/src/main/java/com/ttstd/videotablet/utils/JwtUtil.java b/src/main/java/com/onekeycall/videotablet/utils/JwtUtil.java similarity index 82% rename from src/main/java/com/ttstd/videotablet/utils/JwtUtil.java rename to src/main/java/com/onekeycall/videotablet/utils/JwtUtil.java index 5f59422..f4aae9b 100644 --- a/src/main/java/com/ttstd/videotablet/utils/JwtUtil.java +++ b/src/main/java/com/onekeycall/videotablet/utils/JwtUtil.java @@ -1,6 +1,6 @@ -package com.ttstd.videotablet.utils; +package com.onekeycall.videotablet.utils; -import com.ttstd.videotablet.dto.TokenPair; +import com.onekeycall.videotablet.dto.TokenPair; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.security.Keys; import org.springframework.beans.factory.annotation.Autowired; @@ -18,9 +18,12 @@ public class JwtUtil { @Autowired private StringRedisTemplate redisTemplate; - @Value("${jwt.secret}") private String secret; - @Value("${jwt.access-expire}") private Long accessExpire; - @Value("${jwt.refresh-expire}") private Long refreshExpire; + @Value("${jwt.secret}") + private String secret; + @Value("${jwt.access-expire}") + private Long accessExpire; + @Value("${jwt.refresh-expire}") + private Long refreshExpire; // 生成双Token（关联设备指纹） public TokenPair generateTokenPair(String username, String deviceId) { @@ -50,7 +53,7 @@ public class JwtUtil { TimeUnit.MILLISECONDS ); - return new TokenPair(accessToken, refreshToken); + return new TokenPair(accessToken, refreshToken, accessExpire, refreshExpire, deviceId); } // Token解析与校验（略） diff --git a/src/main/java/com/ttstd/videotablet/utils/TextUtils.java b/src/main/java/com/onekeycall/videotablet/utils/TextUtils.java similarity index 76% rename from src/main/java/com/ttstd/videotablet/utils/TextUtils.java rename to src/main/java/com/onekeycall/videotablet/utils/TextUtils.java index d5c9fee..02e9c13 100644 --- a/src/main/java/com/ttstd/videotablet/utils/TextUtils.java +++ b/src/main/java/com/onekeycall/videotablet/utils/TextUtils.java @@ -1,4 +1,4 @@ -package com.ttstd.videotablet.utils; +package com.onekeycall.videotablet.utils; public class TextUtils { public static boolean isEmpty(CharSequence str) { diff --git a/src/main/resources/application-debug.properties b/src/main/resources/application-debug.properties index 19d1ab6..4a374d0 100644 --- a/src/main/resources/application-debug.properties +++ b/src/main/resources/application-debug.properties @@ -27,4 +27,9 @@ spring.data.redis.lettuce.shutdown-timeout=100ms #spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MariaDBDialect spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL8Dialect spring.jpa.hibernate.ddl-auto=update -spring.jpa.show-sql=true \ No newline at end of file +spring.jpa.show-sql=true + +jwt.secret='wPQ1qRFo4YbuA849tmwKnDpQ8891vJBo' +# 可选，根据你的需要设置过期时间 +jwt.access-expire=86400000 +jwt.refresh-expire=2592000000 diff --git a/src/test/java/com/ttstd/videotablet/VideoTabletApplicationTests.java b/src/test/java/com/onekeycall/videotablet/VideoTabletApplicationTests.java similarity index 84% rename from src/test/java/com/ttstd/videotablet/VideoTabletApplicationTests.java rename to src/test/java/com/onekeycall/videotablet/VideoTabletApplicationTests.java index 9dff66a..6439cc2 100644 --- a/src/test/java/com/ttstd/videotablet/VideoTabletApplicationTests.java +++ b/src/test/java/com/onekeycall/videotablet/VideoTabletApplicationTests.java @@ -1,4 +1,4 @@ -package com.ttstd.videotablet; +package com.onekeycall.videotablet; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest;