Merge remote-tracking branch 'origin/div' into div

admin

2020-04-27 9327346e9566ac44456ed91d371f702cc4fea982

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

@@ -255,7 +255,7 @@
            System.out.println(st);

            contentDecode = st;



            contentDecode = contentDecode.substring(contentDecode.indexOf("mtopjsonp1(") + "mtopjsonp1(".length(),

            contentDecode = contentDecode.substring(contentDecode.indexOf("(") +1,

                  contentDecode.length()).trim();

            if (contentDecode.endsWith(")"))

               contentDecode = contentDecode.substring(0, contentDecode.length() - 1);