From 4d07757b8365f2f6a7d21225c26fb5e5d0a5b778 Mon Sep 17 00:00:00 2001 From: imhao183 Date: Tue, 14 Apr 2020 15:54:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0sticker/moments=E7=9A=84bucke?= =?UTF-8?q?t=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- broker/config/wildfirechat.conf | 4 ++++ broker/src/main/java/io/moquette/BrokerConstants.java | 4 ++++ .../io/moquette/imhandler/GetMediaUploadTokenHandler.java | 8 ++++++++ .../io/moquette/imhandler/GetQiniuUploadTokenHandler.java | 8 ++++++++ broker/src/main/java/io/moquette/server/Server.java | 6 ++++++ .../java/io/moquette/server/config/MediaServerConfig.java | 4 ++++ distribution/src/main/resources/wildfirechat.conf | 4 ++++ 7 files changed, 38 insertions(+) diff --git a/broker/config/wildfirechat.conf b/broker/config/wildfirechat.conf index 87c2e329..9329b3ea 100755 --- a/broker/config/wildfirechat.conf +++ b/broker/config/wildfirechat.conf @@ -129,6 +129,10 @@ qiniu.bucket_video_name media qiniu.bucket_video_domain http://pghnpyzos.bkt.clouddn.com qiniu.bucket_file_name media qiniu.bucket_file_domain http://pghnpyzos.bkt.clouddn.com +qiniu.bucket_sticker_name media +qiniu.bucket_sticker_domain http://pghnpyzos.bkt.clouddn.com +qiniu.bucket_moments_name media +qiniu.bucket_moments_domain http://pghnpyzos.bkt.clouddn.com qiniu.bucket_portrait_name storage qiniu.bucket_portrait_domain http://cdn2.wildfirechat.cn qiniu.bucket_favorite_name storage diff --git a/broker/src/main/java/io/moquette/BrokerConstants.java b/broker/src/main/java/io/moquette/BrokerConstants.java index b72fed83..4fa39ad2 100755 --- a/broker/src/main/java/io/moquette/BrokerConstants.java +++ b/broker/src/main/java/io/moquette/BrokerConstants.java @@ -77,6 +77,10 @@ public final class BrokerConstants { public static final String QINIU_BUCKET_VIDEO_DOMAIN = "qiniu.bucket_video_domain"; public static final String QINIU_BUCKET_FILE_NAME= "qiniu.bucket_file_name"; public static final String QINIU_BUCKET_FILE_DOMAIN = "qiniu.bucket_file_domain"; + public static final String QINIU_BUCKET_STICKER_NAME= "qiniu.bucket_sticker_name"; + public static final String QINIU_BUCKET_STICKER_DOMAIN = "qiniu.bucket_sticker_domain"; + public static final String QINIU_BUCKET_MOMENTS_NAME= "qiniu.bucket_moments_name"; + public static final String QINIU_BUCKET_MOMENTS_DOMAIN = "qiniu.bucket_moments_domain"; public static final String QINIU_BUCKET_PORTRAIT_NAME= "qiniu.bucket_portrait_name"; public static final String QINIU_BUCKET_PORTRAIT_DOMAIN = "qiniu.bucket_portrait_domain"; public static final String QINIU_BUCKET_FAVORITE_NAME= "qiniu.bucket_favorite_name"; diff --git a/broker/src/main/java/io/moquette/imhandler/GetMediaUploadTokenHandler.java b/broker/src/main/java/io/moquette/imhandler/GetMediaUploadTokenHandler.java index 7c23689c..513b581d 100644 --- a/broker/src/main/java/io/moquette/imhandler/GetMediaUploadTokenHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/GetMediaUploadTokenHandler.java @@ -60,6 +60,14 @@ public class GetMediaUploadTokenHandler extends IMHandler { bucketName = MediaServerConfig.QINIU_BUCKET_FAVORITE_NAME; bucketDomain = MediaServerConfig.QINIU_BUCKET_FAVORITE_DOMAIN; break; + case 7: + bucketName = MediaServerConfig.QINIU_BUCKET_STICKER_NAME; + bucketDomain = MediaServerConfig.QINIU_BUCKET_STICKER_DOMAIN; + break; + case 8: + bucketName = MediaServerConfig.QINIU_BUCKET_MOMENTS_NAME; + bucketDomain = MediaServerConfig.QINIU_BUCKET_MOMENTS_DOMAIN; + break; default: bucketName = MediaServerConfig.QINIU_BUCKET_GENERAL_NAME; bucketDomain = MediaServerConfig.QINIU_BUCKET_GENERAL_DOMAIN; diff --git a/broker/src/main/java/io/moquette/server/Server.java b/broker/src/main/java/io/moquette/server/Server.java index dcc85977..63f83e12 100755 --- a/broker/src/main/java/io/moquette/server/Server.java +++ b/broker/src/main/java/io/moquette/server/Server.java @@ -319,6 +319,12 @@ public class Server { MediaServerConfig.QINIU_BUCKET_FILE_NAME = config.getProperty(BrokerConstants.QINIU_BUCKET_FILE_NAME); MediaServerConfig.QINIU_BUCKET_FILE_DOMAIN = config.getProperty(BrokerConstants.QINIU_BUCKET_FILE_DOMAIN); + MediaServerConfig.QINIU_BUCKET_STICKER_NAME = config.getProperty(BrokerConstants.QINIU_BUCKET_STICKER_NAME); + MediaServerConfig.QINIU_BUCKET_STICKER_DOMAIN = config.getProperty(BrokerConstants.QINIU_BUCKET_STICKER_DOMAIN); + + MediaServerConfig.QINIU_BUCKET_MOMENTS_NAME = config.getProperty(BrokerConstants.QINIU_BUCKET_MOMENTS_NAME); + MediaServerConfig.QINIU_BUCKET_MOMENTS_DOMAIN = config.getProperty(BrokerConstants.QINIU_BUCKET_MOMENTS_DOMAIN); + MediaServerConfig.QINIU_BUCKET_PORTRAIT_NAME = config.getProperty(BrokerConstants.QINIU_BUCKET_PORTRAIT_NAME); MediaServerConfig.QINIU_BUCKET_PORTRAIT_DOMAIN = config.getProperty(BrokerConstants.QINIU_BUCKET_PORTRAIT_DOMAIN); diff --git a/broker/src/main/java/io/moquette/server/config/MediaServerConfig.java b/broker/src/main/java/io/moquette/server/config/MediaServerConfig.java index 0ba1b7b3..fd32a60d 100755 --- a/broker/src/main/java/io/moquette/server/config/MediaServerConfig.java +++ b/broker/src/main/java/io/moquette/server/config/MediaServerConfig.java @@ -15,6 +15,10 @@ public class MediaServerConfig { public static String QINIU_BUCKET_VIDEO_DOMAIN; public static String QINIU_BUCKET_FILE_NAME; public static String QINIU_BUCKET_FILE_DOMAIN; + public static String QINIU_BUCKET_STICKER_NAME; + public static String QINIU_BUCKET_STICKER_DOMAIN; + public static String QINIU_BUCKET_MOMENTS_NAME; + public static String QINIU_BUCKET_MOMENTS_DOMAIN; public static String QINIU_BUCKET_PORTRAIT_NAME; public static String QINIU_BUCKET_PORTRAIT_DOMAIN; public static String QINIU_BUCKET_FAVORITE_NAME; diff --git a/distribution/src/main/resources/wildfirechat.conf b/distribution/src/main/resources/wildfirechat.conf index bc24541c..2aef57e9 100755 --- a/distribution/src/main/resources/wildfirechat.conf +++ b/distribution/src/main/resources/wildfirechat.conf @@ -122,6 +122,10 @@ qiniu.bucket_video_name media qiniu.bucket_video_domain http://cdn.wildfirechat.cn qiniu.bucket_file_name media qiniu.bucket_file_domain http://cdn.wildfirechat.cn +qiniu.bucket_sticker_name media +qiniu.bucket_sticker_domain http://cdn.wildfirechat.cn +qiniu.bucket_moments_name media +qiniu.bucket_moments_domain http://cdn.wildfirechat.cn qiniu.bucket_portrait_name storage qiniu.bucket_portrait_domain http://cdn2.wildfirechat.cn qiniu.bucket_favorite_name storage