From 7d36775c279110d6d7c1c8a8cc20a808dfa6edb4 Mon Sep 17 00:00:00 2001 From: heavyrian2012 Date: Thu, 25 Dec 2025 16:02:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=A2=E6=88=B7=E9=A2=84?= =?UTF-8?q?=E7=95=99=E5=AF=B9=E8=B1=A1=E5=AD=98=E5=82=A8=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- broker/config/wildfirechat.conf | 7 +++++++ .../src/main/java/io/moquette/BrokerConstants.java | 7 +++++++ .../imhandler/GetMediaUploadTokenHandler.java | 13 ++++++++++++- .../imhandler/GetQiniuUploadTokenHandler.java | 12 ++++++++++++ broker/src/main/java/io/moquette/server/Server.java | 8 ++++++++ .../moquette/server/config/MediaServerConfig.java | 9 ++++++++- distribution/src/main/resources/wildfirechat.conf | 7 +++++++ 7 files changed, 61 insertions(+), 2 deletions(-) diff --git a/broker/config/wildfirechat.conf b/broker/config/wildfirechat.conf index 551d8b0e..a4241110 100755 --- a/broker/config/wildfirechat.conf +++ b/broker/config/wildfirechat.conf @@ -334,6 +334,13 @@ qiniu.bucket_portrait_name storage qiniu.bucket_portrait_domain http://cdn2.wildfirechat.cn qiniu.bucket_favorite_name storage qiniu.bucket_favorite_domain http://cdn2.wildfirechat.cn +## custom的桶是给客户预留的，客户可以上传自己的文件到这3个桶中，野火不会用到这几个桶。如果不需要，可以忽略这几个配置 +qiniu.bucket_custom1_name temp1 +qiniu.bucket_custom1_domain http://temp1.wildfirechat.cn +qiniu.bucket_custom2_name temp2 +qiniu.bucket_custom2_domain http://temp2.wildfirechat.cn +qiniu.bucket_custom3_name temp3 +qiniu.bucket_custom3_domain http://temp3.wildfirechat.cn ##媒体类型分类 #Media_Type_GENERAL = 0, diff --git a/broker/src/main/java/io/moquette/BrokerConstants.java b/broker/src/main/java/io/moquette/BrokerConstants.java index 4ab1f41a..97afb24c 100755 --- a/broker/src/main/java/io/moquette/BrokerConstants.java +++ b/broker/src/main/java/io/moquette/BrokerConstants.java @@ -82,6 +82,13 @@ public final class BrokerConstants { public static final String QINIU_BUCKET_PORTRAIT_DOMAIN = "qiniu.bucket_portrait_domain"; public static final String QINIU_BUCKET_FAVORITE_NAME= "qiniu.bucket_favorite_name"; public static final String QINIU_BUCKET_FAVORITE_DOMAIN = "qiniu.bucket_favorite_domain"; + public static final String QINIU_BUCKET_CUSTOM1_NAME= "qiniu.bucket_custom1_name"; + public static final String QINIU_BUCKET_CUSTOM1_DOMAIN = "qiniu.bucket_custom1_domain"; + public static final String QINIU_BUCKET_CUSTOM2_NAME= "qiniu.bucket_custom2_name"; + public static final String QINIU_BUCKET_CUSTOM2_DOMAIN = "qiniu.bucket_custom2_domain"; + public static final String QINIU_BUCKET_CUSTOM3_NAME= "qiniu.bucket_custom3_name"; + public static final String QINIU_BUCKET_CUSTOM3_DOMAIN = "qiniu.bucket_custom3_domain"; + public static final String FILE_STORAGE_ROOT = "local.media.storage.root"; public static final String FILE_STORAGE_REMOTE_SERVER_URL = "local.media.storage.remote_server_url"; diff --git a/broker/src/main/java/io/moquette/imhandler/GetMediaUploadTokenHandler.java b/broker/src/main/java/io/moquette/imhandler/GetMediaUploadTokenHandler.java index 3cea6be9..ab0314fc 100644 --- a/broker/src/main/java/io/moquette/imhandler/GetMediaUploadTokenHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/GetMediaUploadTokenHandler.java @@ -32,7 +32,6 @@ public class GetMediaUploadTokenHandler extends IMHandler { bucketName = MediaServerConfig.QINIU_BUCKET_MOMENTS_NAME; bucketDomain = MediaServerConfig.QINIU_BUCKET_MOMENTS_DOMAIN; break; + case 9: + bucketName = MediaServerConfig.QINIU_BUCKET_CUSTOM1_NAME; + bucketDomain = MediaServerConfig.QINIU_BUCKET_CUSTOM1_DOMAIN; + break; + case 10: + bucketName = MediaServerConfig.QINIU_BUCKET_CUSTOM2_NAME; + bucketDomain = MediaServerConfig.QINIU_BUCKET_CUSTOM2_DOMAIN; + break; + case 11: + bucketName = MediaServerConfig.QINIU_BUCKET_CUSTOM3_NAME; + bucketDomain = MediaServerConfig.QINIU_BUCKET_CUSTOM3_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 c6fe3037..3bc1f5b4 100755 --- a/broker/src/main/java/io/moquette/server/Server.java +++ b/broker/src/main/java/io/moquette/server/Server.java @@ -331,6 +331,14 @@ public class Server { MediaServerConfig.QINIU_BUCKET_FAVORITE_NAME = config.getProperty(BrokerConstants.QINIU_BUCKET_FAVORITE_NAME); MediaServerConfig.QINIU_BUCKET_FAVORITE_DOMAIN = config.getProperty(BrokerConstants.QINIU_BUCKET_FAVORITE_DOMAIN); + MediaServerConfig.QINIU_BUCKET_CUSTOM1_NAME = config.getProperty(BrokerConstants.QINIU_BUCKET_CUSTOM1_NAME); + MediaServerConfig.QINIU_BUCKET_CUSTOM1_DOMAIN = config.getProperty(BrokerConstants.QINIU_BUCKET_CUSTOM1_DOMAIN); + + MediaServerConfig.QINIU_BUCKET_CUSTOM2_NAME = config.getProperty(BrokerConstants.QINIU_BUCKET_CUSTOM2_NAME); + MediaServerConfig.QINIU_BUCKET_CUSTOM2_DOMAIN = config.getProperty(BrokerConstants.QINIU_BUCKET_CUSTOM2_DOMAIN); + + MediaServerConfig.QINIU_BUCKET_CUSTOM3_NAME = config.getProperty(BrokerConstants.QINIU_BUCKET_CUSTOM3_NAME); + MediaServerConfig.QINIU_BUCKET_CUSTOM3_DOMAIN = config.getProperty(BrokerConstants.QINIU_BUCKET_CUSTOM3_DOMAIN); MediaServerConfig.SERVER_IP = getServerIp(config); 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 7bde5721..5c138723 100755 --- a/broker/src/main/java/io/moquette/server/config/MediaServerConfig.java +++ b/broker/src/main/java/io/moquette/server/config/MediaServerConfig.java @@ -23,7 +23,14 @@ public class MediaServerConfig { public static String QINIU_BUCKET_PORTRAIT_DOMAIN; public static String QINIU_BUCKET_FAVORITE_NAME; public static String QINIU_BUCKET_FAVORITE_DOMAIN; - + public static String QINIU_BUCKET_CUSTOM1_NAME; + public static String QINIU_BUCKET_CUSTOM1_DOMAIN; + public static String QINIU_BUCKET_CUSTOM2_NAME; + public static String QINIU_BUCKET_CUSTOM2_DOMAIN; + public static String QINIU_BUCKET_CUSTOM3_NAME; + public static String QINIU_BUCKET_CUSTOM3_DOMAIN; + + public static String SERVER_IP = "localhost"; public static int HTTP_SERVER_PORT = 8080; public static String FILE_STROAGE_ROOT = "fs"; diff --git a/distribution/src/main/resources/wildfirechat.conf b/distribution/src/main/resources/wildfirechat.conf index 4cc0e59a..dcfc9e31 100755 --- a/distribution/src/main/resources/wildfirechat.conf +++ b/distribution/src/main/resources/wildfirechat.conf @@ -334,6 +334,13 @@ qiniu.bucket_portrait_name storage qiniu.bucket_portrait_domain http://cdn2.wildfirechat.cn qiniu.bucket_favorite_name storage qiniu.bucket_favorite_domain http://cdn2.wildfirechat.cn +## custom的桶是给客户预留的，客户可以上传自己的文件到这3个桶中，野火不会用到这几个桶。如果不需要，可以忽略这几个配置 +qiniu.bucket_custom1_name temp1 +qiniu.bucket_custom1_domain http://temp1.wildfirechat.cn +qiniu.bucket_custom2_name temp2 +qiniu.bucket_custom2_domain http://temp2.wildfirechat.cn +qiniu.bucket_custom3_name temp3 +qiniu.bucket_custom3_domain http://temp3.wildfirechat.cn ##媒体类型分类 #Media_Type_GENERAL = 0,