|
@@ -756,6 +756,7 @@ class ReadOauth
|
|
|
private function crmJump(Request $request,$uid,$en_distribution_channel_id){
|
|
|
$info = DB::table('crm_transfer')->where('from_uid',$uid)->where('is_enable',1)->select('to_uid')->first();
|
|
|
if(!$info)return '';
|
|
|
+
|
|
|
$uri = $request->input('_url');
|
|
|
if (strpos($uri, '/yun/') !== false) {
|
|
|
return '';
|
|
@@ -771,8 +772,8 @@ class ReadOauth
|
|
|
$nowurl = str_replace('http://', env('PROTOCOL') . '://', url()->current() . '?' . http_build_query($params));
|
|
|
$url_info = parse_url($nowurl);
|
|
|
|
|
|
- $domain = str_replace($en_distribution_channel_id,
|
|
|
- decodeDistributionChannelId(5204),$url_info['host']);
|
|
|
+ $domain = str_replace('site'.$en_distribution_channel_id,
|
|
|
+ 'site'.encodeDistributionChannelId(5204),$url_info['host']);
|
|
|
!isset($url_info['path'])&&$url_info['path'] = '/';
|
|
|
if($params){
|
|
|
$return_url = sprintf('%s://%s%s?%s',
|