gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

用户管理与snat管理无更改；

Browse Source 
批量下发增加app相关配置表状态变更
This commit is contained in:
DuanDongmei
2018-12-04 09:13:20 +08:00
parent 7e52c1f4ca
commit 534b38fa4e
4 changed files with 34 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
View File

@@ -1519,16 +1519,19 @@ public class ConfigSynchronizationService extends BaseService{
List newList = new ArrayList();
if(entity.getServiceId().equals(3)){//ip drop回调类配置用了主表和子表关系
list = configSynchronizationDao.getCfgIndexList(entity);
List<Integer> compileIds = Lists.newArrayList();
for(int i=0;i<list.size();i++){
CfgIndexInfo cfg = (CfgIndexInfo) list.get(i);
compileIds.add(cfg.getCompileId());
}
List subList = configSynchronizationDao.getIpDropList("ip_port_cfg", compileIds);
for(int i=0;i<subList.size();i++){
IpPortCfg cfg = (IpPortCfg) subList.get(i);
newList.add(convertCallBackIp(cfg,cfg.getGroupId()));
if(!StringUtil.isEmpty(list)){
List<Integer> compileIds = Lists.newArrayList();
for(int i=0;i<list.size();i++){
CfgIndexInfo cfg = (CfgIndexInfo) list.get(i);
compileIds.add(cfg.getCompileId());
}
List subList = configSynchronizationDao.getIpDropList("ip_port_cfg", compileIds);
for(int i=0;i<subList.size();i++){
IpPortCfg cfg = (IpPortCfg) subList.get(i);
newList.add(convertCallBackIp(cfg,cfg.getGroupId()));
}
}
}else{
if(className.equals("AvFileSampleCfg")){
list = configSynchronizationDao.getAvFileCfgList(entity);

17
src/main/java/com/nis/web/service/configuration/UserManageService.java
View File

@@ -41,7 +41,7 @@ public class UserManageService extends BaseService{
protected UserManageDao userManageDao;
public Page<UserManage> findPage(Page<UserManage> page, UserManage entity) {
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r"));
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
entity.setPage(page);
List<UserManage> list=userManageDao.findList(entity);
page.setList(list);
@@ -194,22 +194,15 @@ public class UserManageService extends BaseService{
}
//根据vpn服务器ip获取用户vpn服务器ip信息
public Map<String,String> getUser(String serverIp,String userName){
public String getUser(String serverIp,String userName){
Map<String, Object> params = new HashMap<String, Object>();
params.put("cmd", Constants.NTC_IP_REUSE_USER_GET);
params.put("server_ip", serverIp);
params.put("user_name", userName);
Map<String,String> map=new HashMap<String,String>();
try{
String url =Constants.IP_REUSE_CALL_CGI_URL;
String recv = ConfigServiceUtil.getCGI(url, params);
if (StringUtils.isNotBlank(recv)) {
map=(Map<String,String>)JSON.parse(recv);
}
} catch (Exception e) {
logger.error("查询失败", e);
}
return map;
String url =Constants.IP_REUSE_CALL_CGI_URL;
String recv = ConfigServiceUtil.getCGI(url, params);
return recv;
}