diff --git a/ai-root-cloud-statistics/src/main/java/com/qniao/rootcloudstatistics/constant/ConfigConstant.java b/ai-root-cloud-statistics/src/main/java/com/qniao/rootcloudstatistics/constant/ConfigConstant.java index 8e41759..69c386b 100644 --- a/ai-root-cloud-statistics/src/main/java/com/qniao/rootcloudstatistics/constant/ConfigConstant.java +++ b/ai-root-cloud-statistics/src/main/java/com/qniao/rootcloudstatistics/constant/ConfigConstant.java @@ -18,4 +18,7 @@ public interface ConfigConstant { String SINK_RABBITMQ_PASSWORD = "sink.rabbitmq.password"; String SINK_RABBITMQ_AI_WARNING_ROUTING_KEY = "sink.rabbitmq.aiWarning.routingKey"; String SINK_RABBITMQ_EXCHANGE = "sink.rabbitmq.exchange"; + + + String OSS_BUCKET_NAME = "oss.bucket.name"; } diff --git a/ai-root-cloud-statistics/src/main/java/com/qniao/rootcloudstatistics/until/OSSUtils.java b/ai-root-cloud-statistics/src/main/java/com/qniao/rootcloudstatistics/until/OSSUtils.java index 96f1541..31f21ed 100644 --- a/ai-root-cloud-statistics/src/main/java/com/qniao/rootcloudstatistics/until/OSSUtils.java +++ b/ai-root-cloud-statistics/src/main/java/com/qniao/rootcloudstatistics/until/OSSUtils.java @@ -2,9 +2,8 @@ package com.qniao.rootcloudstatistics.until; import com.aliyun.oss.OSS; import com.aliyun.oss.OSSClient; -import com.ctrip.framework.apollo.build.ApolloInjector; -import com.ctrip.framework.apollo.core.enums.Env; -import com.ctrip.framework.apollo.util.ConfigUtil; +import com.qniao.rootcloudstatistics.config.ApolloConfig; +import com.qniao.rootcloudstatistics.constant.ConfigConstant; import java.io.IOException; import java.io.InputStream; @@ -42,12 +41,8 @@ public class OSSUtils { String[] list = url.split("\\."); String type = list[list.length - 1]; - Env apolloEnv = ApolloInjector.getInstance(ConfigUtil.class).getApolloEnv(); - String bucketName = "qncloudprintfiletest"; - if (Env.PRO.equals(apolloEnv)) { - bucketName = "qncloudprintfile"; - } String folderName = "cloudprint"; + String bucketName = ApolloConfig.get(ConfigConstant.OSS_BUCKET_NAME); String objectName = folderName + "/" + UUID.randomUUID() + "." + type; OSS ossClient = new OSSClient(endpoint, accessKeyId, accessKeySecret); // 填写网络流地址。 diff --git a/ai-root-cloud-statistics/src/main/resources/META-INF/app.properties b/ai-root-cloud-statistics/src/main/resources/META-INF/app.properties index 124ee06..46857e4 100644 --- a/ai-root-cloud-statistics/src/main/resources/META-INF/app.properties +++ b/ai-root-cloud-statistics/src/main/resources/META-INF/app.properties @@ -2,4 +2,5 @@ app.id=ai-root-cloud-warning-formatter # ???? 8.135.8.221 # ???? 47.112.164.224 -apollo.meta=http://47.112.164.224:5000 \ No newline at end of file +apollo.meta=http://47.112.164.224:5000 +#apollo.meta=http://localhost:8080 \ No newline at end of file