添加网盘对象存储
This commit is contained in:
@@ -347,6 +347,8 @@ qiniu.bucket_custom2_name temp2
|
|||||||
qiniu.bucket_custom2_domain http://temp2.wildfirechat.cn
|
qiniu.bucket_custom2_domain http://temp2.wildfirechat.cn
|
||||||
qiniu.bucket_custom3_name temp3
|
qiniu.bucket_custom3_name temp3
|
||||||
qiniu.bucket_custom3_domain http://temp3.wildfirechat.cn
|
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,
|
#Media_Type_GENERAL = 0,
|
||||||
|
|||||||
@@ -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_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_NAME= "qiniu.bucket_custom3_name";
|
||||||
public static final String QINIU_BUCKET_CUSTOM3_DOMAIN = "qiniu.bucket_custom3_domain";
|
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";
|
public static final String FILE_STORAGE_ROOT = "local.media.storage.root";
|
||||||
|
|||||||
@@ -83,6 +83,10 @@ public class GetMediaUploadTokenHandler extends IMHandler<WFCMessage.GetUploadTo
|
|||||||
bucketName = MediaServerConfig.QINIU_BUCKET_CUSTOM3_NAME;
|
bucketName = MediaServerConfig.QINIU_BUCKET_CUSTOM3_NAME;
|
||||||
bucketDomain = MediaServerConfig.QINIU_BUCKET_CUSTOM3_DOMAIN;
|
bucketDomain = MediaServerConfig.QINIU_BUCKET_CUSTOM3_DOMAIN;
|
||||||
break;
|
break;
|
||||||
|
case 12:
|
||||||
|
bucketName = MediaServerConfig.QINIU_BUCKET_PAN_NAME;
|
||||||
|
bucketDomain = MediaServerConfig.QINIU_BUCKET_PAN_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;
|
||||||
|
|||||||
@@ -89,6 +89,10 @@ public class GetQiniuUploadTokenHandler extends IMHandler<Byte> {
|
|||||||
bucketName = MediaServerConfig.QINIU_BUCKET_CUSTOM3_NAME;
|
bucketName = MediaServerConfig.QINIU_BUCKET_CUSTOM3_NAME;
|
||||||
bucketDomain = MediaServerConfig.QINIU_BUCKET_CUSTOM3_DOMAIN;
|
bucketDomain = MediaServerConfig.QINIU_BUCKET_CUSTOM3_DOMAIN;
|
||||||
break;
|
break;
|
||||||
|
case 12:
|
||||||
|
bucketName = MediaServerConfig.QINIU_BUCKET_PAN_NAME;
|
||||||
|
bucketDomain = MediaServerConfig.QINIU_BUCKET_PAN_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;
|
||||||
|
|||||||
@@ -340,6 +340,9 @@ public class Server {
|
|||||||
MediaServerConfig.QINIU_BUCKET_CUSTOM3_NAME = config.getProperty(BrokerConstants.QINIU_BUCKET_CUSTOM3_NAME);
|
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_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.SERVER_IP = getServerIp(config);
|
||||||
|
|
||||||
MediaServerConfig.HTTP_SERVER_PORT = Integer.parseInt(config.getProperty(BrokerConstants.HTTP_SERVER_PORT));
|
MediaServerConfig.HTTP_SERVER_PORT = Integer.parseInt(config.getProperty(BrokerConstants.HTTP_SERVER_PORT));
|
||||||
|
|||||||
@@ -29,6 +29,8 @@ public class MediaServerConfig {
|
|||||||
public static String QINIU_BUCKET_CUSTOM2_DOMAIN;
|
public static String QINIU_BUCKET_CUSTOM2_DOMAIN;
|
||||||
public static String QINIU_BUCKET_CUSTOM3_NAME;
|
public static String QINIU_BUCKET_CUSTOM3_NAME;
|
||||||
public static String QINIU_BUCKET_CUSTOM3_DOMAIN;
|
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";
|
public static String SERVER_IP = "localhost";
|
||||||
|
|||||||
@@ -347,6 +347,9 @@ qiniu.bucket_custom2_name temp2
|
|||||||
qiniu.bucket_custom2_domain http://temp2.wildfirechat.cn
|
qiniu.bucket_custom2_domain http://temp2.wildfirechat.cn
|
||||||
qiniu.bucket_custom3_name temp3
|
qiniu.bucket_custom3_name temp3
|
||||||
qiniu.bucket_custom3_domain http://temp3.wildfirechat.cn
|
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,
|
#Media_Type_GENERAL = 0,
|
||||||
|
|||||||
Reference in New Issue
Block a user