bihuisong před 1 dnem
rodič
revize
f8219b7a62

+ 1 - 1
ruoyi-admin/pom.xml

@@ -8,7 +8,7 @@
         <version>4.7.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <packaging>jar</packaging>
+    <packaging>war</packaging>
     <artifactId>ruoyi-admin</artifactId>
 
     <description>

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SecurityController.java

@@ -63,7 +63,7 @@ public class SecurityController {
         //解密密码字符串
         String privateKey = redisService.getCacheObject("remoteSecretKey");
         try {
-            RsaUtil.decrypt(form.getUsername(), privateKey);
+            RsaUtil.decrypt(form.getPassword(), privateKey);
         } catch (Exception e) {
             return AjaxResult.error("获取token失败").put("data", null).put("code",40002);
         }

+ 2 - 2
ruoyi-admin/src/main/resources/templates/login.html

@@ -26,8 +26,8 @@
             <div class="col-sm-5"  style="margin-left: 200px">
                 <form id="signupForm" autocomplete="off">
                     <h4 class="no-margins" style="text-align: center">吉林市人民政府网站可视化监测</h4>
-                    <input type="text"     name="username" class="form-control uname"     placeholder="用户名" value="admin"    />
-                    <input type="password" name="password" class="form-control pword"     placeholder="密码"   value="admin123" />
+                    <input type="text"     name="username" class="form-control uname"     placeholder="用户名" value=""    />
+                    <input type="password" name="password" class="form-control pword"     placeholder="密码"   value="" />
 					<div class="row m-t" th:if="${captchaEnabled==true}">
 						<div class="col-xs-6">
 						    <input type="text" name="validateCode" class="form-control code" placeholder="验证码" maxlength="5" />

+ 16 - 16
ruoyi-admin/src/main/resources/templates/main.html

@@ -52,50 +52,50 @@
 <body class="gray-bg" style="background:#f3f3f4">
 <ul class="jilinKsh">
     <li id="clickOne">
-        <a href="http://localhost:16006/usability">
-            <img src="/img/zbjc.png">
+        <a href="http://175.22.1.26:16006/jl_visual_monitor/usability">
+            <img th:src="@{/img/zbjc.png}">
             <h4>网站可用性实时监测</h4>
         </a>
     </li>
     <li id="clickTwo">
-        <a href="http://localhost:16006/websiteAccess">
-            <img src="/img/fwl.png">
+        <a href="http://175.22.1.26:16006/jl_visual_monitor/websiteAccess">
+            <img th:src="@{/img/fwl.png}">
             <h4>网站访问情况监测</h4>
         </a>
     </li>
     <li id="clickThree">
-        <a href="http://localhost:16006/misunderstanding">
-            <img src="/img/cbz.png">
+        <a href="http://175.22.1.26:16006/jl_visual_monitor/misunderstanding">
+            <img th:src="@{/img/cbz.png}">
             <h4>网站错别字监测</h4>
         </a>
     </li>
     <li id="clickFour">
-        <a href="http://localhost:16006/staggeredChain">
-            <img src="/img/cl.png">
+        <a href="http://175.22.1.26:16006/jl_visual_monitor/staggeredChain">
+            <img th:src="@{/img/cl.png}">
             <h4>网站错误链接监测</h4>
         </a>
     </li>
     <li id="clickFive">
-        <a href="http://localhost:16006/censusIndicators">
-            <img src="/img/zbjc.png">
+        <a href="http://175.22.1.26:16006/jl_visual_monitor/censusIndicators">
+            <img th:src="@{/img/zbjc.png}">
             <h4>网站普查指标监测</h4>
         </a>
     </li>
     <li id="clickSix">
-        <a href="http://localhost:16006/dailyUpdateVolume">
-            <img src="/img/gx.png">
+        <a href="http://175.22.1.26:16006/jl_visual_monitor/dailyUpdateVolume">
+            <img th:src="@{/img/gx.png}">
             <h4>网站日更新量排行监测</h4>
         </a>
     </li>
     <li id="clickSeven">
-        <a href="http://localhost:16006/dailyVisits">
-            <img src="/img/fwl.png">
+        <a href="http://175.22.1.26:16006/jl_visual_monitor/dailyVisits">
+            <img th:src="@{/img/fwl.png}">
             <h4>网站日访问量排行监测</h4>
         </a>
     </li>
     <li id="clickEight">
-        <a href="http://localhost:16006/InteractiveColumns">
-            <img src="/img/lmgx.png">
+        <a href="http://175.22.1.26:16006/jl_visual_monitor/InteractiveColumns">
+            <img th:src="@{/img/lmgx.png}">
             <h4>网站互动类栏目更新监测</h4>
         </a>
     </li>

+ 12 - 12
ruoyi-admin/src/main/resources/templates/usability.html

@@ -5,8 +5,8 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>吉林市政府网站可用性实时监测</title>
-    <link rel="stylesheet" type="text/css" href="/style/html.css" />
-    <link rel="stylesheet" type="text/css" href="/style/base.css" />
+    <link rel="stylesheet" type="text/css" th:href="@{/style/html.css}" />
+    <link rel="stylesheet" type="text/css" th:href="@{/style/base.css}" />
 </head>
 <body class="black-bg">
     <!-- 头部 Start -->
@@ -35,7 +35,7 @@
 
        <!-- 正文 Start -->
        <div class="content">
-          <img class="x-line" src="img/bg-line.png" alt="">
+          <img class="x-line" th:src="@{img/bg-line.png}" alt="">
           <div class="content-list flex-row">
             <div class="content-list-left flex-col">
               <h4>可用性实时监测情况</h4>
@@ -50,8 +50,8 @@
                       <div class="w50"><span class="h-span" th:text="${item.siteName}"></span></div>
                       <div class="w25"><span class="h-span" th:text="${item.monitorTime}"></span></div>
                       <div class="w25"><span class="h-span" th:text="${item.status}"></span></div>
-                      <img class="table-triangle-top" src="img/triangle.png">
-                      <img class="table-triangle-btm" src="img/triangle.png">
+                      <img class="table-triangle-top" th:src="@{img/triangle.png}">
+                      <img class="table-triangle-btm" th:src="@{img/triangle.png}">
                   </li>
                 </ul>
               </div>
@@ -69,8 +69,8 @@
                         <div class="w50"><span class="h-span" th:text="${item.siteName}"></span></div>
                         <div class="w25"><span class="h-span" th:text="${item.lastMonitorTime}"></span></div>
                         <div class="w25"><span class="h-span" th:text="${item.accessCountFail}"></span></div>
-                        <img class="table-triangle-top" src="img/triangle.png">
-                        <img class="table-triangle-btm" src="img/triangle.png">
+                        <img class="table-triangle-top" th:src="@{img/triangle.png}">
+                        <img class="table-triangle-btm" th:src="@{img/triangle.png}">
                     </li>
 
                 </ul>
@@ -81,7 +81,7 @@
        <!-- 正文 End -->
     </div>
     <!-- 内容End -->
-    <script type="text/javascript" src="/js/socket.js"></script>
+    <script type="text/javascript" th:src="@{/js/socket.js}"></script>
     <script>
         socket.onMessage = function (res) {
             let message = []
@@ -98,8 +98,8 @@
                         `                  <div class="w50"><span>${message[i].siteName}</span></div>\n` +
                         `                  <div class="w15"><span>${message[i].monitorTime}</span></div>\n` +
                         `                  <div class="w15"><span>${message[i].status}</span></div>\n` +
-                        `                  <img class="table-triangle-top" src="img/triangle.png"/>\n` +
-                        `                  <img class="table-triangle-btm" src="img/triangle.png"/>\n` +
+                        `                  <img class="table-triangle-top" th:src="@{img/triangle.png}"/>\n` +
+                        `                  <img class="table-triangle-btm" th:src="@{img/triangle.png}"/>\n` +
                         `                </li>`
                 }
             }
@@ -116,8 +116,8 @@
                         `                  <div class=\"w20\"><span>${message[i].siteName}</span></div>\n` +
                         `                  <div class=\"w10\"><span>${message[i].lastMonitorTime}</span></div>\n` +
                         `                  <div class=\"w10 j-left\"><span>${message[i].accessCountFail}</span></div>\n` +
-                        `                  <img class="table-triangle-top" src="img/triangle.png">\n` +
-                        `                  <img class="table-triangle-btm" src="img/triangle.png">\n` +
+                        `                  <img class="table-triangle-top" th:src="@{img/triangle.png}">\n` +
+                        `                  <img class="table-triangle-btm" th:src="@{img/triangle.png}">\n` +
                         `                </li>`
                 }
             }