diff --git a/luoo_common/src/main/java/constants/Constants.java b/luoo_common/src/main/java/constants/Constants.java index 3c4dcfc..16ae4e3 100644 --- a/luoo_common/src/main/java/constants/Constants.java +++ b/luoo_common/src/main/java/constants/Constants.java @@ -34,7 +34,7 @@ public class Constants { public static final String TOKEN_ROLE_ADMIN_USER = "admin"; // public static final String TOKEN_ROLE_TOURIST="tourist"; - public static final String RESOURCE_PREFIX = "http://cdn.indie.cn/"; + public static final String RESOURCE_PREFIX = "http://cdn1.indie.cn:19000/indie/"; public static final String MUSIC_RESOURCE_PREFIX = RESOURCE_PREFIX + "music/"; public static final String SONG_RESOURCE_PREFIX = RESOURCE_PREFIX + "song/"; diff --git a/luoo_music/src/main/java/com/luoo/music/config/AwsS3Config.java b/luoo_music/src/main/java/com/luoo/music/config/AwsS3Config.java index 539d499..853949c 100644 --- a/luoo_music/src/main/java/com/luoo/music/config/AwsS3Config.java +++ b/luoo_music/src/main/java/com/luoo/music/config/AwsS3Config.java @@ -19,14 +19,16 @@ public class AwsS3Config { @Bean public S3Client s3Client(){ - AwsBasicCredentials awsBasicCredentials = AwsBasicCredentials.create("GLwHmLTZ05Kw9RyCGJXnIkua", "ynOBIqdNXH5HBgrVA29DTn4cUSh1wAI"); +// AwsBasicCredentials awsBasicCredentials = AwsBasicCredentials.create("GLwHmLTZ05Kw9RyCGJXnIkua", "ynOBIqdNXH5HBgrVA29DTn4cUSh1wAI"); + AwsBasicCredentials awsBasicCredentials = AwsBasicCredentials.create("YaUJkVdm3btJxproam5a", "sCkKJdcImazyae1aHWIMAGg9XZLRGh3XXYerAB48"); S3Configuration s3Config = S3Configuration.builder().pathStyleAccessEnabled(true).build(); S3Client s3 = S3Client.builder() - .endpointOverride(URI.create("https://s3.bitiful.net/")) + .endpointOverride(URI.create("http://cdn1.indie.cn:19000/")) .credentialsProvider(StaticCredentialsProvider.create(awsBasicCredentials)) .region(region) .serviceConfiguration(s3Config) .build(); + return s3; } @@ -34,9 +36,10 @@ public class AwsS3Config { public S3Presigner s3Presigner(){ S3Configuration s3Config = S3Configuration.builder().pathStyleAccessEnabled(true).build(); S3Presigner presigner = S3Presigner.builder() - .endpointOverride(URI.create("https://s3.bitiful.net/")) + .endpointOverride(URI.create("http://cdn1.indie.cn:19000/")) .region(region) .build(); + return presigner; } } diff --git a/luoo_user/src/main/java/com/luoo/user/config/AwsS3Config.java b/luoo_user/src/main/java/com/luoo/user/config/AwsS3Config.java index 9d61b3e..9452d8e 100644 --- a/luoo_user/src/main/java/com/luoo/user/config/AwsS3Config.java +++ b/luoo_user/src/main/java/com/luoo/user/config/AwsS3Config.java @@ -28,10 +28,11 @@ public class AwsS3Config { @Bean public S3Client s3Client(){ - AwsBasicCredentials awsBasicCredentials = AwsBasicCredentials.create("GLwHmLTZ05Kw9RyCGJXnIkua", "ynOBIqdNXH5HBgrVA29DTn4cUSh1wAI"); +// AwsBasicCredentials awsBasicCredentials = AwsBasicCredentials.create("GLwHmLTZ05Kw9RyCGJXnIkua", "ynOBIqdNXH5HBgrVA29DTn4cUSh1wAI"); + AwsBasicCredentials awsBasicCredentials = AwsBasicCredentials.create("YaUJkVdm3btJxproam5a", "sCkKJdcImazyae1aHWIMAGg9XZLRGh3XXYerAB48"); S3Configuration s3Config = S3Configuration.builder().pathStyleAccessEnabled(true).build(); S3Client s3 = S3Client.builder() - .endpointOverride(URI.create("https://s3.bitiful.net/")) + .endpointOverride(URI.create("http://cdn1.indie.cn:19000/")) .credentialsProvider(StaticCredentialsProvider.create(awsBasicCredentials)) .region(region) .serviceConfiguration(s3Config) @@ -44,7 +45,7 @@ public class AwsS3Config { public S3Presigner s3Presigner(){ S3Configuration s3Config = S3Configuration.builder().pathStyleAccessEnabled(true).build(); S3Presigner presigner = S3Presigner.builder() - .endpointOverride(URI.create("https://s3.bitiful.net/")) + .endpointOverride(URI.create("http://cdn1.indie.cn:19000/")) .region(region) .build();