1 files changed, 12 insertions, 8 deletions
diff --git a/juick-spring-www/src/main/java/com/juick/www/controllers/IndexController.java b/juick-spring-www/src/main/java/com/juick/www/controllers/IndexController.java
index 54d83b61..87540795 100644
--- a/juick-spring-www/src/main/java/com/juick/www/controllers/IndexController.java
+++ b/juick-spring-www/src/main/java/com/juick/www/controllers/IndexController.java
@@ -7,7 +7,6 @@ import com.juick.service.TagService;
 import com.juick.service.UserService;
 import com.juick.util.UserUtils;
 import com.juick.www.util.EncodeUtils;
-import org.apache.commons.lang3.CharEncoding;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.context.MessageSource;
@@ -20,7 +19,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.inject.Inject;
 import java.io.IOException;
-import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -48,17 +46,23 @@ public class IndexController {
             @RequestParam(value = "search", required = false) String paramSearch,
             ModelMap model) throws IOException {
 
-        if (paramTagStr.isPresent())
-            return "redirect:/tag/" + URLEncoder.encode(paramTagStr.get(), CharEncoding.UTF_8);
+        int before = paramBefore.orElse(0);
+        String tag = paramTagStr.orElse(StringUtils.EMPTY);
+
+        if (StringUtils.isNotEmpty(tag)) {
+            StringBuilder builder = new StringBuilder();
+            builder.append("redirect:").append("/tag/").append(tag);
+            if (before > 0)
+                builder.append("?before=").append(before);
+            return builder.toString();
+        }
 
         if (StringUtils.isNotEmpty(paramSearch) && paramSearch.length() > 64)
-            paramSearch = "";
+            paramSearch = StringUtils.EMPTY;
 
         User visitor = UserUtils.getCurrentUser();
 
-        String title = "";
-
-        int before = paramBefore.orElse(0);
+        String title = StringUtils.EMPTY;
 
         List<Integer> mids = new ArrayList<>();