|
@@ -21,6 +21,7 @@ import java.util.List;
|
|
|
*/
|
|
*/
|
|
|
@Service
|
|
@Service
|
|
|
public class UserKeyService {
|
|
public class UserKeyService {
|
|
|
|
|
+ private final String secretKey = "ossconsole.reghao.cn";
|
|
|
private final UserKeyRepository userKeyRepository;
|
|
private final UserKeyRepository userKeyRepository;
|
|
|
|
|
|
|
|
public UserKeyService(UserKeyRepository userKeyRepository) {
|
|
public UserKeyService(UserKeyRepository userKeyRepository) {
|
|
@@ -53,15 +54,14 @@ public class UserKeyService {
|
|
|
String accessKeyId = keyAuthDto.getAccessKeyId();
|
|
String accessKeyId = keyAuthDto.getAccessKeyId();
|
|
|
String accessKeySecret = keyAuthDto.getAccessKeySecret();
|
|
String accessKeySecret = keyAuthDto.getAccessKeySecret();
|
|
|
if (userKey.getAccessKeyId().equals(accessKeyId) && userKey.getAccessKeySecret().equals(accessKeySecret)) {
|
|
if (userKey.getAccessKeyId().equals(accessKeyId) && userKey.getAccessKeySecret().equals(accessKeySecret)) {
|
|
|
- String token = getToken(loginUser);
|
|
|
|
|
|
|
+ String token = getTokenByUserId(loginUser);
|
|
|
return Result.success(token);
|
|
return Result.success(token);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
return Result.fail("secret not matched");
|
|
return Result.fail("secret not matched");
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- public String getToken(int loginUser) {
|
|
|
|
|
- String secretKey = "ossconsole.reghao.cn";
|
|
|
|
|
|
|
+ public String getTokenByUserId(int loginUser) {
|
|
|
long timestamp = System.currentTimeMillis() + 3600*24*365*1000L;
|
|
long timestamp = System.currentTimeMillis() + 3600*24*365*1000L;
|
|
|
String action = ChannelAction.all.getName();
|
|
String action = ChannelAction.all.getName();
|
|
|
int channelId = 1;
|
|
int channelId = 1;
|
|
@@ -70,7 +70,6 @@ public class UserKeyService {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
public int getUserIdFromToken(String token) {
|
|
public int getUserIdFromToken(String token) {
|
|
|
- String secretKey = "ossconsole.reghao.cn";
|
|
|
|
|
OssPayload ossPayload = JwtUtil.getOssPayload(token, secretKey);
|
|
OssPayload ossPayload = JwtUtil.getOssPayload(token, secretKey);
|
|
|
return ossPayload.getUserId();
|
|
return ossPayload.getUserId();
|
|
|
}
|
|
}
|