anna/IM-server-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加客户预留对象存储文件类型

Browse Source
This commit is contained in:
heavyrian2012
2025-12-25 16:02:38 +08:00
parent 6c9df5c071
commit 7d36775c27
7 changed files with 61 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/config/wildfirechat.conf
+7
View File
@@ -334,6 +334,13 @@ qiniu.bucket_portrait_name storage
qiniu.bucket_portrait_domain http://cdn2.wildfirechat.cn qiniu.bucket_portrait_domain http://cdn2.wildfirechat.cn
qiniu.bucket_favorite_name storage qiniu.bucket_favorite_name storage
qiniu.bucket_favorite_domain http://cdn2.wildfirechat.cn 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, #Media_Type_GENERAL = 0,
broker/src/main/java/io/moquette/BrokerConstants.java
+7
View File
@@ -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_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_NAME= "qiniu.bucket_favorite_name";
public static final String QINIU_BUCKET_FAVORITE_DOMAIN = "qiniu.bucket_favorite_domain"; 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_ROOT = "local.media.storage.root";
public static final String FILE_STORAGE_REMOTE_SERVER_URL = "local.media.storage.remote_server_url"; public static final String FILE_STORAGE_REMOTE_SERVER_URL = "local.media.storage.remote_server_url";
broker/src/main/java/io/moquette/imhandler/GetMediaUploadTokenHandler.java
+12 -1
View File
@@ -32,7 +32,6 @@ public class GetMediaUploadTokenHandler extends IMHandler<WFCMessage.GetUploadTo
if (MediaServerConfig.USER_QINIU) { if (MediaServerConfig.USER_QINIU) {
Auth auth = Auth.create(MediaServerConfig.QINIU_ACCESS_KEY, MediaServerConfig.QINIU_SECRET_KEY); Auth auth = Auth.create(MediaServerConfig.QINIU_ACCESS_KEY, MediaServerConfig.QINIU_SECRET_KEY);
String bucketName; String bucketName;
String bucketDomain; String bucketDomain;
switch (type) { switch (type) {
@@ -72,6 +71,18 @@ public class GetMediaUploadTokenHandler extends IMHandler<WFCMessage.GetUploadTo
bucketName = MediaServerConfig.QINIU_BUCKET_MOMENTS_NAME; bucketName = MediaServerConfig.QINIU_BUCKET_MOMENTS_NAME;
bucketDomain = MediaServerConfig.QINIU_BUCKET_MOMENTS_DOMAIN; bucketDomain = MediaServerConfig.QINIU_BUCKET_MOMENTS_DOMAIN;
break; 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: default:
bucketName = MediaServerConfig.QINIU_BUCKET_GENERAL_NAME; bucketName = MediaServerConfig.QINIU_BUCKET_GENERAL_NAME;
bucketDomain = MediaServerConfig.QINIU_BUCKET_GENERAL_DOMAIN; bucketDomain = MediaServerConfig.QINIU_BUCKET_GENERAL_DOMAIN;
broker/src/main/java/io/moquette/imhandler/GetQiniuUploadTokenHandler.java
+12
View File
@@ -77,6 +77,18 @@ public class GetQiniuUploadTokenHandler extends IMHandler<Byte> {
bucketName = MediaServerConfig.QINIU_BUCKET_MOMENTS_NAME; bucketName = MediaServerConfig.QINIU_BUCKET_MOMENTS_NAME;
bucketDomain = MediaServerConfig.QINIU_BUCKET_MOMENTS_DOMAIN; bucketDomain = MediaServerConfig.QINIU_BUCKET_MOMENTS_DOMAIN;
break; 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: default:
bucketName = MediaServerConfig.QINIU_BUCKET_GENERAL_NAME; bucketName = MediaServerConfig.QINIU_BUCKET_GENERAL_NAME;
bucketDomain = MediaServerConfig.QINIU_BUCKET_GENERAL_DOMAIN; bucketDomain = MediaServerConfig.QINIU_BUCKET_GENERAL_DOMAIN;
broker/src/main/java/io/moquette/server/Server.java
+8
View File
@@ -331,6 +331,14 @@ public class Server {
MediaServerConfig.QINIU_BUCKET_FAVORITE_NAME = config.getProperty(BrokerConstants.QINIU_BUCKET_FAVORITE_NAME); 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_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); MediaServerConfig.SERVER_IP = getServerIp(config);
broker/src/main/java/io/moquette/server/config/MediaServerConfig.java
+8 -1
View File
@@ -23,7 +23,14 @@ public class MediaServerConfig {
public static String QINIU_BUCKET_PORTRAIT_DOMAIN; public static String QINIU_BUCKET_PORTRAIT_DOMAIN;
public static String QINIU_BUCKET_FAVORITE_NAME; public static String QINIU_BUCKET_FAVORITE_NAME;
public static String QINIU_BUCKET_FAVORITE_DOMAIN; 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 String SERVER_IP = "localhost";
public static int HTTP_SERVER_PORT = 8080; public static int HTTP_SERVER_PORT = 8080;
public static String FILE_STROAGE_ROOT = "fs"; public static String FILE_STROAGE_ROOT = "fs";
distribution/src/main/resources/wildfirechat.conf
+7
View File
@@ -334,6 +334,13 @@ qiniu.bucket_portrait_name storage
qiniu.bucket_portrait_domain http://cdn2.wildfirechat.cn qiniu.bucket_portrait_domain http://cdn2.wildfirechat.cn
qiniu.bucket_favorite_name storage qiniu.bucket_favorite_name storage
qiniu.bucket_favorite_domain http://cdn2.wildfirechat.cn 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, #Media_Type_GENERAL = 0,