1.添加了部分菜单的中英文国际化

2.业务配置的流媒体审核异常已解决

Conflicts:
	src/main/resources/messages/message_en.properties
This commit is contained in:
李皓宸
2019-04-23 18:05:00 +08:00
committed by duandongmei
parent 001b8948bd
commit b76dc62cbb
3 changed files with 29 additions and 2 deletions

View File

@@ -125,9 +125,11 @@ public class AvContentCfgService extends BaseService{
List<NtcSubscribeIdCfg> ntcSubscribeList=getSubscribeIdCfgList(cfg);
List<IpPortCfg> ipPortList = avContentCfgDao.getIpPortList(cfg);
List<AvVoipAccountCfg> voipAccounts=getVoipAccountCfgList(cfg);
List<AvContUrlCfg> avContUrlCfgList=avContentCfgDao.getAvContUrlList(cfg);
cfg.setNtcSubscribeIdCfgList(ntcSubscribeList);
cfg.setVoipAccounts(voipAccounts);
cfg.setIpPortList(ipPortList);
cfg.setAvContUrlCfgList(avContUrlCfgList);
return cfg;
}