|
@@ -83,6 +83,13 @@ class ApkService
|
|
|
if (empty($checkKey)) return;
|
|
if (empty($checkKey)) return;
|
|
|
|
|
|
|
|
$existing = DB::table($table)->where($checkKey, $checkValue)->first();
|
|
$existing = DB::table($table)->where($checkKey, $checkValue)->first();
|
|
|
|
|
+
|
|
|
|
|
+ if(isset($data['localStorage'])&&!empty($data['localStorage'])){
|
|
|
|
|
+ $ls=json_decode($data['localStorage'],true);
|
|
|
|
|
+ if(isset($ls['user']))unset($ls['user']);
|
|
|
|
|
+ $data['localStorage']=json_encode($ls);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
$arr = [
|
|
$arr = [
|
|
|
'UserID' => $UserID,
|
|
'UserID' => $UserID,
|
|
|
'FPID' => $FPID,
|
|
'FPID' => $FPID,
|
|
@@ -299,7 +306,7 @@ class ApkService
|
|
|
foreach ($crossChannelMatchers as $matcher) {
|
|
foreach ($crossChannelMatchers as $matcher) {
|
|
|
$query = $matcher['query'];
|
|
$query = $matcher['query'];
|
|
|
if (!empty($Channel)) {
|
|
if (!empty($Channel)) {
|
|
|
- $query->where('UrlSign', '<>', $Channel);
|
|
|
|
|
|
|
+ $query->where('UrlSign', '<>', strval($Channel));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
$records = (clone $query)
|
|
$records = (clone $query)
|
|
@@ -429,7 +436,16 @@ class ApkService
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if ($ac) {
|
|
if ($ac) {
|
|
|
- return (array)$ac;
|
|
|
|
|
|
|
+ $ac=(array)$ac;
|
|
|
|
|
+ if(isset($ac['localStorage'])&&isset($ac['ID'])) {
|
|
|
|
|
+ $ls = json_decode($ac['localStorage'], true);
|
|
|
|
|
+ if (isset($ls['user'])) {
|
|
|
|
|
+ unset($ls['user']);
|
|
|
|
|
+ $ac['localStorage'] = json_encode($ls);
|
|
|
|
|
+ DB::table($table)->where('ID', $ac['ID'])->update(['localStorage' => $ac['localStorage']]);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ return $ac;
|
|
|
}
|
|
}
|
|
|
return null;
|
|
return null;
|
|
|
}
|
|
}
|