|
@@ -45,15 +45,17 @@ public class OssFactory {
|
|
|
throw new OssException("系统异常, '" + configKey + "'配置信息不存在!");
|
|
|
}
|
|
|
OssProperties properties = JsonUtils.parseObject(json, OssProperties.class);
|
|
|
- OssClient client = CLIENT_CACHE.get(configKey);
|
|
|
+ // 使用租户标识避免多个租户相同key实例覆盖
|
|
|
+ String key = properties.getTenantId() + ":" + configKey;
|
|
|
+ OssClient client = CLIENT_CACHE.get(key);
|
|
|
if (client == null) {
|
|
|
- CLIENT_CACHE.put(configKey, new OssClient(configKey, properties));
|
|
|
+ CLIENT_CACHE.put(key, new OssClient(configKey, properties));
|
|
|
log.info("创建OSS实例 key => {}", configKey);
|
|
|
return CLIENT_CACHE.get(configKey);
|
|
|
}
|
|
|
// 配置不相同则重新构建
|
|
|
if (!client.checkPropertiesSame(properties)) {
|
|
|
- CLIENT_CACHE.put(configKey, new OssClient(configKey, properties));
|
|
|
+ CLIENT_CACHE.put(key, new OssClient(configKey, properties));
|
|
|
log.info("重载OSS实例 key => {}", configKey);
|
|
|
return CLIENT_CACHE.get(configKey);
|
|
|
}
|