Merge remote-tracking branch 'origin/master'

admin

2019-04-01 6f87d14a23a0d054d528209b9ac035dcdb947cc4

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/TBPidServiceImpl.java

@@ -25,6 +25,7 @@
import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

import com.yeshi.fanli.service.inter.user.TBPidService;

import com.yeshi.fanli.util.Constant;



import net.sf.json.JSONObject;



@@ -352,4 +353,12 @@
         }

      }

   }



   @Override

   public ClientTBPid getSharePid() {

      String pid = Constant.TAOBAO_RELATION_PID_DEFAULT;

      ClientTBPid clientTBPid = new ClientTBPid(Constant.TAOBAO_AUTH_APPKEY, pid, pid.split("_")[2],

            pid.split("_")[3]);

      return clientTBPid;

   }

}