Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

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

@@ -114,7 +114,7 @@
            String relationId = null;



            try {

               TaoKeApiUtil.getRelationId(accessToken, TaoBaoConstant.TAOBAO_AUTH_APPKEY,

               relationId=   TaoKeApiUtil.getRelationId(accessToken, TaoBaoConstant.TAOBAO_AUTH_APPKEY,

                     TaoBaoConstant.TAOBAO_AUTH_APPSECRET);// 渠道ID

            } catch (TaoBaoAuthException e) {

               if (e.getCode() == TaoBaoAuthException.CODE_NOT_REAL_NAME)

@@ -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)) {