Merge remote-tracking branch 'origin/developer' into developer

src/main/java/com/caimei/www/controller/RedirectController.java

@@ -85,6 +85,15 @@ public class RedirectController {
         return "redirect:/page-"+id+".html";
     }
 
+    /**
+     * 文章搜索
+     * /info/search.shtml?kw=
+     */
+    @GetMapping("/info/search.shtml")
+    public String toArticleSearch(@RequestParam("kw") String keyword) {
+        return "redirect:/info/search-1.html?keyword=" + keyword;
+    }
+
     /**
      * 产品仪器
      */