From d4e6ec0389dd8abbcce4ee4f9e5cdad1633491d5 Mon Sep 17 00:00:00 2001 From: kongdeqiang <123456> Date: 星期四, 11 五月 2023 09:44:25 +0800 Subject: [PATCH] 修改项目 --- src/main/resources/templates/heath/add.html | 2 src/main/resources/templates/instask/taskinfo.html | 0 src/main/java/com/wgcloud/controller/FailureLoggingController.java | 8 +- src/main/resources/templates/common/navbar.html | 4 src/main/resources/templates/failog/list.html | 0 src/main/java/com/wgcloud/controller/InspectionTaskController.java | 14 ++-- src/main/java/com/wgcloud/filter/AuthRestFilter.java | 12 +++ src/main/resources/templates/mail/view.html | 4 src/main/resources/templates/host/viewChart.html | 2 src/main/resources/templates/instask/tasklist.html | 0 src/main/resources/templates/mysql/tableView.html | 2 src/main/resources/templates/docker/view.html | 2 src/main/resources/templates/failog/add.html | 0 src/main/resources/templates/shellInfo/add.html | 2 src/main/java/com/wgcloud/entity/SnmpInterfaceInfo.java | 2 src/main/resources/templates/instask/view.html | 0 src/main/resources/templates/failog/view.html | 0 src/main/resources/templates/instask/infoedit.html | 0 src/main/resources/templates/host/list.html | 4 src/main/resources/templates/app/view.html | 2 src/main/resources/templates/common/aside.html | 14 ++-- src/main/resources/templates/customInfo/add.html | 2 src/main/resources/templates/instask/add.html | 0 src/main/resources/templates/common/footer.html | 4 src/main/resources/templates/dashView/list.html | 4 src/main/resources/templates/dce/view.html | 2 src/main/resources/templates/mysql/addTable.html | 2 src/main/java/com/wgcloud/util/SnmpUtil.java | 42 ++++++++++++-- src/main/resources/templates/dashView/viewChart.html | 4 src/main/resources/templates/mysql/addDb.html | 4 src/main/resources/templates/dashView/index.html | 18 +++--- src/main/resources/templates/common/footerDashView.html | 4 32 files changed, 99 insertions(+), 61 deletions(-) diff --git a/src/main/java/com/wgcloud/controller/FailureLoggingController.java b/src/main/java/com/wgcloud/controller/FailureLoggingController.java index 5e8529d..96229e3 100644 --- a/src/main/java/com/wgcloud/controller/FailureLoggingController.java +++ b/src/main/java/com/wgcloud/controller/FailureLoggingController.java @@ -69,7 +69,7 @@ logger.error("鏌ヨ璁惧鏇存崲鍒楄〃閿欒", e); logInfoService.save("鏌ヨ璧勪骇淇℃伅閿欒", e.toString(), StaticKeys.LOG_XTCZ); } - return "failurelogging/list"; + return "failog/list"; } @RequestMapping(value = "save") @@ -107,7 +107,7 @@ if (StringUtils.isEmpty(id)) { model.addAttribute("failureLogging", failureLogging); - return "failureLogging/add"; + return "failog/add"; } failureLogging = failureLoggingService.selectById(id); model.addAttribute("failureLogging", failureLogging); @@ -115,7 +115,7 @@ logger.error(errorMsg, e); logInfoService.save(errorMsg, e.toString(), StaticKeys.LOG_XTCZ); } - return "failurelogging/add"; + return "failog/add"; } /** @@ -137,7 +137,7 @@ logger.error(errorMsg, e); logInfoService.save(errorMsg, e.toString(), StaticKeys.LOG_XTCZ); } - return "failurelogging/view"; + return "failog/view"; } diff --git a/src/main/java/com/wgcloud/controller/InspectionTaskController.java b/src/main/java/com/wgcloud/controller/InspectionTaskController.java index 59ac372..7c0cfeb 100644 --- a/src/main/java/com/wgcloud/controller/InspectionTaskController.java +++ b/src/main/java/com/wgcloud/controller/InspectionTaskController.java @@ -74,7 +74,7 @@ logger.error("鏌ヨ璁惧鏇存崲鍒楄〃閿欒", e); logInfoService.save("鏌ヨ璧勪骇淇℃伅閿欒", e.toString(), StaticKeys.LOG_XTCZ); } - return "inspectionTask/list"; + return "instask/tasklist"; } @RequestMapping(value = "save") @@ -137,7 +137,7 @@ try { if (StringUtils.isEmpty(id)) { model.addAttribute("inspectionTask", inspectionTask); - return "inspectionTask/add"; + return "instask/add"; } inspectionTask = inspectionTaskService.selectById(id); model.addAttribute("inspectionTask", inspectionTask); @@ -145,7 +145,7 @@ logger.error(errorMsg, e); logInfoService.save(errorMsg, e.toString(), StaticKeys.LOG_XTCZ); } - return "inspectionTask/add"; + return "instask/add"; } /** @@ -163,7 +163,7 @@ try { if (StringUtils.isEmpty(id)) { model.addAttribute("taskInfo", taskInfo); - return "inspectionTask/infoedit"; + return "instask/infoedit"; } taskInfo = taskInfoService.selectById(id); model.addAttribute("taskInfo", taskInfo); @@ -171,7 +171,7 @@ logger.error(errorMsg, e); logInfoService.save(errorMsg, e.toString(), StaticKeys.LOG_XTCZ); } - return "inspectionTask/infoedit"; + return "instask/infoedit"; } /** @@ -193,7 +193,7 @@ logger.error(errorMsg, e); logInfoService.save(errorMsg, e.toString(), StaticKeys.LOG_XTCZ); } - return "inspectionTask/view"; + return "instask/view"; } @@ -244,7 +244,7 @@ logger.error("鏌ヨ浠诲姟璇︽儏閿欒", e); logInfoService.save("鏌ヨ浠诲姟璇︽儏閿欒", e.toString(), StaticKeys.LOG_XTCZ); } - return "inspectionTask/taskinfo"; + return "instask/taskinfo"; } /** diff --git a/src/main/java/com/wgcloud/entity/SnmpInterfaceInfo.java b/src/main/java/com/wgcloud/entity/SnmpInterfaceInfo.java index 52a61e3..89fff60 100644 --- a/src/main/java/com/wgcloud/entity/SnmpInterfaceInfo.java +++ b/src/main/java/com/wgcloud/entity/SnmpInterfaceInfo.java @@ -37,7 +37,7 @@ /** * 閫熺巼 */ - private Integer actualSpeed; + private Long actualSpeed; /** * 宸ヤ綔妯″紡 diff --git a/src/main/java/com/wgcloud/filter/AuthRestFilter.java b/src/main/java/com/wgcloud/filter/AuthRestFilter.java index 9324681..131822a 100644 --- a/src/main/java/com/wgcloud/filter/AuthRestFilter.java +++ b/src/main/java/com/wgcloud/filter/AuthRestFilter.java @@ -209,8 +209,16 @@ session.setAttribute("menuActive", "81"); return; } - if (uri.indexOf("/report") > -1) { - session.setAttribute("menuActive", "91"); + if (uri.indexOf("/equipment") > -1) { + session.setAttribute("menuActive", "81"); + return; + } + if (uri.indexOf("/inspectionTask") > -1) { + session.setAttribute("menuActive", "c1"); + return; + } + if (uri.indexOf("/failurelogging") > -1) { + session.setAttribute("menuActive", "c2"); return; } session.setAttribute("menuActive", "11"); diff --git a/src/main/java/com/wgcloud/util/SnmpUtil.java b/src/main/java/com/wgcloud/util/SnmpUtil.java index 2615c67..14570ea 100644 --- a/src/main/java/com/wgcloud/util/SnmpUtil.java +++ b/src/main/java/com/wgcloud/util/SnmpUtil.java @@ -256,7 +256,12 @@ Map<String, Object> stringObjectMap = interfaceStatusList.get(i); SnmpInterfaceInfo snmpInterfaceInfo = interfaceInfos.get(i); for (Map.Entry<String, Object> stringObjectEntry : stringObjectMap.entrySet()) { - snmpInterfaceInfo.setIsUp(Integer.parseInt(stringObjectEntry.getValue().toString().trim())); + try { + snmpInterfaceInfo.setIsUp(Integer.parseInt(stringObjectEntry.getValue().toString().trim())); + }catch (Exception e){ + snmpInterfaceInfo.setIsUp(0); + e.printStackTrace(); + } } } } @@ -265,7 +270,12 @@ Map<String, Object> stringObjectMap = actualSpeedList.get(i); SnmpInterfaceInfo snmpInterfaceInfo = interfaceInfos.get(i); for (Map.Entry<String, Object> stringObjectEntry : stringObjectMap.entrySet()) { - snmpInterfaceInfo.setActualSpeed(Integer.parseInt(stringObjectEntry.getValue().toString().trim())); + try { + snmpInterfaceInfo.setActualSpeed(Long.parseLong(stringObjectEntry.getValue().toString().trim())); + }catch (Exception e){ + snmpInterfaceInfo.setActualSpeed(100000L); + e.printStackTrace(); + } } } } @@ -274,7 +284,12 @@ Map<String, Object> stringObjectMap = workMTUList.get(i); SnmpInterfaceInfo snmpInterfaceInfo = interfaceInfos.get(i); for (Map.Entry<String, Object> stringObjectEntry : stringObjectMap.entrySet()) { - snmpInterfaceInfo.setWorkMTU(Integer.parseInt(stringObjectEntry.getValue().toString().trim())); + try { + snmpInterfaceInfo.setWorkMTU(Integer.parseInt(stringObjectEntry.getValue().toString().trim())); + }catch (Exception e){ + snmpInterfaceInfo.setWorkMTU(1500); + e.printStackTrace(); + } } } } @@ -283,7 +298,12 @@ Map<String, Object> stringObjectMap = actualMTUList.get(i); SnmpInterfaceInfo snmpInterfaceInfo = interfaceInfos.get(i); for (Map.Entry<String, Object> stringObjectEntry : stringObjectMap.entrySet()) { - snmpInterfaceInfo.setActualMTU(Integer.parseInt(stringObjectEntry.getValue().toString().trim())); + try { + snmpInterfaceInfo.setActualMTU(Integer.parseInt(stringObjectEntry.getValue().toString().trim())); + }catch (Exception e){ + snmpInterfaceInfo.setActualMTU(1500); + e.printStackTrace(); + } } } } @@ -292,7 +312,12 @@ Map<String, Object> stringObjectMap = loopbackList.get(i); SnmpInterfaceInfo snmpInterfaceInfo = interfaceInfos.get(i); for (Map.Entry<String, Object> stringObjectEntry : stringObjectMap.entrySet()) { - snmpInterfaceInfo.setLoopback(Integer.parseInt(stringObjectEntry.getValue().toString().trim())); + try { + snmpInterfaceInfo.setLoopback(Integer.parseInt(stringObjectEntry.getValue().toString().trim())); + }catch (Exception e){ + snmpInterfaceInfo.setLoopback(0); + e.printStackTrace(); + } } } } @@ -301,7 +326,11 @@ Map<String, Object> stringObjectMap = descriptionList.get(i); SnmpInterfaceInfo snmpInterfaceInfo = interfaceInfos.get(i); for (Map.Entry<String, Object> stringObjectEntry : stringObjectMap.entrySet()) { - snmpInterfaceInfo.setDescription(stringObjectEntry.getValue().toString().trim()); + try { + snmpInterfaceInfo.setDescription(stringObjectEntry.getValue().toString().trim()); + }catch (Exception e){ + e.printStackTrace(); + } } } } @@ -488,6 +517,7 @@ pdu.add(new VariableBinding(new OID(nextOid))); } System.out.println("list鐨勫ぇ灏� = " +list.size()); + System.out.println(list); return list; } catch (IOException e) { diff --git a/src/main/resources/templates/app/view.html b/src/main/resources/templates/app/view.html index a244664..00e67c3 100644 --- a/src/main/resources/templates/app/view.html +++ b/src/main/resources/templates/app/view.html @@ -71,7 +71,7 @@ </th:block> <td width="10%"> - <form class="form-inline ml-3 float-sm-right" action="/wgcloud/appInfo/view"> + <form class="form-inline ml-3 float-sm-right" action="/tssw/appInfo/view"> <input type="hidden" name="id" th:value="${appInfo.id}"/> <div class="input-group input-group-sm"> <input type="text" autocomplete="off" value="" class="validate[maxSize[50]] form-control" th:value="${startTime}" name="startTime" id="startTime" placeholder="寮�濮嬫椂闂�" style="margin-right:5px;"> diff --git a/src/main/resources/templates/common/aside.html b/src/main/resources/templates/common/aside.html index cf47d75..e3fe256 100644 --- a/src/main/resources/templates/common/aside.html +++ b/src/main/resources/templates/common/aside.html @@ -414,15 +414,15 @@ </a> </li> - <th:block th:if="${#strings.startsWith(session.menuActive,'8')}"> + <th:block th:if="${#strings.startsWith(session.menuActive,'c')}"> <li class="nav-item has-treeview menu-open"> <a href="javascript:void(0);" class="nav-link active"> </th:block> - <th:block th:unless="${#strings.startsWith(session.menuActive,'8')}"> + <th:block th:unless="${#strings.startsWith(session.menuActive,'c')}"> <li class="nav-item has-treeview"> <a href="javascript:void(0);" class="nav-link"> </th:block> - <i class="nav-icon fas fa-network-wired"></i> + <i class="nav-icon fas fa-table"></i> <p title="宸℃绠$悊"> 宸℃绠$悊 <i class="fas fa-angle-left right"></i> @@ -430,10 +430,10 @@ </a> <ul class="nav nav-treeview"> <li class="nav-item"> - <th:block th:if="${session.menuActive eq '81'}"> + <th:block th:if="${session.menuActive eq 'c1'}"> <a th:href="@{'/inspectionTask/list'}" class="nav-link active"> </th:block> - <th:block th:unless="${session.menuActive eq '81'}"> + <th:block th:unless="${session.menuActive eq 'c1'}"> <a th:href="@{'/inspectionTask/list'}" class="nav-link"> </th:block> <i class="nav-icon far fa-circle text-info"></i> @@ -441,10 +441,10 @@ </a> </li> <li class="nav-item"> - <th:block th:if="${session.menuActive eq '82'}"> + <th:block th:if="${session.menuActive eq 'c2'}"> <a th:href="@{'/failurelogging/list'}" class="nav-link active"> </th:block> - <th:block th:unless="${session.menuActive eq '82'}"> + <th:block th:unless="${session.menuActive eq 'c2'}"> <a th:href="@{'/failurelogging/list'}" class="nav-link"> </th:block> <i class="far fa-circle nav-icon"></i> diff --git a/src/main/resources/templates/common/footer.html b/src/main/resources/templates/common/footer.html index 8e9c1c3..0909c1e 100644 --- a/src/main/resources/templates/common/footer.html +++ b/src/main/resources/templates/common/footer.html @@ -89,7 +89,7 @@ } if(confirm('浣犵‘瀹氳鍒犻櫎鎵�閫夋暟鎹悧锛�')) { var vals = chk_value.join(","); - $.ajax("/wgcloud"+url,{ + $.ajax("/tssw"+url,{ type:"post", data:{"id":vals}, success:function(data){ @@ -105,7 +105,7 @@ //璺宠浆鍒扮郴缁熸棩蹇楁煡璇� function goHrefLogInfo(param) { - window.location.href = "/wgcloud/log/list?hostname="+param; + window.location.href = "/tssw/log/list?hostname="+param; } //鍚敤寮瑰嚭妗唒opover diff --git a/src/main/resources/templates/common/footerDashView.html b/src/main/resources/templates/common/footerDashView.html index d1dabf8..56c6c05 100644 --- a/src/main/resources/templates/common/footerDashView.html +++ b/src/main/resources/templates/common/footerDashView.html @@ -2,7 +2,7 @@ <footer class="main-footer" style="margin-left: 10px"> <input type="hidden" id="serverInfoIdentify" th:value="${application.serverInfoId}"/> <th:block th:if="${application.copyRight eq 'true'}"> - <strong>Copyright ©2017-<span id="copyyear">now</span> <a target="_blank" href="http://www.wgstart.com">www.wgstart.com</a>.</strong> + <strong>Copyright ©2017-<span id="copyyear">now</span> <a target="_blank" href="http://www.10086.cn">涓浗绉诲姩</a></strong> All Rights Reserved. </th:block> <th:block th:if="${application.copyRight eq 'false'}"> </th:block> @@ -69,4 +69,4 @@ toastr.options.timeOut = 15000; //鍚敤寮瑰嚭妗唒opover $("[data-toggle='popover']").popover(); -</script> \ No newline at end of file +</script> diff --git a/src/main/resources/templates/common/navbar.html b/src/main/resources/templates/common/navbar.html index d1cf428..aa6c777 100644 --- a/src/main/resources/templates/common/navbar.html +++ b/src/main/resources/templates/common/navbar.html @@ -50,7 +50,7 @@ </th:block> </li> <li class="nav-item dropdown"> - <a class="nav-link" style="cursor:pointer;" title="閫�鍑�" data-toggle="dropdown" onclick="javascript:window.location.href='/wgcloud/login/loginOut';" > + <a class="nav-link" style="cursor:pointer;" title="閫�鍑�" data-toggle="dropdown" onclick="javascript:window.location.href='/tssw/login/loginOut';" > <i class="fa fa-window-close"></i> </a> </li> @@ -62,4 +62,4 @@ </ul> </nav> -<!-- /.navbar --> \ No newline at end of file +<!-- /.navbar --> diff --git a/src/main/resources/templates/customInfo/add.html b/src/main/resources/templates/customInfo/add.html index ab46a0e..8f9d301 100644 --- a/src/main/resources/templates/customInfo/add.html +++ b/src/main/resources/templates/customInfo/add.html @@ -69,7 +69,7 @@ </div> <div class="form-group"> <label><font color="red">*</font>鑷畾涔夌洃鎺ч」鎵ц鐨勬寚浠ゆ垨鑴氭湰<span class="text-muted" th:text="${blockStr}">鏁忔劅瀛楃涓茶繃婊�</span></label> - <input type="text" autocomplete="off" th:value="${customInfo.customShell}" class="validate[required,maxSize[255]] form-control" name="customShell" id="customShell" placeholder="濡�:/wgcloud/fileCount.sh"> + <input type="text" autocomplete="off" th:value="${customInfo.customShell}" class="validate[required,maxSize[255]] form-control" name="customShell" id="customShell" placeholder="濡�:/tssw/fileCount.sh"> </div> <div class="form-group"> <label >鍛婅琛ㄨ揪寮�<span class="text-muted">锛堣〃杈惧紡鎴愮珛鏃跺嵆鍛婅锛屼笉鎴愮珛涓嶅憡璀︼紝濡傦細<code class="highlighter-rouge" style="font-size:100%">result>=100</code>锛屽叾涓�<code class="highlighter-rouge" style="font-size:100%">result</code>涓哄浐瀹氬啓娉曪紝鏍囪瘑涓轰笂闈㈢殑鎸囦护鎴栬剼鏈緭鍑虹粨鏋滃��(绯荤粺浼氳嚜鍔ㄦ浛鎹负鏁板��)锛屾敞鎰忚〃杈惧紡闇�涓鸿嫳鏂囪緭鍏ユ硶鎷煎啓锛�</span></label> diff --git a/src/main/resources/templates/dashView/index.html b/src/main/resources/templates/dashView/index.html index e83265d..1cb5327 100644 --- a/src/main/resources/templates/dashView/index.html +++ b/src/main/resources/templates/dashView/index.html @@ -31,7 +31,7 @@ </span> </li> <li class="breadcrumb-item active">鐩戞帶姒傝</li> - <li class="breadcrumb-item "><a href="/wgcloud/systemInfo/systemInfoList?dashView=1">涓绘満鍒楄〃</a></li> + <li class="breadcrumb-item "><a href="/tssw/systemInfo/systemInfoList?dashView=1">涓绘満鍒楄〃</a></li> <!--<li class="breadcrumb-item active"><a target="_blank" href="https://www.wgstart.com/elasticsearch-head/index.html">ES鐩戞帶宸ュ叿</a></li>--> </ol> </div><!-- /.col --> @@ -68,7 +68,7 @@ <p>鐩戞帶杩涚▼</p> </div> <div class="icon"> - <i class="ion " style="opacity:0.6; filter: alpha(opacity=60);"><img src="/wgcloud/static/images/jincheng.png"/></i> + <i class="ion " style="opacity:0.6; filter: alpha(opacity=60);"><img src="/tssw/static/images/jincheng.png"/></i> </div> </div> </div> @@ -88,7 +88,7 @@ <p>DOCKER</p> </div> <div class="icon"> - <i class="ion " style="opacity:0.6; filter: alpha(opacity=60);"><img src="/wgcloud/static/images/docker.png"/></i> + <i class="ion " style="opacity:0.6; filter: alpha(opacity=60);"><img src="/tssw/static/images/docker.png"/></i> </div> </div> </div> @@ -108,7 +108,7 @@ <p>鏁版嵁婧�</p> </div> <div class="icon"> - <i class="ion " style="opacity:0.6; filter: alpha(opacity=60);"><img src="/wgcloud/static/images/db.png"/></i> + <i class="ion " style="opacity:0.6; filter: alpha(opacity=60);"><img src="/tssw/static/images/db.png"/></i> </div> </div> </div> @@ -127,7 +127,7 @@ <p>鏁伴�歅ING璁惧</p> </div> <div class="icon"> - <i class="ion " style="opacity:0.6; filter: alpha(opacity=60);"><img src="/wgcloud/static/images/yun.png"/></i> + <i class="ion " style="opacity:0.6; filter: alpha(opacity=60);"><img src="/tssw/static/images/yun.png"/></i> </div> </div> </div> @@ -145,7 +145,7 @@ <p>鏃ュ織鐩戞帶</p> </div> <div class="icon"> - <i class="ion " style="opacity:0.6; filter: alpha(opacity=60);"><img src="/wgcloud/static/images/log.png"/></i> + <i class="ion " style="opacity:0.6; filter: alpha(opacity=60);"><img src="/tssw/static/images/log.png"/></i> </div> </div> </div> @@ -165,7 +165,7 @@ <p>鏈嶅姟鎺ュ彛</p> </div> <div class="icon"> - <i class="ion " style="opacity:0.6; filter: alpha(opacity=60);"><img src="/wgcloud/static/images/api.png"/></i> + <i class="ion " style="opacity:0.6; filter: alpha(opacity=60);"><img src="/tssw/static/images/api.png"/></i> </div> </div> </div> @@ -185,7 +185,7 @@ <p>鐩戞帶涓绘満</p> </div> <div class="icon"> - <i class="ion " style="opacity:0.6; filter: alpha(opacity=60);"><img src="/wgcloud/static/images/pc.png"/></i> + <i class="ion " style="opacity:0.6; filter: alpha(opacity=60);"><img src="/tssw/static/images/pc.png"/></i> </div> </div> </div> @@ -205,7 +205,7 @@ <p>绔彛鐩戞帶</p> </div> <div class="icon"> - <i class="ion " style="opacity:0.6; filter: alpha(opacity=60);"><img src="/wgcloud/static/images/telnet.png"/></i> + <i class="ion " style="opacity:0.6; filter: alpha(opacity=60);"><img src="/tssw/static/images/telnet.png"/></i> </div> </div> </div> diff --git a/src/main/resources/templates/dashView/list.html b/src/main/resources/templates/dashView/list.html index 27d0257..f68917e 100644 --- a/src/main/resources/templates/dashView/list.html +++ b/src/main/resources/templates/dashView/list.html @@ -30,8 +30,8 @@ <i style="font-size:0.95rem;" class="far fa-bell-slash"></i> </span> </li> - <li class="breadcrumb-item "><a href="/wgcloud/dash/main?dashView=1">鐩戞帶姒傝</a></li> - <li class="breadcrumb-item "><a href="/wgcloud/systemInfo/systemInfoList?dashView=1">涓绘満鍒楄〃</a></li> + <li class="breadcrumb-item "><a href="/tssw/dash/main?dashView=1">鐩戞帶姒傝</a></li> + <li class="breadcrumb-item "><a href="/tssw/systemInfo/systemInfoList?dashView=1">涓绘満鍒楄〃</a></li> <!-- <li class="breadcrumb-item active"><a target="_blank" href="https://www.wgstart.com/elasticsearch-head/index.html">ES鐩戞帶宸ュ叿</a></li>--> </ol> </div> diff --git a/src/main/resources/templates/dashView/viewChart.html b/src/main/resources/templates/dashView/viewChart.html index f0d4cbb..f741bdb 100644 --- a/src/main/resources/templates/dashView/viewChart.html +++ b/src/main/resources/templates/dashView/viewChart.html @@ -32,8 +32,8 @@ <i style="font-size:0.95rem;" class="far fa-bell-slash"></i> </span> </li> - <li class="breadcrumb-item "><a href="/wgcloud/dash/main?dashView=1">鐩戞帶姒傝</a></li> - <li class="breadcrumb-item "><a href="/wgcloud/systemInfo/systemInfoList?dashView=1">涓绘満鍒楄〃</a></li> + <li class="breadcrumb-item "><a href="/tssw/dash/main?dashView=1">鐩戞帶姒傝</a></li> + <li class="breadcrumb-item "><a href="/tssw/systemInfo/systemInfoList?dashView=1">涓绘満鍒楄〃</a></li> <!-- <li class="breadcrumb-item active"><a target="_blank" href="https://www.wgstart.com/elasticsearch-head/index.html">ES鐩戞帶宸ュ叿</a></li>--> </ol> </div> diff --git a/src/main/resources/templates/dce/view.html b/src/main/resources/templates/dce/view.html index 51bc6ae..8d97801 100644 --- a/src/main/resources/templates/dce/view.html +++ b/src/main/resources/templates/dce/view.html @@ -74,7 +74,7 @@ </th:block> <td width="10%"> - <form class="form-inline ml-3 float-sm-right" action="/wgcloud/dceInfo/view"> + <form class="form-inline ml-3 float-sm-right" action="/tssw/dceInfo/view"> <input type="hidden" name="id" th:value="${dceInfo.id}"/> <div class="input-group input-group-sm"> <input type="text" autocomplete="off" value="" class="validate[maxSize[50]] form-control" th:value="${startTime}" name="startTime" id="startTime" placeholder="寮�濮嬫椂闂�" style="margin-right:5px;"> diff --git a/src/main/resources/templates/docker/view.html b/src/main/resources/templates/docker/view.html index 867dd63..58293fa 100644 --- a/src/main/resources/templates/docker/view.html +++ b/src/main/resources/templates/docker/view.html @@ -74,7 +74,7 @@ </th:block> <td width="10%"> - <form class="form-inline ml-3 float-sm-right" action="/wgcloud/dockerInfo/view"> + <form class="form-inline ml-3 float-sm-right" action="/tssw/dockerInfo/view"> <input type="hidden" name="id" th:value="${dockerInfo.id}"/> <div class="input-group input-group-sm"> <input type="text" autocomplete="off" value="" class="validate[maxSize[50]] form-control" th:value="${startTime}" name="startTime" id="startTime" placeholder="寮�濮嬫椂闂�" style="margin-right:5px;"> diff --git a/src/main/resources/templates/failurelogging/add.html b/src/main/resources/templates/failog/add.html similarity index 100% rename from src/main/resources/templates/failurelogging/add.html rename to src/main/resources/templates/failog/add.html diff --git a/src/main/resources/templates/failurelogging/list.html b/src/main/resources/templates/failog/list.html similarity index 100% rename from src/main/resources/templates/failurelogging/list.html rename to src/main/resources/templates/failog/list.html diff --git a/src/main/resources/templates/failurelogging/view.html b/src/main/resources/templates/failog/view.html similarity index 100% rename from src/main/resources/templates/failurelogging/view.html rename to src/main/resources/templates/failog/view.html diff --git a/src/main/resources/templates/heath/add.html b/src/main/resources/templates/heath/add.html index 9393f4c..9b2e112 100644 --- a/src/main/resources/templates/heath/add.html +++ b/src/main/resources/templates/heath/add.html @@ -56,7 +56,7 @@ </div> <div class="form-group"> <label><font color="red">*</font>鏈嶅姟鎺ュ彛URL<span class="text-muted">锛圲RL闇�涓篽ttp鎴杊ttps鎺ュ彛锛�</span></label> - <input type="text" autocomplete="off" th:value="${heathMonitor.heathUrl}" class="validate[required,maxSize[255]] form-control" name="heathUrl" id="heathUrl" placeholder="濡俬ttp://192.168.1.1:9999/wgcloud/heath"> + <input type="text" autocomplete="off" th:value="${heathMonitor.heathUrl}" class="validate[required,maxSize[255]] form-control" name="heathUrl" id="heathUrl" placeholder="濡俬ttp://192.168.1.1:9999/tssw/heath"> </div> <div class="form-group clearfix"> <label><font color="red">*</font>鎺ュ彛璇锋眰鏂瑰紡</label></br> diff --git a/src/main/resources/templates/host/list.html b/src/main/resources/templates/host/list.html index 41fd830..503e6ab 100644 --- a/src/main/resources/templates/host/list.html +++ b/src/main/resources/templates/host/list.html @@ -224,8 +224,8 @@ <th th:if="${application.hostGroup == 'true'}">鍒嗙粍</th> </th:block> <th:block th:unless="${#strings.indexOf(session.HostListHideColsInfo ,'13') > -1 }"> - <th th:if="${application.userInfoManage == 'true' && session.LOGIN_KEY.role == 'admin'}">璐﹀彿</th> - </th:block> +<!-- <th th:if="${application.userInfoManage == 'true' && session.LOGIN_KEY.role == 'admin'}">璐﹀彿</th>--> +<!-- </th:block>--> <th:block th:unless="${#strings.indexOf(session.HostListHideColsInfo ,'15') > -1 }"> <th>澶囨敞</th> </th:block> diff --git a/src/main/resources/templates/host/viewChart.html b/src/main/resources/templates/host/viewChart.html index ef5912e..66f7c86 100644 --- a/src/main/resources/templates/host/viewChart.html +++ b/src/main/resources/templates/host/viewChart.html @@ -65,7 +65,7 @@ </th:block> <td width="10%"> - <form class="form-inline ml-3 float-sm-right" action="/wgcloud/systemInfo/chart"> + <form class="form-inline ml-3 float-sm-right" action="/tssw/systemInfo/chart"> <input type="hidden" name="id" th:value="${systemInfo.id}"/> <div class="input-group input-group-sm"> <input type="text" autocomplete="off" value="" class="validate[maxSize[50]] form-control" th:value="${startTime}" name="startTime" id="startTime" placeholder="寮�濮嬫椂闂�" style="margin-right:5px;"> diff --git a/src/main/resources/templates/inspectiontask/add.html b/src/main/resources/templates/instask/add.html similarity index 100% rename from src/main/resources/templates/inspectiontask/add.html rename to src/main/resources/templates/instask/add.html diff --git a/src/main/resources/templates/inspectiontask/infoedit.html b/src/main/resources/templates/instask/infoedit.html similarity index 100% rename from src/main/resources/templates/inspectiontask/infoedit.html rename to src/main/resources/templates/instask/infoedit.html diff --git a/src/main/resources/templates/inspectiontask/taskinfo.html b/src/main/resources/templates/instask/taskinfo.html similarity index 100% rename from src/main/resources/templates/inspectiontask/taskinfo.html rename to src/main/resources/templates/instask/taskinfo.html diff --git a/src/main/resources/templates/inspectiontask/list.html b/src/main/resources/templates/instask/tasklist.html similarity index 100% rename from src/main/resources/templates/inspectiontask/list.html rename to src/main/resources/templates/instask/tasklist.html diff --git a/src/main/resources/templates/inspectiontask/view.html b/src/main/resources/templates/instask/view.html similarity index 100% rename from src/main/resources/templates/inspectiontask/view.html rename to src/main/resources/templates/instask/view.html diff --git a/src/main/resources/templates/mail/view.html b/src/main/resources/templates/mail/view.html index 2c918f1..499cc37 100644 --- a/src/main/resources/templates/mail/view.html +++ b/src/main/resources/templates/mail/view.html @@ -148,13 +148,13 @@ }); function test() { - $("#form1").attr("action","/wgcloud/mailset/test"); + $("#form1").attr("action","/tssw/mailset/test"); $("#form1").submit(); } function del(id) { if(confirm('浣犵‘瀹氳鍒犻櫎鍚楋紵')){ - window.location.href = "/wgcloud/mailset/del?id="+id; + window.location.href = "/tssw/mailset/del?id="+id; } } diff --git a/src/main/resources/templates/mysql/addDb.html b/src/main/resources/templates/mysql/addDb.html index 1d24a8c..9b43040 100644 --- a/src/main/resources/templates/mysql/addDb.html +++ b/src/main/resources/templates/mysql/addDb.html @@ -151,12 +151,12 @@ } }); function onSubmit() { - $("#form1").attr("action","/wgcloud/dbInfo/save"); + $("#form1").attr("action","/tssw/dbInfo/save"); return true; } function test(){ - $("#form1").attr("action","/wgcloud/dbInfo/validate"); + $("#form1").attr("action","/tssw/dbInfo/validate"); $("#form1").ajaxSubmit(function(message) { var msg = JSON.parse(message); if(msg.code!=""){ diff --git a/src/main/resources/templates/mysql/addTable.html b/src/main/resources/templates/mysql/addTable.html index 7fd3593..f72feff 100644 --- a/src/main/resources/templates/mysql/addTable.html +++ b/src/main/resources/templates/mysql/addTable.html @@ -147,7 +147,7 @@ }); function goback() { - window.location.href = "/wgcloud/dbTable/list"; + window.location.href = "/tssw/dbTable/list"; } var msg = [[${msg}]]; if(msg!='' && msg!=null){ diff --git a/src/main/resources/templates/mysql/tableView.html b/src/main/resources/templates/mysql/tableView.html index 27a1355..af5b898 100644 --- a/src/main/resources/templates/mysql/tableView.html +++ b/src/main/resources/templates/mysql/tableView.html @@ -71,7 +71,7 @@ </th:block> <td width="10%"> - <form class="form-inline ml-3 float-sm-right" action="/wgcloud/dbTable/viewChart"> + <form class="form-inline ml-3 float-sm-right" action="/tssw/dbTable/viewChart"> <input type="hidden" name="id" th:value="${dbTable.id}"/> <div class="input-group input-group-sm"> <input type="text" autocomplete="off" value="" class="validate[maxSize[50]] form-control" th:value="${startTime}" name="startTime" id="startTime" placeholder="寮�濮嬫椂闂�" style="margin-right:5px;"> diff --git a/src/main/resources/templates/shellInfo/add.html b/src/main/resources/templates/shellInfo/add.html index df7877a..160b070 100644 --- a/src/main/resources/templates/shellInfo/add.html +++ b/src/main/resources/templates/shellInfo/add.html @@ -59,7 +59,7 @@ </div> <div class="form-group"> <label><font color="red">*</font>涓嬪彂鎸囦护<span class="text-muted" th:text="${blockStr}">鏁忔劅瀛楃涓茶繃婊�</span></label> - <input type="text" autocomplete="off" th:value="${shellInfo.shell}" class="validate[required,maxSize[500]] form-control" name="shell" id="shell" placeholder="濡傦細/home/wgcloud/agent/start.sh"> + <input type="text" autocomplete="off" th:value="${shellInfo.shell}" class="validate[required,maxSize[500]] form-control" name="shell" id="shell" placeholder="濡傦細/home/tssw/agent/start.sh"> </div> <div class="form-group clearfix"> <label><font color="red">*</font>涓嬪彂鏃堕棿</label></br> -- Gitblit v1.9.1