diff --git a/Dockerfile b/Dockerfile index 8f440d671a953984e10c9f63553fdb851df2e9c7..3c55dabc1383e136e6a961ea7e9ede1213244a2d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -94,7 +94,9 @@ COPY ./deploy/monitor.sh ./deploy/entrypoint.sh /etc/nginx/ RUN chmod 500 /etc/nginx/monitor.sh \ && chmod 500 /etc/nginx/entrypoint.sh \ && chown nginx:nginx /etc/nginx/monitor.sh \ - && chown nginx:nginx /etc/nginx/entrypoint.sh + && chown nginx:nginx /etc/nginx/entrypoint.sh \ + && sed -i "/PATH=/d" /home/nginx/.bashrc \ + && source /home/nginx/.bashrc EXPOSE 8080 diff --git a/src/api/api-login.ts b/src/api/api-login.ts index ceb1cf35e2185d2f0930b58c2c567b3c29c3e325..e0dd4d9585e7aaedf11d9cef840eb2bfa09414bc 100644 --- a/src/api/api-login.ts +++ b/src/api/api-login.ts @@ -13,6 +13,16 @@ import { ElMessage } from 'element-plus'; type queryPermissionParams = { community: string; }; + +const handleError = (err: any) => { + const message = err?.response?.data?.message || ''; + if (message && message !== 'token expires') { + ElMessage({ + type: 'error', + message: err.message, + }); + } +} export function queryPermission(params: queryPermissionParams) { const url = '/api-omapi/oneid/personal/center/user'; const { token } = getUserAuth(); @@ -27,13 +37,7 @@ export function queryPermission(params: queryPermissionParams) { }) .then((res: AxiosResponse) => res.data) .catch((err) => { - const message = err?.response?.data?.message || ''; - if (message && message !== 'token expires') { - ElMessage({ - type: 'error', - message: err.message, - }); - } + handleError(err); }); } @@ -53,12 +57,6 @@ export function queryIDToken() { }) .then((res: AxiosResponse) => res.data) .catch((err) => { - const message = err?.response?.data?.message || ''; - if (message && message !== 'token expires') { - ElMessage({ - type: 'error', - message: err.message, - }); - } + handleError(err); }); } diff --git a/src/api/api-quick-issue.ts b/src/api/api-quick-issue.ts index 283e606c0526b2fbf8a6ea0fb1462529fcc8abb5..55c63b76620c7bd358998bd798286e208e63f242 100644 --- a/src/api/api-quick-issue.ts +++ b/src/api/api-quick-issue.ts @@ -29,7 +29,9 @@ export function getRepoIssue(params: IssueQueryData) { * @return {Array} */ export function getIssueSelectOption(type: string, params: object | null) { - type === 'exLabels' ? (type = 'labels') : ''; + if (type === 'exLabels') { + type = 'labels'; + } const url = `/api-issues/issues/${type}`; return request.get(url, { params }).then((res: AxiosResponse) => res.data); } @@ -99,7 +101,9 @@ export function getRepoPull(params: any) { * @return {Array} */ export function getPrSelectOption(type: string, params: object | null) { - type === 'exLabels' ? (type = 'labels') : ''; + if (type === 'exLabels') { + type = 'labels'; + } const url = `/api-issues/pulls/${type}`; return request.get(url, { params }).then((res: AxiosResponse) => res.data); } diff --git a/src/api/api-sig.ts b/src/api/api-sig.ts index 9ed23e327d00c8645360e26e78684e85e7d28393..407b5d14dfe5d3cc30f15e10cc0347b69ea08bab 100644 --- a/src/api/api-sig.ts +++ b/src/api/api-sig.ts @@ -13,9 +13,10 @@ export function getSigLandscape(lang: string): Promise { const info: GroupInfo[] = []; for (let i = 0, len = data.length; i < len; i++) { const item = data[i]; - lang === 'zh' - ? '' - : ((item.group = item.en_group), (item.feature = item.en_feature)); + if (lang !== 'zh') { + item.group = item.en_group; + item.feature = item.en_feature; + } if (item.group === '' && item.feature === '') { continue; } diff --git a/src/shared/axios/index.ts b/src/shared/axios/index.ts index 47136a80ae8f12e559cf9223bce3515a334a7d61..b6a025f5a0d189da2d2cf09216c903df7b1ae079 100644 --- a/src/shared/axios/index.ts +++ b/src/shared/axios/index.ts @@ -144,7 +144,7 @@ const responseInterceptorId = request.interceptors.response.use( } const { config } = err; if (!(config as RequestConfig).$doException) { - const response = err.response as AxiosResponse; + const response = err.response as any; const message = response?.data?.msg || err.message; ElMessage({ type: 'error',