Merge remote-tracking branch 'origin/master'

yujian

2019-07-12 9d8dfb01ff72c57abad3b80f3d65e81a5354db03

 fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java

@@ -248,10 +248,11 @@
      if ("2".equalsIgnoreCase(ios)) {

         down = DOWNURL;

      }

      if (!state.equals(wxState)) {// 不是微信返回的！

      if (state == null || !state.equals(wxState)) {// 不是微信返回的！

         // request.setAttribute("error", "1");

         return "redirect:" + down;

      }

		
      if (code == null) {// 用户取消了登陆！

         return "redirect:" + down;

      }