open-source/qinglong
1
0
Fork 0
mirror of https://github.com/whyour/qinglong.git synced 2025-05-24 15:43:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复获取ip api失败时，无法登陆

Browse Source 
修复禁用或者运行定时任务出现重复
This commit is contained in:
hanhh 2021-08-23 13:44:54 +08:00
parent 64ecd75bd5
commit 89b8494ad0
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
back/config/util.ts
View File

@ -165,9 +165,13 @@ export async function getNetIp(req: any) {
.json();
return { address: data[0].location, ip };
} catch (error) {
const { country, regionName, city } = await got
.get(`http://ip-api.com/json/${ip}?lang=zh-CN`)
.json();
return { address: `${country} ${regionName} ${city}`, ip };
try {
const { country, regionName, city } = await got
.get(`http://ip-api.com/json/${ip}?lang=zh-CN`)
.json();
return { address: `${country} ${regionName} ${city}`, ip };
} catch (err) {
return { address: `获取失败`, ip };
}
}
}

12
src/pages/crontab/index.tsx
View File

@ -274,7 +274,8 @@ const Crontab = ({ headerStyle, isPhone }: any) => {
if (data.code === 200) {
message.success('删除成功');
const result = [...value];
result.splice(index + pageSize * (currentPage - 1), 1);
const i = result.findIndex((x) => x._id === record._id);
result.splice(i, 1);
setValue(result);
} else {
message.error(data);
@ -305,7 +306,8 @@ const Crontab = ({ headerStyle, isPhone }: any) => {
.then((data: any) => {
if (data.code === 200) {
const result = [...value];
result.splice(index + pageSize * (currentPage - 1), 1, {
const i = result.findIndex((x) => x._id === record._id);
result.splice(i, 1, {
...record,
status: CrontabStatus.running,
});
@ -339,7 +341,8 @@ const Crontab = ({ headerStyle, isPhone }: any) => {
.then((data: any) => {
if (data.code === 200) {
const result = [...value];
result.splice(index + pageSize * (currentPage - 1), 1, {
const i = result.findIndex((x) => x._id === record._id);
result.splice(i, 1, {
...record,
pid: null,
status: CrontabStatus.idle,
@ -383,7 +386,8 @@ const Crontab = ({ headerStyle, isPhone }: any) => {
if (data.code === 200) {
const newStatus = record.isDisabled === 1 ? 0 : 1;
const result = [...value];
result.splice(index + pageSize * (currentPage - 1), 1, {
const i = result.findIndex((x) => x._id === record._id);
result.splice(i, 1, {
...record,
isDisabled: newStatus,
});