From f87b73a14f758009e97c265f4476dca0f42794c5 Mon Sep 17 00:00:00 2001
From: adler <1101635162@qq.com>
Date: Fri, 22 Jan 2021 15:42:19 +0800
Subject: [PATCH] =?UTF-8?q?:wrench:=20=E4=BF=AE=E5=A4=8D=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=87=8D=E8=BD=BD=E6=8C=89=E9=92=AE=E4=B8=8D?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8=E7=9A=84Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 27 +++++++++----------
 .../picuang/controller/admin/Admin.java       |  4 +--
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d627ab4..32d3d4e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,12 +4,9 @@
     <option name="autoReloadType" value="ALL" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="b87d8c55-1834-406c-9684-18f017a5d2d4" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/main/resources/static/background/load.gif" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/static/js/lazyload.min.js" afterDir="false" />
+    <list default="true" id="b87d8c55-1834-406c-9684-18f017a5d2d4" name="Default Changelist" comment=":wrench: “历史”使用lazyload，减轻服务端压力">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/static/js/history/histories.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/js/history/histories.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/history.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/history.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/pers/adlered/picuang/controller/admin/Admin.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/pers/adlered/picuang/controller/admin/Admin.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -463,13 +460,6 @@
       <workItem from="1574904798453" duration="7969000" />
       <workItem from="1611135187063" duration="1247000" />
     </task>
-    <task id="LOCAL-00024" summary="去掉“其它图片不受影响”">
-      <created>1573104094159</created>
-      <option name="number" value="00024" />
-      <option name="presentableId" value="LOCAL-00024" />
-      <option name="project" value="LOCAL" />
-      <updated>1573104094159</updated>
-    </task>
     <task id="LOCAL-00025" summary="站内提醒favicon">
       <created>1573104289802</created>
       <option name="number" value="00025" />
@@ -806,7 +796,14 @@
       <option name="project" value="LOCAL" />
       <updated>1611298590880</updated>
     </task>
-    <option name="localTasksCounter" value="73" />
+    <task id="LOCAL-00073" summary=":wrench: “历史”使用lazyload，减轻服务端压力">
+      <created>1611300273158</created>
+      <option name="number" value="00073" />
+      <option name="presentableId" value="LOCAL-00073" />
+      <option name="project" value="LOCAL" />
+      <updated>1611300273158</updated>
+    </task>
+    <option name="localTasksCounter" value="74" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -843,7 +840,6 @@
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="CHECK_NEW_TODO" value="false" />
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="config.ini数据安全性" />
     <MESSAGE value="Prop启动时自动生成" />
     <MESSAGE value="Update README" />
     <MESSAGE value="修改版本号" />
@@ -868,7 +864,8 @@
     <MESSAGE value=":wrench: 修复静态资源为绝对目录导致Picuang在子目录无法正常加载的问题" />
     <MESSAGE value=":art: 提供以管理员身份校验的上传接口（适配作为第三方图床的需求）" />
     <MESSAGE value=":art: UI调优" />
-    <option name="LAST_COMMIT_MESSAGE" value=":art: UI调优" />
+    <MESSAGE value=":wrench: “历史”使用lazyload，减轻服务端压力" />
+    <option name="LAST_COMMIT_MESSAGE" value=":wrench: “历史”使用lazyload，减轻服务端压力" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
diff --git a/src/main/java/pers/adlered/picuang/controller/admin/Admin.java b/src/main/java/pers/adlered/picuang/controller/admin/Admin.java
index 4cf9566..531904f 100644
--- a/src/main/java/pers/adlered/picuang/controller/admin/Admin.java
+++ b/src/main/java/pers/adlered/picuang/controller/admin/Admin.java
@@ -36,8 +36,8 @@ private String checkVersion() {
         } else {
             return "<div class='alert alert-danger' style='text-shadow: none; margin: 0px 0px 0px'>请注意! 您的Picuang配置文件来自旧版 (" + realVersion + ")<br>" +
                     "请将旧配置文件<br>" + ToolBox.getINIDir() + "<br>备份并删除, 重启Picuang服务端或点击\"生成新配置文件\"按钮使Picuang重新生成一个新版的配置文件; <br>" +
-                    "再对照自动生成的新版本 (" + neededVersion + ") 配置文件, 将您备份的旧版配置文件中的数据替换 (除了version以外), 然后点击下方\"重载\"按钮. <br>" +
-                    "如果您不想更新配置文件, 但想去除本通知, 请将 config.ini 中的 version 值修改为: \"" + neededVersion + "\" , 然后点击下方\"重载\"按钮. </div>" +
+                    "再对照自动生成的新版本 (" + neededVersion + ") 配置文件, 将您备份的旧版配置文件中的数据替换 (除了version以外), 然后点击下方\"重载\"按钮.</div><br>" +
+                    "<button class=\"btn btn-success\" onclick=\"reloadServer()\" type=\"button\" style='margin-top: 16px'>重载</button>" +
                     "<hr color='#6f5499' size='3' style='filter: alpha(opacity=100,finishopacity=0,style=3); margin-top: 36px; margin-bottom: 36px;' width='95%'/>";
         }
     }