Skip to content

Commit 3932877

Browse files
committed
fix(repo): 处理上传中的特殊字符,'\n'
1 parent db8ca52 commit 3932877

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

laravel/app/Http/Repository/MultithreadingRepository.php

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,8 @@ public function loadExcel()
117117
$params = [];
118118
for ($i = 'A'; $i <= $highestColumn; $i++) {
119119
$val = $sheet->getCell($i.'1')->getValue();
120-
$params[$i] = (is_object($val)) ? trim($val->__toString()) : trim($val);
120+
$str = (is_object($val)) ? trim($val->__toString()) : trim($val);
121+
$params[$i] = str_replace(["\n", "\r\n", " "], '', $str);
121122
}
122123
$dataSet['param'] = array_values($params);
123124

@@ -130,7 +131,8 @@ public function loadExcel()
130131
// }
131132
foreach ($params as $key => $param) {
132133
$value = $sheet->getCell($key.$row)->getValue();
133-
$dataSet['data'][$row - 2][$param] = (is_object($value)) ? trim($value->__toString()) : trim($value);
134+
$str = (is_object($value)) ? trim($value->__toString()) : trim($value);
135+
$dataSet['data'][$row - 2][$param] = str_replace(["\n", "\r\n", " "], '', $str);
134136
}
135137

136138
}
@@ -261,7 +263,8 @@ public function newRequest($url, $appkey)
261263
continue;
262264
}
263265
// TODO: 还需要校验请求参数合法性, 如只允许的参数: idcard,realname,bankcard,mobile
264-
$newParam[$ke] = (is_object($param)) ? trim($param->__toString()) : trim($param);
266+
$str = (is_object($param)) ? trim($param->__toString()) : trim($param);
267+
$newParam[$ke] = str_replace(["\n", "\r\n", " "], '', $str);
265268
}
266269
$this->dataSet['param'] = $newParam;
267270

@@ -273,7 +276,8 @@ public function newRequest($url, $appkey)
273276
if (empty($vv)) {
274277
continue;
275278
}
276-
$temp[$dataSet['param'][$kk]] = (is_object($vv)) ? trim($vv->__toString()) : trim($vv);
279+
$str = (is_object($vv)) ? trim($vv->__toString()) : trim($vv);
280+
$temp[$this->dataSet['param'][$kk]] = str_replace(["\n", "\r\n", " "], '', $str);
277281
}
278282
if ($temp) {
279283
$newData[] = $temp;

0 commit comments

Comments
 (0)