Skip to content

Commit

Permalink
fix ci
Browse files Browse the repository at this point in the history
Signed-off-by: jingyang <[email protected]>
  • Loading branch information
zjy365 committed Nov 20, 2023
1 parent abb4cf7 commit 117e66b
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 11 deletions.
1 change: 0 additions & 1 deletion frontend/providers/applaunchpad/src/pages/_app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@ const App = ({ Component, pageProps }: AppProps) => {
const event = async (e: MessageEvent) => {
const envs = await getPlatformEnv();
const whitelist = [`https://${envs?.domain}`];
console.log(e, whitelist, 'post message');
if (!whitelist.includes(e.origin)) {
return;
}
Expand Down
4 changes: 2 additions & 2 deletions frontend/providers/applaunchpad/src/pages/api/delApp.ts
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export async function DeleteAppByName({ name, req }: DeleteAppParams & { req: Ne
delDependent.forEach((item) => {
console.log(item, 'delApp err');
if (item.status === 'rejected' && +item?.reason?.body?.code !== 404) {
throw new Error('删除 App 异常');
throw new Error(item?.reason?.body?.reason || item?.reason?.body?.message || '删除 App 异常');
}
});

Expand All @@ -94,7 +94,7 @@ export async function DeleteAppByName({ name, req }: DeleteAppParams & { req: Ne
delApp.forEach((item) => {
console.log(item, 'delApp err');
if (item.status === 'rejected' && +item?.reason?.body?.code !== 404) {
throw new Error(item?.reason?.body);
throw new Error(item?.reason?.body?.reason || item?.reason?.body?.message || '删除 App 异常');
}
});
}
1 change: 0 additions & 1 deletion frontend/providers/cronjob/src/pages/_app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ function App({ Component, pageProps }: AppProps) {
const event = async (e: MessageEvent) => {
const envs = await getPlatformEnv();
const whitelist = [`https://${envs?.domain}`];
console.log(e, whitelist, 'post message');
if (!whitelist.includes(e.origin)) {
return;
}
Expand Down
1 change: 0 additions & 1 deletion frontend/providers/dbprovider/src/pages/_app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@ function App({ Component, pageProps }: AppProps) {
const event = async (e: MessageEvent) => {
const envs = await getAppEnv();
const whitelist = [`https://${envs?.domain}`];
console.log(e, whitelist, 'post message');
if (!whitelist.includes(e.origin)) {
return;
}
Expand Down
9 changes: 3 additions & 6 deletions frontend/providers/dbprovider/src/services/handleStream.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,9 @@ export const handleAxiosStream = async (props: AxiosRequestConfig, kubeconfig: s
}
};
const doMain = process.env.MONITOR_URL || 'http://monitor-system.cloud.sealos.run';
const response = await fetch(`${doMain}${url}?${queryString}`, requestOptions).then((res) => {
console.log(res, '====');

return res.json();
});
console.log(`${doMain}${url}?${queryString}`, response);
const response = await fetch(`${doMain}${url}?${queryString}`, requestOptions).then((res) =>
res.json()
);
return response;
// const response = await axios({
// baseURL: 'http://localhost:9090' || 'http://monitor-system.cloud.sealos.run',
Expand Down

0 comments on commit 117e66b

Please sign in to comment.