|
@@ -9,6 +9,8 @@ import com.ym.mec.common.dal.BaseDAO;
|
|
import com.ym.mec.common.redis.service.RedisCache;
|
|
import com.ym.mec.common.redis.service.RedisCache;
|
|
import com.ym.mec.common.service.impl.BaseServiceImpl;
|
|
import com.ym.mec.common.service.impl.BaseServiceImpl;
|
|
import com.ym.mec.util.collection.MapUtil;
|
|
import com.ym.mec.util.collection.MapUtil;
|
|
|
|
+import org.redisson.api.RBucket;
|
|
|
|
+import org.redisson.api.RedissonClient;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.context.ApplicationEventPublisher;
|
|
import org.springframework.context.ApplicationEventPublisher;
|
|
import org.springframework.context.ApplicationEventPublisherAware;
|
|
import org.springframework.context.ApplicationEventPublisherAware;
|
|
@@ -26,7 +28,7 @@ public class SysTenantConfigServiceImpl extends BaseServiceImpl<Integer, SysTena
|
|
@Autowired
|
|
@Autowired
|
|
private SysTenantConfigDao sysTenantConfigDao;
|
|
private SysTenantConfigDao sysTenantConfigDao;
|
|
@Autowired
|
|
@Autowired
|
|
- private RedisCache<String,ConcurrentHashMap<Integer,ConcurrentHashMap<String,String>>> redisCache;
|
|
|
|
|
|
+ private RedissonClient redissonClient;
|
|
private static final String tenantKey = "sysTenantConfig";
|
|
private static final String tenantKey = "sysTenantConfig";
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -44,12 +46,14 @@ public class SysTenantConfigServiceImpl extends BaseServiceImpl<Integer, SysTena
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public void setTenantConfig(ConcurrentHashMap<Integer, ConcurrentHashMap<String, String>> tenantConfig) {
|
|
public void setTenantConfig(ConcurrentHashMap<Integer, ConcurrentHashMap<String, String>> tenantConfig) {
|
|
- redisCache.put(tenantKey,tenantConfig);
|
|
|
|
|
|
+ RBucket<ConcurrentHashMap<Integer,ConcurrentHashMap<String,String>>> bucket = redissonClient.getBucket(tenantKey);
|
|
|
|
+ bucket.set(tenantConfig);
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public String getTenantConfigValue(String paramName,Integer tenantId) {
|
|
public String getTenantConfigValue(String paramName,Integer tenantId) {
|
|
- ConcurrentHashMap<Integer, ConcurrentHashMap<String, String>> tenantConfigMap = redisCache.get(tenantKey);
|
|
|
|
|
|
+ RBucket<ConcurrentHashMap<Integer,ConcurrentHashMap<String,String>>> bucket = redissonClient.getBucket(tenantKey);
|
|
|
|
+ ConcurrentHashMap<Integer, ConcurrentHashMap<String, String>> tenantConfigMap = bucket.get();
|
|
ConcurrentHashMap<String, String> map = tenantConfigMap.get(tenantId);
|
|
ConcurrentHashMap<String, String> map = tenantConfigMap.get(tenantId);
|
|
if(map != null){
|
|
if(map != null){
|
|
return map.get(paramName);
|
|
return map.get(paramName);
|
|
@@ -60,7 +64,8 @@ public class SysTenantConfigServiceImpl extends BaseServiceImpl<Integer, SysTena
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public ConcurrentHashMap<Integer, ConcurrentHashMap<String, String>> getAllTenantConfig() {
|
|
public ConcurrentHashMap<Integer, ConcurrentHashMap<String, String>> getAllTenantConfig() {
|
|
- return redisCache.get(tenantKey);
|
|
|
|
|
|
+ RBucket<ConcurrentHashMap<Integer,ConcurrentHashMap<String,String>>> bucket = redissonClient.getBucket(tenantKey);
|
|
|
|
+ return bucket.get();
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|