Merge remote-tracking branch 'origin/master'

admin

2019-01-28 f7ed4e6bbe9be95d268481e66d70d90e70e07e12

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

@@ -68,20 +68,6 @@
      if (uid == null || uid.longValue() == 0L)

         errCode = 3;



      if (uid == 911382L) {

         try {

            if ("share".equalsIgnoreCase(source))



               response.sendRedirect("http://apph5.yeshitv.com/apppage/flq_bonusState.html?code=1");



            else

               response.sendRedirect("http://apph5.yeshitv.com/apppage/flq_rebateState.html?code=1");

         } catch (IOException e) {



         }

         return;

      }



      // 计入记录



      try {