Merge branch 'master' of http://git.izouma.com/suochencheng/XiangJuWu

src/main/java/com/izouma/awesomeadmin/web/WeiXinController.java

@@ -74,7 +74,7 @@ public class WeiXinController extends BaseController {
     public ModelAndView redirectLogin(HttpServletRequest request, HttpServletResponse response,
                                       @RequestParam(required = true, value = "code") String code, @RequestParam(required = false, value = "redirectUri") String redirectUri) {
 
-        ModelAndView mav = new ModelAndView("redirect:"+ PropertiesFileLoader.getProperties("base_domain") +"/#/" + redirectUri);
+        ModelAndView mav = new ModelAndView("redirect:"+ PropertiesFileLoader.getProperties("base_domain") +"/index#/" + redirectUri);
         final String APP_ID = PropertiesFileLoader.getProperties("weixinappid");
         final String APP_SECRET = PropertiesFileLoader.getProperties("weixinsecret");
         try {
@@ -141,7 +141,7 @@ public class WeiXinController extends BaseController {
     public ModelAndView LoginService(HttpServletRequest request, HttpServletResponse response,
                                      @RequestParam(required = true, value = "code") String code) {
 
-        ModelAndView mav = new ModelAndView("redirect:../#/");
+        ModelAndView mav = new ModelAndView("redirect:../index#/");
         final String APP_ID = PropertiesFileLoader.getProperties("weixinappid");
         final String APP_SECRET = PropertiesFileLoader.getProperties("weixinsecret");
         try {