优化集群方案, 每个zlm一套ssrc;
优化集群下的docker接入逻辑; 更正sql脚本; 支持重启不设置设备离线。重启SIP事务不丢失
This commit is contained in:
@@ -0,0 +1,8 @@
|
||||
package com.genersoft.iot.vmp.utils;
|
||||
|
||||
public class ConfigConst {
|
||||
/**
|
||||
* 播流最大并发个数
|
||||
*/
|
||||
public static final Integer MAX_STRTEAM_COUNT = 10000;
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
package com.genersoft.iot.vmp.utils;
|
||||
|
||||
import java.io.*;
|
||||
|
||||
public class SerializeUtils {
|
||||
public static byte[] serialize(Object obj){
|
||||
byte[] bytes = null;
|
||||
try {
|
||||
ByteArrayOutputStream baos=new ByteArrayOutputStream();;
|
||||
ObjectOutputStream oos=new ObjectOutputStream(baos);
|
||||
oos.writeObject(obj);
|
||||
bytes=baos.toByteArray();
|
||||
baos.close();
|
||||
oos.close();
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
return bytes;
|
||||
}
|
||||
public static Object deSerialize(byte[] bytes){
|
||||
Object obj=null;
|
||||
try {
|
||||
ByteArrayInputStream bais=new ByteArrayInputStream(bytes);
|
||||
ObjectInputStream ois=new ObjectInputStream(bais);
|
||||
obj=ois.readObject();
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
return obj;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,97 @@
|
||||
package com.genersoft.iot.vmp.utils.redis;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Component;
|
||||
import redis.clients.jedis.Jedis;
|
||||
import redis.clients.jedis.JedisPool;
|
||||
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* @Description:Jedis工具类
|
||||
* @author: wangshaopeng@sunnybs.com
|
||||
* @date: 2021年03月22日 下午8:27:29
|
||||
*/
|
||||
@Component
|
||||
public class JedisUtil {
|
||||
|
||||
@Autowired
|
||||
private JedisPool jedisPool;
|
||||
|
||||
// ============================== Key ==============================
|
||||
|
||||
/**
|
||||
* 检查给定 key 是否存在。
|
||||
*
|
||||
* @param key
|
||||
* @return
|
||||
*/
|
||||
public Boolean exists(String key) {
|
||||
Jedis jedis = null;
|
||||
try {
|
||||
jedis = jedisPool.getResource();
|
||||
Boolean exists = jedis.exists(key);
|
||||
return exists;
|
||||
} finally {
|
||||
returnToPool(jedis);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// ============================== Set ==============================
|
||||
|
||||
/**
|
||||
* SADD key member [member ...]
|
||||
* 将一个或多个 member 元素加入到集合 key 当中,已经存在于集合的 member 元素将被忽略。
|
||||
* 假如 key 不存在,则创建一个只包含 member 元素作成员的集合。
|
||||
* 当 key 不是集合类型时,返回一个错误。
|
||||
*/
|
||||
public Long sadd(String key, String... members) {
|
||||
Jedis jedis = null;
|
||||
try {
|
||||
jedis = jedisPool.getResource();
|
||||
Long smove = jedis.sadd(key, members);
|
||||
return smove;
|
||||
} finally {
|
||||
returnToPool(jedis);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* SMEMBERS key
|
||||
* 返回集合 key 中的所有成员。
|
||||
* 不存在的 key 被视为空集合。
|
||||
*/
|
||||
public Set<String> smembers(String key) {
|
||||
Jedis jedis = null;
|
||||
try {
|
||||
jedis = jedisPool.getResource();
|
||||
Set<String> smembers = jedis.smembers(key);
|
||||
return smembers;
|
||||
} finally {
|
||||
returnToPool(jedis);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* SREM key member1 [member2]
|
||||
* 移除集合中一个或多个成员
|
||||
*/
|
||||
public Long srem(String key, String... member) {
|
||||
Jedis jedis = null;
|
||||
try {
|
||||
jedis = jedisPool.getResource();
|
||||
Long srem = jedis.srem(key, member);
|
||||
return srem;
|
||||
} finally {
|
||||
returnToPool(jedis);
|
||||
}
|
||||
}
|
||||
|
||||
private void returnToPool(Jedis jedis) {
|
||||
if (jedis != null) {
|
||||
jedis.close();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -415,10 +415,10 @@ public class RedisUtil {
|
||||
*
|
||||
* @param key
|
||||
* @param value
|
||||
* @param score
|
||||
* @param delta -1 表示减 1 表示加1
|
||||
*/
|
||||
public Double zIncrScore(Object key, Object value, double score) {
|
||||
return redisTemplate.opsForZSet().incrementScore(key, value, score);
|
||||
public Double zIncrScore(Object key, Object value, double delta) {
|
||||
return redisTemplate.opsForZSet().incrementScore(key, value, delta);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user