Merge remote-tracking branch 'origin/master'

admin

2019-07-22 a8c566a3b274058fe31feaf8e980b2334b9bf83a

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

@@ -151,7 +151,9 @@
                  }

               }

            });



				
            //稍作延迟

            Thread.sleep(50);

         } else if ("zigou".equalsIgnoreCase(source)) {

            String specialId = null;



@@ -192,6 +194,8 @@
                  }

               }

            });

            //稍作延迟

            Thread.sleep(50);



         } else if ("bind".equalsIgnoreCase(source)) {