From 2bd40d3ec8a891a8d3002d1c4019041a54ce35c7 Mon Sep 17 00:00:00 2001
From: ruibaby <i@ryanc.cc>
Date: Sun, 3 Jun 2018 22:30:55 +0800
Subject: [PATCH] =?UTF-8?q?:alien:=20=E7=BB=86=E8=8A=82=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cc/ryanc/halo/utils/HaloUtils.java   | 27 ++++++++++---------
 .../web/controller/admin/PostController.java  |  4 +--
 .../resources/templates/admin/admin_post.ftl  |  4 +--
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/main/java/cc/ryanc/halo/utils/HaloUtils.java b/src/main/java/cc/ryanc/halo/utils/HaloUtils.java
index e8170cfc7..602afcba3 100755
--- a/src/main/java/cc/ryanc/halo/utils/HaloUtils.java
+++ b/src/main/java/cc/ryanc/halo/utils/HaloUtils.java
@@ -10,6 +10,7 @@ import com.sun.syndication.io.FeedException;
 import com.sun.syndication.io.WireFeedOutput;
 import io.github.biezhi.ome.OhMyEmail;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.util.ResourceUtils;
 
 import javax.imageio.ImageIO;
@@ -23,7 +24,6 @@ import java.io.*;
 import java.net.URI;
 import java.net.URL;
 import java.net.URLConnection;
-import java.security.MessageDigest;
 import java.text.SimpleDateFormat;
 import java.time.Instant;
 import java.time.ZoneId;
@@ -121,6 +121,9 @@ public class HaloUtils {
                 Theme theme = null;
                 for (File file : files) {
                     if (file.isDirectory()) {
+                        if (StringUtils.equals("__MACOSX", file.getName())) {
+                            continue;
+                        }
                         theme = new Theme();
                         theme.setThemeName(file.getName());
                         File optionsPath = new File(themesPath.getAbsolutePath(), file.getName() + "/module/options.ftl");
@@ -134,7 +137,7 @@ public class HaloUtils {
                 }
             }
         }catch (Exception e){
-            log.error("主题获取失败：{0}",e.getMessage());
+            log.error("主题获取失败：", e.getMessage());
         }
         return themes;
     }
@@ -170,7 +173,7 @@ public class HaloUtils {
                 }
             }
         }catch (Exception e){
-            log.error("未知错误：{0}",e.getMessage());
+            log.error("未知错误：", e.getMessage());
         }
         return tpls;
     }
@@ -191,7 +194,7 @@ public class HaloUtils {
             inputStream.close();
             return new String(fileContent,"UTF-8");
         }catch (Exception e){
-            log.error("读取模板文件错误：{0}",e.getMessage());
+            log.error("读取模板文件错误：", e.getMessage());
         }
         return null;
     }
@@ -220,14 +223,14 @@ public class HaloUtils {
      */
     public static String getIpAddr(HttpServletRequest request) {
         String ip = request.getHeader("x-forwarded-for");
-            if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-                ip = request.getHeader("Proxy-Client-IP");
-            }
-            if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-                ip = request.getHeader("WL-Proxy-Client-IP");
-            }
-            if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-                ip = request.getRemoteAddr();
+        if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("Proxy-Client-IP");
+        }
+        if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("WL-Proxy-Client-IP");
+        }
+        if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getRemoteAddr();
         }
         return ip;
     }
diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java
index 04292c0b1..0a0f83237 100755
--- a/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java
@@ -259,14 +259,14 @@ public class PostController extends BaseController{
      * @return 重定向到/admin/posts
      */
     @GetMapping("/throw")
-    public String moveToTrash(@RequestParam("postId") Long postId){
+    public String moveToTrash(@RequestParam("postId") Long postId,@RequestParam("status") Integer status){
         try{
             postService.updatePostStatus(postId,2);
             log.info("编号为"+postId+"的文章已被移到回收站");
         }catch (Exception e){
             log.error("未知错误：{0}",e.getMessage());
         }
-        return "redirect:/admin/posts";
+        return "redirect:/admin/posts?status="+status;
     }
 
     /**
diff --git a/src/main/resources/templates/admin/admin_post.ftl b/src/main/resources/templates/admin/admin_post.ftl
index 69177c30d..6ba2759e1 100755
--- a/src/main/resources/templates/admin/admin_post.ftl
+++ b/src/main/resources/templates/admin/admin_post.ftl
@@ -96,13 +96,13 @@
                                                         <#case 0>
                                                             <a href="/archives/${post.postUrl}" class="btn btn-primary btn-xs " target="_blank">查看</a>
                                                             <a href="/admin/posts/edit?postId=${post.postId?c}" class="btn btn-info btn-xs ">编辑</a>
-                                                            <button class="btn btn-danger btn-xs " onclick="modelShow('/admin/posts/throw?postId=${post.postId?c}','确定移到回收站？')">丢弃</button>
+                                                            <button class="btn btn-danger btn-xs " onclick="modelShow('/admin/posts/throw?postId=${post.postId?c}&status=0','确定移到回收站？')">丢弃</button>
                                                             <#break >
                                                         <#case 1>
                                                             <a href="/admin/posts/edit?postId=${post.postId?c}"
                                                                class="btn btn-info btn-xs ">编辑</a>
                                                             <button class="btn btn-primary btn-xs " onclick="modelShow('/admin/posts/revert?postId=${post.postId?c}&status=1','确定发布该文章？')">发布</button>
-                                                            <button class="btn btn-danger btn-xs " onclick="modelShow('/admin/posts/throw?postId=${post.postId?c}','确定移到回收站？')">丢弃</button>
+                                                            <button class="btn btn-danger btn-xs " onclick="modelShow('/admin/posts/throw?postId=${post.postId?c}&status=1','确定移到回收站？')">丢弃</button>
                                                             <#break >
                                                         <#case 2>
                                                             <a href="/admin/posts/revert?postId=${post.postId?c}&status=2" class="btn btn-primary btn-xs ">还原</a>