diff --git a/src/main/java/com/nis/domain/configuration/UserManage.java b/src/main/java/com/nis/domain/configuration/UserManage.java index e18dd64a9..71bed1b83 100644 --- a/src/main/java/com/nis/domain/configuration/UserManage.java +++ b/src/main/java/com/nis/domain/configuration/UserManage.java @@ -23,6 +23,7 @@ public class UserManage extends BaseEntity{ private Date editTime; private Integer isValid; private String remarks; + private String userType; private String newUserPwd; private String oldUserName;//原用户名 @@ -51,6 +52,14 @@ public class UserManage extends BaseEntity{ private Integer functionId; private String isAudit; + + + public String getUserType() { + return userType; + } + public void setUserType(String userType) { + this.userType = userType; + } public String getIsAudit() { return isAudit; } diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java index 7d52b4211..f5cf8d76c 100644 --- a/src/main/java/com/nis/util/Constants.java +++ b/src/main/java/com/nis/util/Constants.java @@ -745,5 +745,9 @@ public final class Constants { public static final String POLICIES_MENU_ID=Configurations.getStringProperty("policies_menu_id", "86"); - + public static final String NTC_IP_REUSE_USER_CREATE = Configurations.getStringProperty("userCreate",""); + public static final String NTC_IP_REUSE_USER_PASSWORD = Configurations.getStringProperty("userPasswordSet",""); + public static final String NTC_IP_REUSE_USER_DELETE = Configurations.getStringProperty("userDelete",""); + public static final String NTC_IP_REUSE_USER_GET = Configurations.getStringProperty("userGet",""); + public static final String NTC_IP_REUSE_USER_LIST = Configurations.getStringProperty("userList",""); } diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java index 0f65fbbaa..d3f0728f3 100644 --- a/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java +++ b/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java @@ -151,7 +151,7 @@ public class UserManageController extends BaseController{ UserManage user=new UserManage(); IpReuseIpCfg ipReuseIpCfg=ipReuseIpCfgService.getIpByIp(ip); //根据ip调用接口获取数据 - //user=userManageService.getUserManage(ip, request); + //user=userManageService.getUserList(ip, request); if(ipReuseIpCfg!=null){ user.setServerIp(ipReuseIpCfg.getDestIpAddress()); user.setRemarks(ipReuseIpCfg.getCfgDesc()); @@ -167,6 +167,7 @@ public class UserManageController extends BaseController{ UserManage user=new UserManage(); user=userManageService.getUserByLoginName(userName); IpReuseIpCfg ipReuseIpCfg=ipReuseIpCfgService.getIpByIp(serverIp); + //user=userManageService.getUserManage(ip, request); if(ipReuseIpCfg!=null){ user.setServerIp(ipReuseIpCfg.getDestIpAddress()); user.setRemarks(ipReuseIpCfg.getCfgDesc()); diff --git a/src/main/java/com/nis/web/dao/configuration/UserManageDao.xml b/src/main/java/com/nis/web/dao/configuration/UserManageDao.xml index 28d6ada5a..cedffc199 100644 --- a/src/main/java/com/nis/web/dao/configuration/UserManageDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/UserManageDao.xml @@ -7,6 +7,7 @@ + @@ -17,7 +18,7 @@ - r.ID,r.USER_NAME,r.USER_PWD,r.SERVER_IP,r.is_audit, + r.ID,r.USER_NAME,r.USER_PWD,r.SERVER_IP,r.user_type,r.is_audit, r.IS_VALID,r.CREATOR_ID,r.CREATE_TIME,r.EDITOR_ID,r.EDIT_TIME,remarks @@ -46,6 +47,9 @@ AND r.server_ip like concat(concat('%',#{serverIp,jdbcType=VARCHAR}),'%') + + AND r.user_type =#{userType,jdbcType=VARCHAR} + AND r.remarks like concat(concat('%',#{remarks,jdbcType=VARCHAR}),'%') @@ -74,6 +78,7 @@ USER_NAME, USER_PWD, SERVER_IP, + user_type, IS_VALID, is_audit, CREATOR_ID, @@ -85,6 +90,7 @@ #{userName,jdbcType=VARCHAR}, #{userPwd,jdbcType=VARCHAR}, #{serverIp,jdbcType=VARCHAR}, + #{userType,jdbcType=VARCHAR}, #{isValid,jdbcType=INTEGER}, 0, #{creatorId,jdbcType=INTEGER}, @@ -111,6 +117,9 @@ server_ip = #{serverIp,jdbcType=VARCHAR}, + + user_type =#{userType,jdbcType=VARCHAR}, + creator_id = #{creatorId,jdbcType=INTEGER}, diff --git a/src/main/java/com/nis/web/service/configuration/UserManageService.java b/src/main/java/com/nis/web/service/configuration/UserManageService.java index c46e57b18..3665a8a70 100644 --- a/src/main/java/com/nis/web/service/configuration/UserManageService.java +++ b/src/main/java/com/nis/web/service/configuration/UserManageService.java @@ -106,27 +106,49 @@ public class UserManageService extends BaseService{ } //根据vpn服务器ip获取用户vpn服务器ip信息 - public UserManage getUserManage(String serverIp,HttpServletRequest request){ + public UserManage getUser(String serverIp,HttpServletRequest request){ UserManage user=new UserManage(); - /*Map params = new HashMap(); + Map params = new HashMap(); params.put("server_ip", serverIp); try{ String url ="URL"+ Constants.NTC_IP_REUSE_USER_LIST; - String recv = HttpClientUtil.getUserMsg(url, params, request); + String recv = HttpClientUtil.getMsg(url, params, request); logger.info("查询结果:" + recv); if (StringUtils.isNotBlank(recv)) { Gson gson = new GsonBuilder().create(); LogRecvData fromJson = gson.fromJson(recv, new TypeToken>(){}.getType()); if (fromJson.getStatus().intValue() == 200) { - + } } } catch (Exception e) { logger.error("查询失败", e); - }*/ + } + return user; + } + + //根据vpn服务器ip,用户名获取用户信息 + public UserManage getUserManage(String serverIp,String userName,HttpServletRequest request){ + UserManage user=new UserManage(); + Map params = new HashMap(); + params.put("server_ip", serverIp); + params.put("user_name", userName); + try{ + String url ="URL"+ Constants.NTC_IP_REUSE_USER_GET; + String recv = HttpClientUtil.getMsg(url, params, request); + logger.info("查询结果:" + recv); + if (StringUtils.isNotBlank(recv)) { + Gson gson = new GsonBuilder().create(); + LogRecvData fromJson = gson.fromJson(recv, new TypeToken>(){}.getType()); + if (fromJson.getStatus().intValue() == 200) { + + } + } + } catch (Exception e) { + logger.error("查询失败", e); + } return user; } - /** * * @param isAudit diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index e74872a1c..7a5141dc7 100644 --- a/src/main/resources/nis.properties +++ b/src/main/resources/nis.properties @@ -559,4 +559,9 @@ default_max_perroute=100 poolcm_socket_timeout=3000 app_vignore_user_region_key=VIGNORE #policies\u83DC\u5355\u7684\u83DC\u5355ID -policies_menu_id=86 \ No newline at end of file +policies_menu_id=86 +userCreate=UserCreate +userPasswordSet=UserPasswordSet +userDelete=UserDelete +userGet=UserGet +userList=UserList \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/list.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/list.jsp index 4cacdfe75..fbe042aa5 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/list.jsp @@ -10,6 +10,8 @@ $("#intype").val("${cfg.userName}"); } else if("${cfg.remarks}"){ $("#intype").val("${cfg.remarks}"); + } else if("${cfg.serverIp}"){ + $("#intype").val("${cfg.serverIp}"); } else{ $("#intype").attr("placeholder"," "+$("#seltype").find("option:selected").text()); } @@ -41,6 +43,7 @@ $("#exportValue").val($("#intype").val()); } } + }); @@ -77,37 +80,37 @@ html+=""; } $("#userTable tbody").prepend(html); - openWindow(); + openWindow('light'); } }); } - - function openWindow(){ - document.getElementById('light').style.display='block'; + + function addVpnIp(id,serverIp,userName){ + $("#spUserName").text(userName) + $("#serverIpId").val(serverIp); + $("#serverIpName").val(serverIp); + $("#userId").val(id); + openWindow('light2'); + } + function saveIp(){ + if($("#serverIpId").val()==null || $("#serverIpId").val()==''){ + top.$.jBox.tip(" ",""); + }else{ + window.location.href="${ctx}/maintenance/userManage/save?id="+$("#userId").val()+"&serverIp="+$("#serverIpId").val(); + $("#submitIp").attr('disabled',"true"); + } + } + function openWindow(type){ + document.getElementById(type).style.display='block'; document.getElementById('fade').style.display='block'; } - function closeWindow(){ - document.getElementById('light').style.display='none'; + function closeWindow(type){ + document.getElementById(type).style.display='none'; document.getElementById('fade').style.display='none'; } @@ -169,6 +190,7 @@
+ @@ -252,7 +274,7 @@ - <%-- --%> + @@ -268,7 +290,7 @@ ${indexCfg.userName } - <%-- ${indexCfg.serverIp } --%> + ${indexCfg.serverIp } ${indexCfg.remarks } ${indexCfg.creatorName } @@ -279,8 +301,7 @@
@@ -300,25 +321,60 @@
- X + X
- - - - - - - - + + + + + + + +
- +
+
+ +
+
+ + X +
+ + + + + + + + + + + +
    
     + + *
+
+ + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/userForm.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/userForm.jsp index 3c405f9c8..dbe3251b9 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/userForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/userForm.jsp @@ -98,13 +98,27 @@ value="${user.serverIp}" labelName="user.serverIp" notAllowSelectParent="true" enableSearch="true" notAllowSelectRoot="true" checkedPS="ps" unCheckedPS="ps" - labelValue="${user.serverIp}" title="${vpn_ip}" + labelValue="${user.serverIp}" title="vpn_ip" url="/maintenance/userManage/treeData?isLeafShow=false&cfgType=3&specific=true" extId="0" checked="true" cssClass="form-control required" /> *
+ + +