Skip to content

M
midjourney-proxy
Commit 3db25405 by Administrator
Options

Merge branch 'feat-dw-migrateOSS2Huawei' into 'master' 

feat:[1003010]华为云迁移OBS/MPC

See merge request rays/pcloud-common-parent!117
parents c9b7cb66 0e78c657
Showing with 437 additions and 98 deletions
pcloud-common-config/src/main/resources.prod/aliyun.properties
## main ## main Ϊak sk
main.access.key.id = LTAIx8FODeVLN3bD main.access.key.id = CROQ0IJRW2FW5NSERZBR
main.access.key.secret = eJbZwTzatZq4SMyDiQeh7NzIHkdAaO main.access.key.secret = rAbki4thgWx9iKXendlIH3gvKi8JFHUcVOWwObyS
## OSS ## OSS
oss.region = oss-cn-hangzhou oss.region = cn-east-2
oss.endpoint = http://oss-cn-hangzhou.aliyuncs.com oss.endpoint = obs.cn-east-2.myhuaweicloud.com
file.bucket = whlg-oss-002 file.bucket = whlg-oss-prod-002
file.original.url = http://whlg-oss-002.oss-cn-hangzhou.aliyuncs.com/ file.original.url = http://whlg-oss-001.obs.cn-east-2.myhuaweicloud.com/
input.bucket = whlg-oss-prod-001
oss.region.bj = oss-cn-beijing oss.region.bj = oss-cn-beijing
oss.endpoint.bj = http://oss-cn-beijing-internal.aliyuncs.com oss.endpoint.bj = http://oss-cn-beijing.aliyuncs.com
live.bucket = whlg-oss-livedev live.bucket = whlg-oss-live
live.original.url = http://whlg-oss-livedev.oss-cn-beijing.aliyuncs.com/ live.original.url = http://whlg-oss-livedev.oss-cn-beijing.aliyuncs.com/
by.bucket = byfile-oss-01 by.bucket = byfile-oss-01
by.original.url = http://byfile-oss-01.oss-cn-hangzhou.aliyuncs.com/ by.original.url = http://byfile-oss-01.oss-cn-hangzhou.aliyuncs.com/
## mts ## mts
mts.region = cn-hangzhou mts.region = cn-east-2
mts.endpoint = mts.cn-hangzhou.aliyuncs.com mts.endpoint = mpc.cn-east-2.myhuaweicloud.com
pipelineid = a63c988125054b07b1d3bd6e10c327de pipelineid = a63c988125054b07b1d3bd6e10c327de
mp3TemplateId = d60210d2fd5bfcacce66238142437965 mts.projectId = 07455135488025b22fe7c01fdb631c14
mp4TemplateId = 67745f7eb8b7ca9bcf74d96c2364e6c1 mts.ak = 8J56JHJN5P8OLR5ERKFU
mts.sk = xAlBYlowAhwa9c1Wi4JsX7XkZGFlzlWW3CBHdZWJ
mp3TemplateId = 104257
mp4TemplateId = 104256
m3u8TemplateId = 283cd916aa504502b3704f3f5a45addc m3u8TemplateId = 283cd916aa504502b3704f3f5a45addc
mts.region.bj = cn-beijing mts.region.bj = cn-beijing
...@@ -33,9 +37,13 @@ mp4TemplateId.bj = f4165d42e5eb680c8f919f960f35059c ...@@ -33,9 +37,13 @@ mp4TemplateId.bj = f4165d42e5eb680c8f919f960f35059c
## cdn ## cdn
file.domain.name = oss.5rs.me file.domain.name = oss.5rs.me
file.cdn.url = https://oss.5rs.me/ file.cdn.url = https://oss.5rs.me/
oss.cdn.urls = http://file.chubanyun.me/,http://file.techdc.cn/,https://file.raysyun.com/,http://file.raysgo.com/,https://file.5rs.me/,https://oss.5rs.me/,http://live.chubanyun.me/,https://download.5rs.me/,http://rays-adviser.chubanyun.me/,https://byfile.1wlshu.com/ oss.cdn.urls = http://file.chubanyun.me/,http://file.techdc.cn/,https://file.raysyun.com/,http://file.raysgo.com/,http://oss.raysgo.com/,https://file.5rs.me/,https://oss.5rs.me/,http://live.chubanyun.me/,https://download.5rs.me/,http://rays-adviser.chubanyun.me/,https://byfile.1wlshu.com/,https://byfile.raysgo.com/
rays.cdn.urls = https://file.5rs.me/,https://oss.5rs.me/ rays.cdn.urls = https://file.5rs.me/,https://oss.5rs.me/
file.cdn.url.download = https://download.5rs.me/ file.cdn.url.download = https://download.5rs.me/
file.cdn.url.live = http://live.chubanyun.me/ file.cdn.url.live = http://live.chubanyun.me/
file.cdn.url.by = https://byfile.1wlshu.com/ file.cdn.url.by = https://byfile.raysgo.com/
\ No newline at end of file
huawei.access.key = CROQ0IJRW2FW5NSERZBR
huawei.secret.key = rAbki4thgWx9iKXendlIH3gvKi8JFHUcVOWwObyS
pcloud-common-config/src/main/resources.test/aliyun.properties
## main ## main Ϊak sk
main.access.key.id = LTAIx8FODeVLN3bD main.access.key.id = CROQ0IJRW2FW5NSERZBR
main.access.key.secret = eJbZwTzatZq4SMyDiQeh7NzIHkdAaO main.access.key.secret = rAbki4thgWx9iKXendlIH3gvKi8JFHUcVOWwObyS
## OSS ## OSS
oss.region = oss-cn-hangzhou oss.region = cn-east-2
oss.endpoint = http://oss-cn-hangzhou.aliyuncs.com oss.endpoint = obs.cn-east-2.myhuaweicloud.com
file.bucket = whlg-oss-002 file.bucket = whlg-oss-test-002
file.original.url = http://whlg-oss-002.oss-cn-hangzhou.aliyuncs.com/ file.original.url = http://whlg-oss-001.obs.cn-east-2.myhuaweicloud.com/
input.bucket = whlg-oss-test-001
oss.region.bj = oss-cn-beijing oss.region.bj = oss-cn-beijing
oss.endpoint.bj = http://oss-cn-beijing.aliyuncs.com oss.endpoint.bj = http://oss-cn-beijing.aliyuncs.com
live.bucket = whlg-oss-livedev live.bucket = whlg-oss-live
live.original.url = http://whlg-oss-livedev.oss-cn-beijing.aliyuncs.com/ live.original.url = http://whlg-oss-livedev.oss-cn-beijing.aliyuncs.com/
by.bucket = byfile-oss-01 by.bucket = byfile-oss-01
by.original.url = http://byfile-oss-01.oss-cn-hangzhou.aliyuncs.com/ by.original.url = http://byfile-oss-01.oss-cn-hangzhou.aliyuncs.com/
## mts ## mts
mts.region = cn-hangzhou mts.region = cn-east-2
mts.endpoint = mts.cn-hangzhou.aliyuncs.com mts.endpoint = mpc.cn-east-2.myhuaweicloud.com
pipelineid = a63c988125054b07b1d3bd6e10c327de pipelineid = a63c988125054b07b1d3bd6e10c327de
mp3TemplateId = d60210d2fd5bfcacce66238142437965 mts.projectId = 07455135488025b22fe7c01fdb631c14
mp4TemplateId = 67745f7eb8b7ca9bcf74d96c2364e6c1 mts.ak = 8J56JHJN5P8OLR5ERKFU
mts.sk = xAlBYlowAhwa9c1Wi4JsX7XkZGFlzlWW3CBHdZWJ
mp3TemplateId = 104257
mp4TemplateId = 104256
m3u8TemplateId = 283cd916aa504502b3704f3f5a45addc m3u8TemplateId = 283cd916aa504502b3704f3f5a45addc
mts.region.bj = cn-beijing mts.region.bj = cn-beijing
...@@ -32,10 +36,14 @@ mp4TemplateId.bj = f4165d42e5eb680c8f919f960f35059c ...@@ -32,10 +36,14 @@ mp4TemplateId.bj = f4165d42e5eb680c8f919f960f35059c
## cdn ## cdn
file.domain.name = oss.5rs.me file.domain.name = oss.5rs.me
file.cdn.url = https://oss.5rs.me/ file.cdn.url = https://oss.raysgo.com/
oss.cdn.urls = http://file.chubanyun.me/,http://file.techdc.cn/,https://file.raysyun.com/,http://file.raysgo.com/,http://oss.raysgo.com/,https://file.5rs.me/,https://oss.5rs.me/,http://live.chubanyun.me/,https://download.5rs.me/,http://rays-adviser.chubanyun.me/,https://byfile.1wlshu.com/,https://byfile.raysgo.com/ oss.cdn.urls = http://file.chubanyun.me/,http://file.techdc.cn/,https://file.raysyun.com/,http://file.raysgo.com/,http://oss.raysgo.com/,https://file.5rs.me/,https://oss.5rs.me/,http://live.chubanyun.me/,https://download.5rs.me/,http://rays-adviser.chubanyun.me/,https://byfile.1wlshu.com/,https://byfile.raysgo.com/,https://oss.raysyun.com/
rays.cdn.urls = https://file.5rs.me/,https://oss.5rs.me/ rays.cdn.urls = https://file.5rs.me/,https://oss.5rs.me/
file.cdn.url.download = https://download.5rs.me/ file.cdn.url.download = https://download.5rs.me/
file.cdn.url.live = http://live.chubanyun.me/ file.cdn.url.live = http://live.chubanyun.me/
file.cdn.url.by = https://byfile.raysgo.com/ file.cdn.url.by = https://byfile.raysgo.com/
huawei.access.key = CROQ0IJRW2FW5NSERZBR
huawei.secret.key = rAbki4thgWx9iKXendlIH3gvKi8JFHUcVOWwObyS
pcloud-common-config/src/main/resources.uat/aliyun.properties
## main ## main Ϊak sk
main.access.key.id = LTAIx8FODeVLN3bD main.access.key.id = CROQ0IJRW2FW5NSERZBR
main.access.key.secret = eJbZwTzatZq4SMyDiQeh7NzIHkdAaO main.access.key.secret = rAbki4thgWx9iKXendlIH3gvKi8JFHUcVOWwObyS
## OSS ## OSS
oss.region = oss-cn-hangzhou oss.region = cn-east-2
oss.endpoint = http://oss-cn-hangzhou.aliyuncs.com oss.endpoint = obs.cn-east-2.myhuaweicloud.com
file.bucket = whlg-oss-002 file.bucket = whlg-oss-uat-002
file.original.url = http://whlg-oss-002.oss-cn-hangzhou.aliyuncs.com/ file.original.url = http://whlg-oss-001.obs.cn-east-2.myhuaweicloud.com/
input.bucket = whlg-oss-uat-001
oss.region.bj = oss-cn-beijing oss.region.bj = oss-cn-beijing
oss.endpoint.bj = http://oss-cn-beijing.aliyuncs.com oss.endpoint.bj = http://oss-cn-beijing.aliyuncs.com
live.bucket = whlg-oss-livedev live.bucket = whlg-oss-live
live.original.url = http://whlg-oss-livedev.oss-cn-beijing.aliyuncs.com/ live.original.url = http://whlg-oss-livedev.oss-cn-beijing.aliyuncs.com/
by.bucket = byfile-oss-01 by.bucket = byfile-oss-01
by.original.url = http://byfile-oss-01.oss-cn-hangzhou.aliyuncs.com/ by.original.url = http://byfile-oss-01.oss-cn-hangzhou.aliyuncs.com/
## mts ## mts
mts.region = cn-hangzhou mts.region = cn-east-2
mts.endpoint = mts.cn-hangzhou.aliyuncs.com mts.endpoint = mpc.cn-east-2.myhuaweicloud.com
pipelineid = a63c988125054b07b1d3bd6e10c327de pipelineid = a63c988125054b07b1d3bd6e10c327de
mp3TemplateId = d60210d2fd5bfcacce66238142437965 mts.projectId = 07455135488025b22fe7c01fdb631c14
mp4TemplateId = 67745f7eb8b7ca9bcf74d96c2364e6c1 mts.ak = 8J56JHJN5P8OLR5ERKFU
mts.sk = xAlBYlowAhwa9c1Wi4JsX7XkZGFlzlWW3CBHdZWJ
mp3TemplateId = 104257
mp4TemplateId = 104256
m3u8TemplateId = 283cd916aa504502b3704f3f5a45addc m3u8TemplateId = 283cd916aa504502b3704f3f5a45addc
mts.region.bj = cn-beijing mts.region.bj = cn-beijing
...@@ -32,10 +36,14 @@ mp4TemplateId.bj = f4165d42e5eb680c8f919f960f35059c ...@@ -32,10 +36,14 @@ mp4TemplateId.bj = f4165d42e5eb680c8f919f960f35059c
## cdn ## cdn
file.domain.name = oss.5rs.me file.domain.name = oss.5rs.me
file.cdn.url = https://oss.5rs.me/ file.cdn.url = https://oss.raysyun.com/
oss.cdn.urls = http://file.chubanyun.me/,http://file.techdc.cn/,https://file.raysyun.com/,http://file.raysgo.com/,https://file.5rs.me/,https://oss.5rs.me/,http://live.chubanyun.me/,https://download.5rs.me/,http://rays-adviser.chubanyun.me/,https://byfile.1wlshu.com oss.cdn.urls = http://file.chubanyun.me/,http://file.techdc.cn/,https://file.raysyun.com/,http://file.raysgo.com/,http://oss.raysgo.com/,https://file.5rs.me/,https://oss.5rs.me/,http://live.chubanyun.me/,https://download.5rs.me/,http://rays-adviser.chubanyun.me/,https://byfile.1wlshu.com/,https://byfile.raysgo.com/,https://oss.raysyun.com/
rays.cdn.urls = https://file.5rs.me/,https://oss.5rs.me/ rays.cdn.urls = https://file.5rs.me/,https://oss.5rs.me/
file.cdn.url.download = https://download.5rs.me/ file.cdn.url.download = https://download.5rs.me/
file.cdn.url.live = http://live.chubanyun.me/ file.cdn.url.live = http://live.chubanyun.me/
file.cdn.url.by = https://byfile.1wlshu.com file.cdn.url.by = https://byfile.raysgo.com/
\ No newline at end of file
huawei.access.key = CROQ0IJRW2FW5NSERZBR
huawei.secret.key = rAbki4thgWx9iKXendlIH3gvKi8JFHUcVOWwObyS
pcloud-common/pom.xml
...@@ -155,10 +155,11 @@ ...@@ -155,10 +155,11 @@
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
</dependency> </dependency>
<dependency> <!-- <dependency>
<groupId>com.squareup.okhttp3</groupId> <groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId> <artifactId>okhttp</artifactId>
</dependency> <version>3.6.0</version>
</dependency>-->
<dependency> <dependency>
<groupId>commons-codec</groupId> <groupId>commons-codec</groupId>
...@@ -292,6 +293,20 @@ ...@@ -292,6 +293,20 @@
<groupId>com.aliyun</groupId> <groupId>com.aliyun</groupId>
<artifactId>aliyun-java-sdk-mts</artifactId> <artifactId>aliyun-java-sdk-mts</artifactId>
</dependency> </dependency>
<!--华为云媒体转码SDK包 -->
<dependency>
<groupId>com.huawei.mpc</groupId>
<artifactId>cloud-java-sdk-mpc</artifactId>
</dependency>
<dependency>
<groupId>com.squareup.retrofit2</groupId>
<artifactId>retrofit</artifactId>
</dependency>
<dependency>
<groupId>com.huaweicloud</groupId>
<artifactId>esdk-obs-java</artifactId>
<version>3.19.7</version>
</dependency>
<!-- Jackson Begin --> <!-- Jackson Begin -->
<dependency> <dependency>
......
pcloud-common/src/main/java/com/pcloud/common/constant/AliyunConstant.java
...@@ -18,7 +18,7 @@ import com.pcloud.common.utils.string.StringUtil; ...@@ -18,7 +18,7 @@ import com.pcloud.common.utils.string.StringUtil;
public class AliyunConstant { public class AliyunConstant {
/** /**
* 主账号keyId * 主账号keyId，华为云ak
*/ */
public static String MAIN_ACCESS_KEY_ID; public static String MAIN_ACCESS_KEY_ID;
...@@ -28,7 +28,7 @@ public class AliyunConstant { ...@@ -28,7 +28,7 @@ public class AliyunConstant {
} }
/** /**
* 主账号keySecret * 主账号keySecret 华为云sk
*/ */
public static String MAIN_ACCESS_KEY_SECRET; public static String MAIN_ACCESS_KEY_SECRET;
...@@ -52,7 +52,7 @@ public class AliyunConstant { ...@@ -52,7 +52,7 @@ public class AliyunConstant {
*/ */
public static String MTS_REGION_BJ; public static String MTS_REGION_BJ;
@Value("${mts.region.bj}") @Value("cn-north-4")
public void setMtsRegionBj(String mtsRegionBj) { public void setMtsRegionBj(String mtsRegionBj) {
MTS_REGION_BJ = mtsRegionBj; MTS_REGION_BJ = mtsRegionBj;
} }
...@@ -72,7 +72,7 @@ public class AliyunConstant { ...@@ -72,7 +72,7 @@ public class AliyunConstant {
*/ */
public static String OSS_REGION_BJ; public static String OSS_REGION_BJ;
@Value("${oss.region.bj}") @Value("cn-north-4")
public void setOssRegionBj(String ossRegionBj) { public void setOssRegionBj(String ossRegionBj) {
OSS_REGION_BJ = ossRegionBj; OSS_REGION_BJ = ossRegionBj;
} }
...@@ -112,7 +112,7 @@ public class AliyunConstant { ...@@ -112,7 +112,7 @@ public class AliyunConstant {
*/ */
public static String MTS_ENDPOINT_BJ; public static String MTS_ENDPOINT_BJ;
@Value("${mts.endpoint.bj}") @Value("live.cn-north-4.myhuaweicloud.com")
public void setMtsEndpointBj(String mtsEndpointBj) { public void setMtsEndpointBj(String mtsEndpointBj) {
MTS_ENDPOINT_BJ = mtsEndpointBj; MTS_ENDPOINT_BJ = mtsEndpointBj;
} }
...@@ -138,6 +138,16 @@ public class AliyunConstant { ...@@ -138,6 +138,16 @@ public class AliyunConstant {
} }
/** /**
* 设置用户项目编号ProjectId
*/
public static String PROJECT_ID;
@Value("${mts.projectId}")
public void setProjectId(String projectId) {
PROJECT_ID = projectId;
}
/**
* 转MP3模板ID * 转MP3模板ID
*/ */
public static String MP3_TEMPLATE_ID; public static String MP3_TEMPLATE_ID;
...@@ -182,7 +192,7 @@ public class AliyunConstant { ...@@ -182,7 +192,7 @@ public class AliyunConstant {
*/ */
public static String MP4_TEMPLATE_ID_BJ; public static String MP4_TEMPLATE_ID_BJ;
@Value("${mp4TemplateId}") @Value("125799")
public void setMp4TemplateIdBj(String mp4TemplateIdBj) { public void setMp4TemplateIdBj(String mp4TemplateIdBj) {
MP4_TEMPLATE_ID_BJ = mp4TemplateIdBj; MP4_TEMPLATE_ID_BJ = mp4TemplateIdBj;
} }
...@@ -190,7 +200,12 @@ public class AliyunConstant { ...@@ -190,7 +200,12 @@ public class AliyunConstant {
/** /**
* OSS存储输入地址 * OSS存储输入地址
*/ */
public static final String INPUT_BUCKET = "whlg-oss-001"; public static String INPUT_BUCKET;
@Value("${input.bucket}")
public void setInputBucket(String imputBucket) {
INPUT_BUCKET = imputBucket;
}
/** /**
* OSS存储输出地址 * OSS存储输出地址
...@@ -220,22 +235,27 @@ public class AliyunConstant { ...@@ -220,22 +235,27 @@ public class AliyunConstant {
/** /**
* 版元存储输出地址 * 版元存储输出地址
*/ */
public static final String BY_BUCKET = "byfile-oss-01"; public static String BY_BUCKET;
@Value("${by.bucket}")
public void setByBucket(String byBucket){
BY_BUCKET = byBucket;
}
/** /**
* 开发存储输出地址 * 开发存储输出地址
*/ */
public static final String DEV_BUCKET = "whlg-oss-dev"; public static final String DEV_BUCKET = "whlg-oss-dev-002";
/** /**
* 测试存储输出地址 * 测试存储输出地址
*/ */
public static final String TEST_BUCKET = "whlg-oss-test"; public static final String TEST_BUCKET = "whlg-oss-test-002";
/** /**
* UAT存储输出地址 * UAT存储输出地址
*/ */
public static final String UAT_BUCKET = "whlg-oss-uat"; public static final String UAT_BUCKET = "whlg-oss-uat-002";
/** /**
* OSS 鉴权KEY(仅限下载用) * OSS 鉴权KEY(仅限下载用)
...@@ -342,11 +362,55 @@ public class AliyunConstant { ...@@ -342,11 +362,55 @@ public class AliyunConstant {
BY_ORIGINAL_URL = byOriginalUrl; BY_ORIGINAL_URL = byOriginalUrl;
} }
/**
* 华为云转码ak
*/
public static String MtsAK;
@Value("${mts.ak}")
public void setMtsAK(String mtsAK) {
MtsAK = mtsAK;
}
/**
* 华为云转码sk
*/
public static String MtsSK;
@Value("${mts.sk}")
public void setMtsSK(String mtsSK) {
MtsSK = mtsSK;
}
/** /**
* 视频水印模板ID-左下角 * 视频水印模板ID-左下角
*/ */
public static final String WATERMARK_BOTTOM_LEFT = "cb8fe5517c5a44c19284cdf130dd223d"; public static final String WATERMARK_BOTTOM_LEFT = "cb8fe5517c5a44c19284cdf130dd223d";
/**
* 华为云Access Key
*/
public static String ACCESS_KEY;
@Value("${huawei.access.key}")
public void setAccessKey(String accessKey) {
ACCESS_KEY = accessKey;
}
/**
* 华为云 Secret Key
*/
public static String SECRET_KEY;
@Value("${huawei.secret.key}")
public static void setSecretKey(String secretKey) {
SECRET_KEY = secretKey;
}
/** /**
* 根据域名获取bucket名称 * 根据域名获取bucket名称
* *
...@@ -357,18 +421,23 @@ public class AliyunConstant { ...@@ -357,18 +421,23 @@ public class AliyunConstant {
if (StringUtil.isEmpty(fileUrl)) { if (StringUtil.isEmpty(fileUrl)) {
return null; return null;
} }
if (fileUrl.contains("transcode")){
return FILE_BUCKET;
}
String domainName = FileUtils.getDomainName(fileUrl); String domainName = FileUtils.getDomainName(fileUrl);
if (domainName == null) { if (StringUtil.isEmpty(domainName)) {
return INPUT_BUCKET; return INPUT_BUCKET;
} }
//不根据域名判断
switch (domainName) { switch (domainName) {
case "file.chubanyun.me": // case "file.chubanyun.me":
return DEV_BUCKET; // return DEV_BUCKET;
case "file.techdc.cn": // case "file.techdc.cn":
case "file.raysgo.com": // case "file.raysgo.com":
return TEST_BUCKET; // case "oss.raysgo.com":
case "file.raysyun.com": // return TEST_BUCKET;
return UAT_BUCKET; // case "file.raysyun.com":
// return UAT_BUCKET;
case "live.chubanyun.me": case "live.chubanyun.me":
return LIVE_BUCKET; return LIVE_BUCKET;
case "rays-adviser.chubanyun.me": case "rays-adviser.chubanyun.me":
...@@ -376,12 +445,12 @@ public class AliyunConstant { ...@@ -376,12 +445,12 @@ public class AliyunConstant {
case "byfile.1wlshu.com": case "byfile.1wlshu.com":
case "byfile.raysgo.com": case "byfile.raysgo.com":
return BY_BUCKET; return BY_BUCKET;
case "file.5rs.me": // case "file.5rs.me":
case "oss.5rs.me": // case "oss.5rs.me":
case "download.5rs.me": // case "download.5rs.me":
return FILE_BUCKET; // return FILE_BUCKET;
default: default:
return INPUT_BUCKET; return FILE_BUCKET;
} }
} }
...@@ -395,11 +464,12 @@ public class AliyunConstant { ...@@ -395,11 +464,12 @@ public class AliyunConstant {
if (StringUtil.isEmpty(bucketName)) { if (StringUtil.isEmpty(bucketName)) {
return null; return null;
} }
if (LIVE_BUCKET.equals(bucketName)) if (LIVE_BUCKET.equals(bucketName)) {
return OSS_REGION_BJ; return OSS_REGION_BJ;
else } else {
return OSS_REGION; return OSS_REGION;
} }
}
/** /**
* 获取媒体转码地域名称 * 获取媒体转码地域名称
...@@ -411,11 +481,12 @@ public class AliyunConstant { ...@@ -411,11 +481,12 @@ public class AliyunConstant {
if (StringUtil.isEmpty(bucketName)) { if (StringUtil.isEmpty(bucketName)) {
return null; return null;
} }
if (LIVE_BUCKET.equals(bucketName)) if (LIVE_BUCKET.equals(bucketName)) {
return MTS_REGION_BJ; return MTS_REGION_BJ;
else } else {
return MTS_REGION; return MTS_REGION;
} }
}
/** /**
* 获取媒体转码EndPoint * 获取媒体转码EndPoint
...@@ -427,11 +498,12 @@ public class AliyunConstant { ...@@ -427,11 +498,12 @@ public class AliyunConstant {
if (StringUtil.isEmpty(bucketName)) { if (StringUtil.isEmpty(bucketName)) {
return null; return null;
} }
if (LIVE_BUCKET.equals(bucketName)) if (LIVE_BUCKET.equals(bucketName)) {
return MTS_ENDPOINT_BJ; return MTS_ENDPOINT_BJ;
else } else {
return MTS_ENDPOINT; return MTS_ENDPOINT;
} }
}
/** /**
* 获取OSS输出bucket * 获取OSS输出bucket
...@@ -443,13 +515,14 @@ public class AliyunConstant { ...@@ -443,13 +515,14 @@ public class AliyunConstant {
if (StringUtil.isEmpty(bucketName)) { if (StringUtil.isEmpty(bucketName)) {
return null; return null;
} }
if (LIVE_BUCKET.equals(bucketName)) if (LIVE_BUCKET.equals(bucketName)) {
return LIVE_BUCKET; return LIVE_BUCKET;
else if (BY_BUCKET.equals(bucketName)) } else if (BY_BUCKET.equals(bucketName)) {
return BY_BUCKET; return BY_BUCKET;
else } else {
return FILE_BUCKET; return FILE_BUCKET;
} }
}
/** /**
* 获取转码管道ID * 获取转码管道ID
...@@ -461,11 +534,12 @@ public class AliyunConstant { ...@@ -461,11 +534,12 @@ public class AliyunConstant {
if (StringUtil.isEmpty(bucketName)) { if (StringUtil.isEmpty(bucketName)) {
return null; return null;
} }
if (LIVE_BUCKET.equals(bucketName)) if (LIVE_BUCKET.equals(bucketName)) {
return PIPELINEID_BJ; return PIPELINEID_BJ;
else } else {
return PIPELINEID; return PIPELINEID;
} }
}
/** /**
* 获取MP3转码模板ID * 获取MP3转码模板ID
...@@ -477,11 +551,12 @@ public class AliyunConstant { ...@@ -477,11 +551,12 @@ public class AliyunConstant {
if (StringUtil.isEmpty(bucketName)) { if (StringUtil.isEmpty(bucketName)) {
return null; return null;
} }
if (LIVE_BUCKET.equals(bucketName)) if (LIVE_BUCKET.equals(bucketName)) {
return MP3_TEMPLATE_ID_BJ; return MP3_TEMPLATE_ID_BJ;
else } else {
return MP3_TEMPLATE_ID; return MP3_TEMPLATE_ID;
} }
}
/** /**
* 获取MP4转码模板ID * 获取MP4转码模板ID
...@@ -493,11 +568,12 @@ public class AliyunConstant { ...@@ -493,11 +568,12 @@ public class AliyunConstant {
if (StringUtil.isEmpty(bucketName)) { if (StringUtil.isEmpty(bucketName)) {
return null; return null;
} }
if (LIVE_BUCKET.equals(bucketName)) if (LIVE_BUCKET.equals(bucketName)) {
return MP4_TEMPLATE_ID_BJ; return MP4_TEMPLATE_ID_BJ;
else } else {
return MP4_TEMPLATE_ID; return MP4_TEMPLATE_ID;
} }
}
/** /**
* 获取视频转码模板ID * 获取视频转码模板ID
...@@ -509,13 +585,14 @@ public class AliyunConstant { ...@@ -509,13 +585,14 @@ public class AliyunConstant {
if (StringUtil.isEmpty(outFileType)) { if (StringUtil.isEmpty(outFileType)) {
return null; return null;
} }
if (LIVE_BUCKET.equals(bucketName)) if (LIVE_BUCKET.equals(bucketName)) {
return MP4_TEMPLATE_ID_BJ; return MP4_TEMPLATE_ID_BJ;
else if ("m3u8".equalsIgnoreCase(outFileType)) } else if ("m3u8".equalsIgnoreCase(outFileType)) {
return M3U8_TEMPLATE_ID; return M3U8_TEMPLATE_ID;
else } else {
return MP4_TEMPLATE_ID; return MP4_TEMPLATE_ID;
} }
}
/** /**
* 获取文件CDN地址 * 获取文件CDN地址
...@@ -527,13 +604,14 @@ public class AliyunConstant { ...@@ -527,13 +604,14 @@ public class AliyunConstant {
if (StringUtil.isEmpty(bucketName)) { if (StringUtil.isEmpty(bucketName)) {
return null; return null;
} }
if (LIVE_BUCKET.equals(bucketName)) if (LIVE_BUCKET.equals(bucketName)) {
return FILE_CDN_URL_LIVE; return FILE_CDN_URL_LIVE;
else if (BY_BUCKET.equals(bucketName)) } else if (BY_BUCKET.equals(bucketName)) {
return FILE_CDN_URL_BY; return FILE_CDN_URL_BY;
else } else {
return FILE_CDN_URL; return FILE_CDN_URL;
} }
}
/** /**
* 获取OSS原始地址 * 获取OSS原始地址
...@@ -545,13 +623,14 @@ public class AliyunConstant { ...@@ -545,13 +623,14 @@ public class AliyunConstant {
if (StringUtil.isEmpty(bucketName)) { if (StringUtil.isEmpty(bucketName)) {
return null; return null;
} }
if (LIVE_BUCKET.equals(bucketName)) if (LIVE_BUCKET.equals(bucketName)) {
return LIVE_ORIGINAL_URL; return LIVE_ORIGINAL_URL;
else if (BY_BUCKET.equals(bucketName)) } else if (BY_BUCKET.equals(bucketName)) {
return BY_ORIGINAL_URL; return BY_ORIGINAL_URL;
else } else {
return FILE_ORIGINAL_URL; return FILE_ORIGINAL_URL;
} }
}
/** /**
* 获取OSS EndPoint地址 * 获取OSS EndPoint地址
...@@ -563,10 +642,11 @@ public class AliyunConstant { ...@@ -563,10 +642,11 @@ public class AliyunConstant {
if (StringUtil.isEmpty(bucketName)) { if (StringUtil.isEmpty(bucketName)) {
return null; return null;
} }
if (LIVE_BUCKET.equals(bucketName)) if (LIVE_BUCKET.equals(bucketName)) {
return OSS_ENDPOINT_BJ; return OSS_ENDPOINT_BJ;
else } else {
return OSS_ENDPOINT; return OSS_ENDPOINT;
} }
}
} }
pcloud-common/src/main/java/com/pcloud/common/utils/aliyun/test/ObsTest.java 0 → 100644
package com.pcloud.common.utils.aliyun.test;
import com.obs.services.model.ObjectMetadata;
import com.pcloud.common.dto.OssMediaInfoDTO;
import com.pcloud.common.entity.UploadResultInfo;
import com.pcloud.common.exceptions.FileException;
import com.pcloud.common.utils.aliyun.OssUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
/**
* @ClassName com.pcloud.auditcenter.hw.utils.test.ObsTest
* @Author 吴博
* @Description 华为云测试类
* @Date 2020/5/24 9:27
* @Version 1.0
**/
@RestController
@RequestMapping("obsTest")
@Slf4j
public class ObsTest {
private static final String textFilePath = "C:\\Users\\Administrator\\Desktop\\sql.txt";
private static final String audioFilePath = "C:\\Users\\Administrator\\Desktop\\123321.mp3";
private static final String imageFilePath = "C:\\Users\\Administrator\\Desktop\\girl.jpg";
private static final String imageFileUrl = "https://oss.raysgo.com/oss/upload/image/jpg/add52c60c88a4989bdf6bdb554b5f928.jpg";
private static final String videoFilePath = "C:\\Users\\Administrator\\Desktop\\e610844f3210d9e249fc8ee0cc6b9a1b_20190815173921219.mp4";
private static final String parentFileUrl = "https://oss.raysgo.com/oss/upload/video/mp4/b2f2df50279d43b4af52ebb760924e08";
private static final String videoUrl = "https://oss.raysgo.com/oss/upload/video/mp4/e297ea15516146acabbbcb8c31fe0f92.mp4";
private static final String ObjectKey = "oss/upload/video/mp4/b2f2df50279d43b4af52ebb760924e08.mp4";
private static final String textUrl = "https://oss.raysgo.com/oss/upload/text/txt/4b19722b10604da282497b80c77860fe.txt";
private static final String outFilePath4Mp3 = "C:\\Users\\Administrator\\Desktop\\localaudio.mp3";
private static final String outFilePath4Mp4 = "C:\\Users\\Administrator\\Desktop\\localVideo.mp4";
private static final String huaweiImage = "C:\\Users\\Administrator\\Desktop\\1588081459(1).png";
private static final String huaweiImageUrl = "https://oss.raysgo.com/oss/upload/image/png/7348e76b4a654fdbbccf3a2adbe0d028.png";
@RequestMapping(value = "uploadFileByte", method = RequestMethod.GET)
public UploadResultInfo uploadFileByte() throws FileException {
String content = "Hello OBS";
byte[] buff = content.getBytes();
String fileName = "";
String fileType = "txt";
UploadResultInfo uploadResultInfo = OssUtils.uploadFileByte(buff, fileName, fileType);
log.info(uploadResultInfo.toString());
return uploadResultInfo;
}
@RequestMapping(value = "uploadLocalFile", method = RequestMethod.GET)
public UploadResultInfo uploadLocalFile() throws FileException {
String content = "Hello OBS";
byte[] buff = content.getBytes();
String fileName = "";
String fileType = "txt";
UploadResultInfo uploadResultInfo = OssUtils.uploadLocalFile(videoFilePath,null);
log.info(uploadResultInfo.toString());
return uploadResultInfo;
}
@RequestMapping(value = "uploadLocalFile4Child", method = RequestMethod.GET)
public UploadResultInfo uploadLocalFile4Child() throws FileException {
String content = "Hello OBS";
byte[] buff = content.getBytes();
String fileName = "";
String fileType = "txt";
UploadResultInfo uploadResultInfo = OssUtils.uploadLocalFile4Child(audioFilePath,parentFileUrl);
log.info(uploadResultInfo.toString());
return uploadResultInfo;
}
@RequestMapping(value = "getMediaInfo", method = RequestMethod.GET)
public OssMediaInfoDTO getMediaInfo() throws FileException {
String content = "Hello OBS";
byte[] buff = content.getBytes();
String fileName = "";
String fileType = "txt";
OssMediaInfoDTO ossMediaInfoDTO = OssUtils.getMediaInfo(videoUrl);
log.info(ossMediaInfoDTO.toString());
return ossMediaInfoDTO;
}
@RequestMapping(value = "getObjectMetadata", method = RequestMethod.GET)
public ObjectMetadata getObjectMetadata() throws FileException {
String content = "Hello OBS";
byte[] buff = content.getBytes();
String fileName = "";
String fileType = "txt";
ObjectMetadata objectMetadata = OssUtils.getObjectMetadata(ObjectKey,"whlg-oss-test-002");
log.info(objectMetadata.toString());
return objectMetadata;
}
@RequestMapping(value = "downloadFile2Byte", method = RequestMethod.GET)
public String downloadFile2Byte() throws FileException {
String content = "Hello OBS";
byte[] buff = content.getBytes();
String fileName = "";
String fileType = "txt";
byte[] bytes = OssUtils.downloadFile2Byte(textUrl);
log.info(new String (bytes));
return new String (bytes);
}
@RequestMapping(value = "downloadFile", method = RequestMethod.GET)
public void downloadFile() throws FileException {
String content = "Hello OBS";
byte[] buff = content.getBytes();
String fileName = "";
String fileType = "txt";
OssUtils.downloadFile(videoUrl,outFilePath4Mp4);
}
@RequestMapping(value = "imageWidthResize", method = RequestMethod.GET)
public void imageWidthResize() throws FileException {
String content = "Hello OBS";
byte[] buff = content.getBytes();
String fileName = "";
String fileType = "txt";
OssUtils.imageWidthResize(imageFileUrl,100);
}
@RequestMapping(value = "imageResize", method = RequestMethod.GET)
public void imageResize() throws FileException {
String content = "Hello OBS";
byte[] buff = content.getBytes();
String fileName = "";
String fileType = "txt";
OssUtils.imageResize(imageFileUrl,50);
}
@RequestMapping(value = "imageAutoOrient", method = RequestMethod.GET)
public void imageAutoOrient() throws FileException {
String content = "Hello OBS";
byte[] buff = content.getBytes();
String fileName = "";
String fileType = "txt";
OssUtils.imageAutoOrient(imageFileUrl,50);
}
@RequestMapping(value = "imageCrop", method = RequestMethod.GET)
public void imageCrop() throws FileException {
String content = "Hello OBS";
byte[] buff = content.getBytes();
String fileName = "";
String fileType = "txt";
OssUtils.imageCrop(imageFileUrl,500,500,0,0);
}
@RequestMapping(value = "imageCropSaveas", method = RequestMethod.GET)
public void imageCropSaveas() throws FileException {
OssUtils.imageCropSaveas(imageFileUrl,500,500,0,0);
}
@RequestMapping(value = "imageWatermark", method = RequestMethod.GET)
public void imageWatermark() throws FileException {
String waterMark = OssUtils.imageWatermark(imageFileUrl,"哈哈哈哈，大笨蛋");
log.info(waterMark);
}
@RequestMapping(value = "imageWatermark4Image", method = RequestMethod.GET)
public void imageWatermark4Image() throws FileException {
String waterMark = OssUtils. imageWatermark4Image(imageFileUrl,huaweiImageUrl);
log.info(waterMark);
}
}
\ No newline at end of file
pom.xml
...@@ -106,6 +106,7 @@ ...@@ -106,6 +106,7 @@
<!-- frameworks --> <!-- frameworks -->
<slf4j.version>1.7.18</slf4j.version> <slf4j.version>1.7.18</slf4j.version>
<mpc-sdk-version>2.0.7</mpc-sdk-version>
</properties> </properties>
<dependencies> <dependencies>
...@@ -306,6 +307,11 @@ ...@@ -306,6 +307,11 @@
<version>2.7.0</version> <version>2.7.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.huaweicloud</groupId>
<artifactId>esdk-obs-java</artifactId>
<version>3.19.7</version>
</dependency>
<dependency>
<groupId>com.aliyun</groupId> <groupId>com.aliyun</groupId>
<artifactId>aliyun-java-sdk-mts</artifactId> <artifactId>aliyun-java-sdk-mts</artifactId>
<version>2.1.7</version> <version>2.1.7</version>
...@@ -319,6 +325,29 @@ ...@@ -319,6 +325,29 @@
<version>1.9.13</version> <version>1.9.13</version>
</dependency> </dependency>
<!-- Jackson End --> <!-- Jackson End -->
<dependency>
<groupId>com.huawei.mpc</groupId>
<artifactId>cloud-java-sdk-mpc</artifactId>
<version>${mpc-sdk-version}</version>
<exclusions>
<exclusion>
<groupId>com.squareup.retrofit2</groupId>
<artifactId>retrofit</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.squareup.retrofit2</groupId>
<artifactId>retrofit</artifactId>
<version>2.5.0</version>
<!--<exclusions>
<exclusion>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
</exclusion>
</exclusions>-->
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment