From 33de0f3e43beebf51b61372b2bdf7702918ffc57 Mon Sep 17 00:00:00 2001 From: heavyrian2012 Date: Thu, 26 Feb 2026 14:20:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BD=91=E7=9B=98=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1=E5=AD=98=E5=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- broker/config/wildfirechat.conf | 2 ++ broker/src/main/java/io/moquette/BrokerConstants.java | 2 ++ .../io/moquette/imhandler/GetMediaUploadTokenHandler.java | 4 ++++ .../io/moquette/imhandler/GetQiniuUploadTokenHandler.java | 4 ++++ broker/src/main/java/io/moquette/server/Server.java | 3 +++ .../java/io/moquette/server/config/MediaServerConfig.java | 2 ++ distribution/src/main/resources/wildfirechat.conf | 3 +++ 7 files changed, 20 insertions(+) diff --git a/broker/config/wildfirechat.conf b/broker/config/wildfirechat.conf index 8c56aa3e..3fd51ef1 100755 --- a/broker/config/wildfirechat.conf +++ b/broker/config/wildfirechat.conf @@ -347,6 +347,8 @@ 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 +qiniu.bucket_pan_name pan +qiniu.bucket_pan_domain http://pan.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 a3435759..7ea6ac5f 100755 --- a/broker/src/main/java/io/moquette/BrokerConstants.java +++ b/broker/src/main/java/io/moquette/BrokerConstants.java @@ -88,6 +88,8 @@ public final class BrokerConstants { 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 QINIU_BUCKET_PAN_NAME= "qiniu.bucket_pan_name"; + public static final String QINIU_BUCKET_PAN_DOMAIN = "qiniu.bucket_pan_domain"; public static final String FILE_STORAGE_ROOT = "local.media.storage.root"; diff --git a/broker/src/main/java/io/moquette/imhandler/GetMediaUploadTokenHandler.java b/broker/src/main/java/io/moquette/imhandler/GetMediaUploadTokenHandler.java index ab0314fc..2d78bd8c 100644 --- a/broker/src/main/java/io/moquette/imhandler/GetMediaUploadTokenHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/GetMediaUploadTokenHandler.java @@ -83,6 +83,10 @@ public class GetMediaUploadTokenHandler extends IMHandler { bucketName = MediaServerConfig.QINIU_BUCKET_CUSTOM3_NAME; bucketDomain = MediaServerConfig.QINIU_BUCKET_CUSTOM3_DOMAIN; break; + case 12: + bucketName = MediaServerConfig.QINIU_BUCKET_PAN_NAME; + bucketDomain = MediaServerConfig.QINIU_BUCKET_PAN_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 3bc1f5b4..93c6747f 100755 --- a/broker/src/main/java/io/moquette/server/Server.java +++ b/broker/src/main/java/io/moquette/server/Server.java @@ -340,6 +340,9 @@ public class Server { 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.QINIU_BUCKET_PAN_NAME = config.getProperty(BrokerConstants.QINIU_BUCKET_PAN_NAME); + MediaServerConfig.QINIU_BUCKET_PAN_DOMAIN = config.getProperty(BrokerConstants.QINIU_BUCKET_PAN_DOMAIN); + MediaServerConfig.SERVER_IP = getServerIp(config); MediaServerConfig.HTTP_SERVER_PORT = Integer.parseInt(config.getProperty(BrokerConstants.HTTP_SERVER_PORT)); 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 5c138723..8b884a1b 100755 --- a/broker/src/main/java/io/moquette/server/config/MediaServerConfig.java +++ b/broker/src/main/java/io/moquette/server/config/MediaServerConfig.java @@ -29,6 +29,8 @@ public class MediaServerConfig { public static String QINIU_BUCKET_CUSTOM2_DOMAIN; public static String QINIU_BUCKET_CUSTOM3_NAME; public static String QINIU_BUCKET_CUSTOM3_DOMAIN; + public static String QINIU_BUCKET_PAN_NAME; + public static String QINIU_BUCKET_PAN_DOMAIN; public static String SERVER_IP = "localhost"; diff --git a/distribution/src/main/resources/wildfirechat.conf b/distribution/src/main/resources/wildfirechat.conf index 95c00c93..7374f8e1 100755 --- a/distribution/src/main/resources/wildfirechat.conf +++ b/distribution/src/main/resources/wildfirechat.conf @@ -347,6 +347,9 @@ 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 +## 如果配置网盘服务，需要配置这个 +qiniu.bucket_pan_name pan +qiniu.bucket_pan_domain http://pan.wildfirechat.cn ##媒体类型分类 #Media_Type_GENERAL = 0,