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

用户管理-用户类型vpn调整

Browse Source 
vpn服务器ip添加业务字典数据类型
ip校验、cgi服务国际化添加
This commit is contained in:
leijun
2018-12-05 10:03:45 +08:00
parent 53555aa73a
commit dd1862abce
14 changed files with 123 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java
View File

@@ -113,7 +113,7 @@ public class ServiceDictInfoController extends BaseController {
* @param model
* @return
*/
@RequiresPermissions(value={"basics:classification:view","basics:attribute:view","basics:label:view"},logical=Logical.OR)
@RequiresPermissions(value={"basics:classification:view","basics:attribute:view","basics:label:view","basics:vpn_ip:view"},logical=Logical.OR)
@RequestMapping(value = {"list", ""})
public String list(String itType, ServiceDictInfo serviceDictInfo,HttpServletRequest request, HttpServletResponse response, Model model) {
//处理数据
@@ -183,7 +183,7 @@ public class ServiceDictInfoController extends BaseController {
* @param model
* @return
*/
@RequiresPermissions(value={"basics:classification:add","basics:attribute:add","basics:label:add","basics:classification:edit","basics:attribute:edit","basics:label:edit","basics:classification:view","basics:attribute:view","basics:label:view"},logical=Logical.OR)
@RequiresPermissions(value={"basics:classification:add","basics:attribute:add","basics:vpn_ip:add","basics:label:add","basics:classification:edit","basics:attribute:edit","basics:vpn_ip:edit","basics:label:edit","basics:classification:view","basics:attribute:view","basics:label:view","basics:vpn_ip:view"},logical=Logical.OR)
@RequestMapping(value={"form"})
public String form(ServiceDictInfo serviceDictInfo, Model model,String doAction,String itType) {
if(doAction!=null&&doAction.equals("0")){
@@ -207,7 +207,7 @@ public class ServiceDictInfoController extends BaseController {
* @param redirectAttributes
* @return
*/
@RequiresPermissions(value={"basics:classification:add","basics:attribute:add","basics:label:add","basics:classification:edit","basics:attribute:edit","basics:label:edit"},logical=Logical.OR)
@RequiresPermissions(value={"basics:classification:add","basics:attribute:add","basics:label:add","basics:vpn_ip:add","basics:classification:edit","basics:attribute:edit","basics:label:edit","basics:vpn_ip:edit"},logical=Logical.OR)
@RequestMapping(value = "saveOrUpdate")
public String saveOrUpdate(ServiceDictInfo serviceDictInfo,Model model, RedirectAttributes redirectAttributes,String itType) {
@@ -231,7 +231,7 @@ public class ServiceDictInfoController extends BaseController {
* @param model
* @return
*/
@RequiresPermissions(value={"basics:classification:del","basics:attribute:del","basics:label:del"},logical=Logical.OR)
@RequiresPermissions(value={"basics:classification:del","basics:attribute:del","basics:label:del","basics:vpn_ip:del"},logical=Logical.OR)
@RequestMapping(value={"delete"})
public String delete(ServiceDictInfo serviceDictInfo, RedirectAttributes redirectAttributes, String itType, String mulitId) {
try {

45
src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java
View File

@@ -22,6 +22,7 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.nis.domain.Page;
import com.nis.domain.basics.IpReuseIpCfg;
import com.nis.domain.basics.ServiceDictInfo;
import com.nis.domain.configuration.UserManage;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.Constants;
@@ -82,11 +83,11 @@ public class UserManageController extends BaseController{
userManageService.delete(-1,user,ip,lastIp);
deleteIpLenth++;
} catch (MaatConvertException e) {
message=msgProp.getProperty("user")+" "+user.getUserName()+" "+ip+" "+msgProp.getProperty("vpn_ip")+" "+msgProp.getProperty("delete_failed");
message=msgProp.getProperty("user")+" "+user.getUserName()+" "+ip+" "+msgProp.getProperty("cgi_failed")+" "+msgProp.getProperty("delete_failed");
logger.error("用户vpn新增失败",e);
throw e;
}catch (Exception e) {
message=msgProp.getProperty("user")+" "+user.getUserName()+" "+ip+" "+msgProp.getProperty("vpn_ip")+" "+msgProp.getProperty("delete_failed");
message=msgProp.getProperty("user")+" "+user.getUserName()+" "+ip+" "+msgProp.getProperty("cgi_failed")+" "+msgProp.getProperty("delete_failed");
logger.error("用户vpn新增失败",e);
throw e;
}
@@ -113,8 +114,6 @@ public class UserManageController extends BaseController{
,String ids,UserManage entity
,RedirectAttributes redirectAttributes) {
Date createTime=new Date();
String errorIp="";
String errorType="";
String addIp="";
String addSuccessIp="";
String deleteIp="";
@@ -145,11 +144,11 @@ public class UserManageController extends BaseController{
addSuccessIp+=addSuccessIp+",";
}
} catch (MaatConvertException e) {
message=msgProp.getProperty("user")+" "+entity.getUserName()+" "+ip+" "+msgProp.getProperty("vpn_ip")+" "+msgProp.getProperty("save_failed");
message=msgProp.getProperty("user")+" "+entity.getUserName()+" "+ip+" "+msgProp.getProperty("cgi_failed")+" "+msgProp.getProperty("save_failed");
logger.error("用户vpn新增失败",e);
throw e;
}catch (Exception e) {
message=msgProp.getProperty("user")+" "+entity.getUserName()+" "+ip+" "+msgProp.getProperty("vpn_ip")+" "+msgProp.getProperty("save_failed");
message=msgProp.getProperty("user")+" "+entity.getUserName()+" "+ip+" "+msgProp.getProperty("cgi_failed")+" "+msgProp.getProperty("save_failed");
logger.error("用户vpn新增失败",e);
throw e;
}
@@ -171,11 +170,11 @@ public class UserManageController extends BaseController{
userManageService.updatePwd(entity,ip);
}
} catch (MaatConvertException e) {
message=msgProp.getProperty("user")+" "+entity.getUserName()+msgProp.getProperty("password")+msgProp.getProperty("update_failed");
message=msgProp.getProperty("user")+" "+entity.getUserName()+msgProp.getProperty("password")+" "+msgProp.getProperty("cgi_failed")+" "+msgProp.getProperty("update_failed");
logger.error("用户vpn密码修改失败",e);
throw e;
}catch (Exception e) {
message=msgProp.getProperty("user")+" "+entity.getUserName()+msgProp.getProperty("password")+msgProp.getProperty("update_failed");
message=msgProp.getProperty("user")+" "+entity.getUserName()+msgProp.getProperty("password")+" "+msgProp.getProperty("cgi_failed")+" "+msgProp.getProperty("update_failed");
logger.error("用户vpn密码修改失败",e);
throw e;
}
@@ -206,11 +205,11 @@ public class UserManageController extends BaseController{
addSuccessIp+=addSuccessIp+",";
}
} catch (MaatConvertException e) {
message=msgProp.getProperty("user")+" "+entity.getUserName()+" "+ip+" "+msgProp.getProperty("vpn_ip")+" "+msgProp.getProperty("save_failed");
message=msgProp.getProperty("user")+" "+entity.getUserName()+" "+ip+" "+msgProp.getProperty("cgi_failed")+" "+msgProp.getProperty("save_failed");
logger.error("用户vpn新增失败",e);
throw e;
}catch (Exception e) {
message=msgProp.getProperty("user")+" "+entity.getUserName()+" "+ip+" "+msgProp.getProperty("vpn_ip")+" "+msgProp.getProperty("save_failed");
message=msgProp.getProperty("user")+" "+entity.getUserName()+" "+ip+" "+msgProp.getProperty("cgi_failed")+" "+msgProp.getProperty("save_failed");
logger.error("用户vpn新增失败",e);
throw e;
}
@@ -226,11 +225,11 @@ public class UserManageController extends BaseController{
deleteSuccessIp+=deleteSuccessIp+",";
}
} catch (MaatConvertException e) {
message=msgProp.getProperty("user")+" "+entity.getUserName()+" "+ip+" "+msgProp.getProperty("vpn_ip")+" "+msgProp.getProperty("save_failed");
message=msgProp.getProperty("user")+" "+entity.getUserName()+" "+ip+" "+msgProp.getProperty("cgi_failed")+" "+msgProp.getProperty("save_failed");
logger.error("用户vpn删除失败",e);
throw e;
}catch (Exception e) {
message=msgProp.getProperty("user")+" "+entity.getUserName()+" "+ip+" "+msgProp.getProperty("vpn_ip")+" "+msgProp.getProperty("save_failed");
message=msgProp.getProperty("user")+" "+entity.getUserName()+" "+ip+" "+msgProp.getProperty("cgi_failed")+" "+msgProp.getProperty("save_failed");
logger.error("用户vpn删除失败",e);
throw e;
}
@@ -288,13 +287,12 @@ public class UserManageController extends BaseController{
mapList.add(map2);
IpReuseIpCfg ip=new IpReuseIpCfg();
ip.setFunctionId(636);
List<IpReuseIpCfg> list=ipReuseIpCfgService.findList(ip);
for (int i = 0; i < list.size(); i++) {
IpReuseIpCfg ipReuseIpCfg=list.get(i);
List<ServiceDictInfo> allList = serviceDictInfoService.findAllNoLeafDictList("5");
for (int i = 0; i < allList.size(); i++) {
Map<String, Object> map = Maps.newHashMap();
map.put("id", ipReuseIpCfg.getDestIpAddress());
map.put("id", allList.get(i).getItemValue());
map.put("pId", 0);
map.put("name",ipReuseIpCfg.getDestIpAddress());
map.put("name",allList.get(i).getItemValue());
mapList.add(map);
}
return mapList;
@@ -309,16 +307,21 @@ public class UserManageController extends BaseController{
Map<String,Object> mess=new HashMap<String,Object>();
for(String ip :ipArray){
Map<String,String> map=new HashMap<String,String>();
UserManage user=new UserManage();
IpReuseIpCfg ipReuseIpCfg=ipReuseIpCfgService.getIpByIp(ip);
ServiceDictInfo sysDictInfo=serviceDictInfoService.getByItemValue(ip, 5);
//根据ip调用接口获取数据
try{
String recv=userManageService.getUser(ip,userName);
if (StringUtils.isNotBlank(recv)) {
map=(Map<String,String>)JSON.parse(recv);
if(ipReuseIpCfg!=null ){
map.put("serverIp", ipReuseIpCfg.getDestIpAddress());
if(sysDictInfo!=null ){
map.put("serverIp", sysDictInfo.getItemValue());
userManageList.add(map);
}else{
if(message==""){
message=ip;
}else{
message+=","+ip;
}
}
}
} catch (Exception e) {