panxiang/swiftadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复IP归属地为空报错

Browse Source
This commit is contained in:
Ying
2023-08-04 11:11:34 +08:00
parent 9eb00ad324
commit 70679398f7
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/admin/service/UserService.php
View File

@@ -57,13 +57,13 @@ class UserService
$qqWry = new IpLocation(); $qqWry = new IpLocation();
foreach ($list as $key => $value) { foreach ($list as $key => $value) {
$value->hidden(['pwd', 'salt']); $value->hidden(['pwd', 'salt']);
try { $loginIp = $value['login_ip'];
$region = $qqWry->getLocation($value['login_ip']); if (!empty($loginIp)) {
$region = $region['country'] . ' ' . $region['area']; $region = $qqWry->getLocation($loginIp);
} catch (\Exception $e) { $list[$key]['region'] = $region['country'] . ' ' . $region['area'];
$region = 'unKnown'; } else {
$list[$key]['region'] = 'unKnown';
} }
$list[$key]['region'] = $region;
$result = list_search($userGroup,['id'=> $value['group_id']]); $result = list_search($userGroup,['id'=> $value['group_id']]);
if (!empty($result)) { if (!empty($result)) {
$list[$key]['group'] = $result['title']; $list[$key]['group'] = $result['title'];
@@ -91,6 +91,7 @@ class UserService
Db::startTrans(); Db::startTrans();
try { try {
$model->create($params); $model->create($params);
Db::commit();
} catch (\Exception $e) { } catch (\Exception $e) {
Db::rollback(); Db::rollback();
throw new OperateException('添加失败！'); throw new OperateException('添加失败！');
@@ -136,6 +137,7 @@ class UserService
Db::startTrans(); Db::startTrans();
try { try {
$model->update($params); $model->update($params);
Db::commit();
} catch (\Exception $e) { } catch (\Exception $e) {
Db::rollback(); Db::rollback();
throw new OperateException('添加失败！'); throw new OperateException('添加失败！');