解决冲突

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/wx/QrCodeHandler.java

@@ -1,6 +1,7 @@
 package com.iamberry.wechat.handles.wx;
 
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
@@ -13,12 +14,12 @@ import java.io.IOException;
 /**
  * Created by Administrator on 2017/12/29.
  */
-@Controller("scanning")
+@Controller("scannQr")
 @RequestMapping("/wechat")
 public class QrCodeHandler {
 
-    @RequestMapping("/qr")
-    public void getQrCode(HttpServletRequest req, HttpServletResponse res)throws ServletException, IOException {
-        req.getRequestDispatcher("/WEB-INF/views/wechat/daili_order_list.html").forward(req,res);
+    @RequestMapping("/qr/{qrCode}")
+    public void getQrCode(@PathVariable("qrCode") String qrCode, HttpServletRequest req, HttpServletResponse res)throws ServletException, IOException {
+        res.sendRedirect("http://w.iamberry.com/tooth/view/default.html?qrCode="+qrCode);
     }
 }