Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
赵月辉
/
fastgpt-migrated
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Unverified
Commit
1ace8fb9
authored
Sep 03, 2023
by
archer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
error track
parent
e0b23a26
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
38 additions
and
6 deletions
+38
-6
client/src/pages/_app.tsx
+6
-0
client/src/pages/_error.tsx
+12
-2
client/src/service/events/generateVector.ts
+12
-4
client/src/store/global.ts
+8
-0
No files found.
client/src/pages/_app.tsx
View file @
1ace8fb9
...
...
@@ -12,6 +12,7 @@ import { clientInitData, feConfigs } from '@/store/static';
import
{
appWithTranslation
,
useTranslation
}
from
'next-i18next'
;
import
{
getLangStore
,
setLangStore
}
from
'@/utils/i18n'
;
import
{
useRouter
}
from
'next/router'
;
import
{
useGlobalStore
}
from
'@/store/global'
;
import
'nprogress/nprogress.css'
;
import
'@/styles/reset.scss'
;
...
...
@@ -37,6 +38,7 @@ function App({ Component, pageProps }: AppProps) {
const
router
=
useRouter
();
const
{
hiId
}
=
router
.
query
as
{
hiId
?:
string
};
const
{
i18n
}
=
useTranslation
();
const
{
setLastRoute
}
=
useGlobalStore
();
const
[
scripts
,
setScripts
]
=
useState
<
FeConfigsType
[
'scripts'
]
>
([]);
const
[
googleClientVerKey
,
setGoogleVerKey
]
=
useState
<
string
>
();
...
...
@@ -75,6 +77,10 @@ function App({ Component, pageProps }: AppProps) {
const
lang
=
getLangStore
()
||
'zh'
;
i18n
?.
changeLanguage
?.(
lang
);
setLangStore
(
lang
);
return
()
=>
{
setLastRoute
(
router
.
asPath
);
};
},
[
router
.
asPath
]);
return
(
...
...
client/src/pages/_error.tsx
View file @
1ace8fb9
import
{
useEffect
}
from
'react'
;
import
{
useRouter
}
from
'next/router'
;
import
{
serviceSideProps
}
from
'@/utils/i18n'
;
import
{
useGlobalStore
}
from
'@/store/global'
;
import
{
addLog
}
from
'@/service/utils/tools'
;
import
{
getErrText
}
from
'@/utils/tools'
;
function
Error
()
{
const
router
=
useRouter
();
const
{
lastRoute
}
=
useGlobalStore
();
useEffect
(()
=>
{
setTimeout
(()
=>
{
window
.
umami
?.
track
(
'pageError'
,
{
userAgent
:
navigator
.
userAgent
,
platform
:
navigator
.
platform
,
appName
:
navigator
.
appName
appName
:
navigator
.
appName
,
lastRoute
,
route
:
router
.
asPath
});
},
1000
);
...
...
@@ -26,7 +34,9 @@ function Error() {
}
export
async
function
getServerSideProps
(
context
:
any
)
{
console
.
log
(
context
);
console
.
log
(
'[render error]: '
,
context
);
addLog
.
error
(
getErrText
(
context
?.
res
));
return
{
props
:
{
...(
await
serviceSideProps
(
context
))
}
...
...
client/src/service/events/generateVector.ts
View file @
1ace8fb9
...
...
@@ -4,6 +4,7 @@ import { TrainingData } from '../models/trainingData';
import
{
ERROR_ENUM
}
from
'../errorCode'
;
import
{
TrainingModeEnum
}
from
'@/constants/plugin'
;
import
{
sendInform
}
from
'@/pages/api/user/inform/send'
;
import
{
addLog
}
from
'../utils/tools'
;
const
reduceQueue
=
()
=>
{
global
.
vectorQueueLen
=
global
.
vectorQueueLen
>
0
?
global
.
vectorQueueLen
-
1
:
0
;
...
...
@@ -87,10 +88,15 @@ export async function generateVector(): Promise<any> {
reduceQueue
();
// log
if
(
err
?.
response
)
{
console
.
log
(
'openai error: 生成向量错误'
);
console
.
log
(
err
.
response
?.
status
,
err
.
response
?.
statusText
,
err
.
response
?.
data
);
addLog
.
info
(
'openai error: 生成向量错误'
,
{
status
:
err
.
response
?.
status
,
stateusText
:
err
.
response
?.
statusText
,
data
:
err
.
response
?.
data
});
}
else
{
console
.
log
(
'生成向量错误:'
,
err
);
addLog
.
info
(
'openai error: 生成向量错误'
,
{
err
});
}
// message error or openai account error
...
...
@@ -98,7 +104,9 @@ export async function generateVector(): Promise<any> {
err
?.
message
===
'invalid message format'
||
err
.
response
?.
data
?.
error
?.
type
===
'invalid_request_error'
)
{
console
.
log
(
dataItems
);
addLog
.
info
(
'invalid message format'
,
{
dataItems
});
try
{
await
TrainingData
.
findByIdAndUpdate
(
trainingId
,
{
lockTime
:
new
Date
(
'2998/5/5'
)
...
...
client/src/store/global.ts
View file @
1ace8fb9
...
...
@@ -6,6 +6,8 @@ import axios from 'axios';
type
LoginStoreType
=
{
provider
:
'git'
;
lastRoute
:
string
};
type
State
=
{
lastRoute
:
string
;
setLastRoute
:
(
e
:
string
)
=>
void
;
loginStore
?:
LoginStoreType
;
setLoginStore
:
(
e
:
LoginStoreType
)
=>
void
;
loading
:
boolean
;
...
...
@@ -22,6 +24,12 @@ export const useGlobalStore = create<State>()(
devtools
(
persist
(
immer
((
set
,
get
)
=>
({
lastRoute
:
'/app/list'
,
setLastRoute
(
e
)
{
set
((
state
)
=>
{
state
.
lastRoute
=
e
;
});
},
loginStore
:
undefined
,
setLoginStore
(
e
)
{
set
((
state
)
=>
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment