From 9f7225dae314f5e2f6ee2ed9c890c8bf4d7fbe10 Mon Sep 17 00:00:00 2001
From: liuyong <925339056@qq.com>
Date: Tue, 18 Feb 2025 20:37:33 +0800
Subject: [PATCH 1/2] fix: majun errors

---
 src/api/api-login.ts       | 26 ++++++++++++--------------
 src/api/api-quick-issue.ts |  8 ++++++--
 src/api/api-sig.ts         |  7 ++++---
 src/shared/axios/index.ts  |  2 +-
 4 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/api/api-login.ts b/src/api/api-login.ts
index ceb1cf3..16428d9 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) => {
+  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 283e606..55c63b7 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 9ed23e3..407b5d1 100644
--- a/src/api/api-sig.ts
+++ b/src/api/api-sig.ts
@@ -13,9 +13,10 @@ export function getSigLandscape(lang: string): Promise<GroupInfo[]> {
     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 47136a8..bbef61b 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<ErrorResponse>;
+      const response = err.response;
       const message = response?.data?.msg || err.message;
       ElMessage({
         type: 'error',
-- 
Gitee


From 556adfa2ac01b1b641accff81a96808e1f440f02 Mon Sep 17 00:00:00 2001
From: liuyong <925339056@qq.com>
Date: Tue, 18 Feb 2025 20:40:07 +0800
Subject: [PATCH 2/2] fix: Dockerfile

---
 Dockerfile                | 4 +++-
 src/api/api-login.ts      | 2 +-
 src/shared/axios/index.ts | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8f440d6..3c55dab 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 16428d9..e0dd4d9 100644
--- a/src/api/api-login.ts
+++ b/src/api/api-login.ts
@@ -14,7 +14,7 @@ type queryPermissionParams = {
   community: string;
 };
 
-const handleError = (err) => {
+const handleError = (err: any) => {
   const message = err?.response?.data?.message || '';
   if (message && message !== 'token expires') {
     ElMessage({
diff --git a/src/shared/axios/index.ts b/src/shared/axios/index.ts
index bbef61b..b6a025f 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;
+      const response = err.response as any;
       const message = response?.data?.msg || err.message;
       ElMessage({
         type: 'error',
-- 
Gitee