From 94a0ecfdc4c68bc00502d0a054f4d82fc6fd4af3 Mon Sep 17 00:00:00 2001
From: haml-707 <845831435@qq.com>
Date: Mon, 3 Jun 2024 15:15:02 +0800
Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=E6=8A=A5=E9=94=99=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E5=90=8E=E7=AB=AFmsg=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/shared/axios/index.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/shared/axios/index.ts b/src/shared/axios/index.ts
index df7a8d1..89c0f1d 100644
--- a/src/shared/axios/index.ts
+++ b/src/shared/axios/index.ts
@@ -19,6 +19,9 @@ interface RequestConfig<D = any> extends AxiosRequestConfig {
   $doException?: boolean; // 是否弹出错误提示框
   global?: boolean; // 是否为全局请求， 全局请求在清除请求池时，不清除
 }
+interface ErrorResponse {
+  msg: string;
+}
 
 // 全局loading
 let loadingInstance: LoadingInstance | null = null;
@@ -135,9 +138,11 @@ const responseInterceptorId = request.interceptors.response.use(
     }
     const { config } = err;
     if (!(config as RequestConfig).$doException) {
+      const response = err.response as AxiosResponse<ErrorResponse>;
+      const message = response?.data?.msg || err.message;
       ElMessage({
         type: 'error',
-        message: err.toString(),
+        message,
       });
     }
     // 非取消请求发生异常，同样将请求移除请求池
-- 
Gitee


From 119363fa4e5594e7d525eacf69f1ea247e31aa71 Mon Sep 17 00:00:00 2001
From: haml-707 <845831435@qq.com>
Date: Mon, 3 Jun 2024 15:16:48 +0800
Subject: [PATCH 2/6] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E7=A0=81=E9=95=BF=E5=BA=A6=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AppVerify.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/components/AppVerify.vue b/src/components/AppVerify.vue
index 2fd7c73..8aa1471 100644
--- a/src/components/AppVerify.vue
+++ b/src/components/AppVerify.vue
@@ -50,9 +50,13 @@ const { t, locale } = useI18n();
       <iconReset></iconReset>
     </OIcon>
     <template #footer>
-      <OButton type="primary" size="small" @click="emits('verify-email')">{{
-        t('quickIssue.VERIFY_CONFIRM')
-      }}</OButton>
+      <OButton
+        type="primary"
+        :disabled="templateChallenge.trim().length !== 6"
+        size="small"
+        @click="emits('verify-email')"
+        >{{ t('quickIssue.VERIFY_CONFIRM') }}</OButton
+      >
       <OButton size="small" @click="emits('close-dlg')">{{
         t('quickIssue.VERIFY_CANCEL')
       }}</OButton>
-- 
Gitee


From f6ceae371e028bda6b270576ddf06f1abd2883ca Mon Sep 17 00:00:00 2001
From: haml-707 <845831435@qq.com>
Date: Mon, 3 Jun 2024 15:18:47 +0800
Subject: [PATCH 3/6] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4public=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=EF=BC=8C=E9=BB=98=E8=AE=A4=E4=BB=93=E5=BA=93=E6=8F=90?=
 =?UTF-8?q?=E5=8F=96=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/index.ts                    |  5 +++--
 src/views/submit-issue/SubmitIssue.vue | 17 +++++++++++------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/config/index.ts b/src/config/index.ts
index bbff8cc..74e0311 100644
--- a/src/config/index.ts
+++ b/src/config/index.ts
@@ -13,8 +13,6 @@ import LogoLinkedin from '@/assets/footer/linkedin@2x.png';
 import LogoYoutube from '@/assets/footer/youtube@2x.png';
 import LogoTwitter from '@/assets/footer/twitter@2x.png';
 
-
-
 // 友情链接
 export const linksData = {
   zh: [
@@ -108,3 +106,6 @@ export const linksData2 = {
     },
   ],
 };
+
+export const defaultIssueRepo = 'openeuler/community-issue';
+export const defaultIssueRepoID = 7392228;
diff --git a/src/views/submit-issue/SubmitIssue.vue b/src/views/submit-issue/SubmitIssue.vue
index ac43cc1..ce1158f 100644
--- a/src/views/submit-issue/SubmitIssue.vue
+++ b/src/views/submit-issue/SubmitIssue.vue
@@ -23,6 +23,7 @@ import {
 } from '@/api/api-quick-issue';
 
 import { OptionList, IssueData } from '@/shared/@types/type-quick-issue';
+import { defaultIssueRepo, defaultIssueRepoID } from '@/config';
 
 import { getSigLandscape } from '@/api/api-sig';
 
@@ -82,11 +83,15 @@ const challenge = ref();
 const isVerifyShown = ref(false);
 
 const verifyEmail = () => {
+  if (challenge.value.length !== 6) {
+    return false;
+  }
   reqCheck({
     captcha_id: veriflyData.value.captcha_id,
     challenge: challenge.value,
     email: issueData.email,
   }).then(() => {
+    challenge.value = '';
     isVerifyShown.value = false;
     sendVerifyEmail();
   });
@@ -103,7 +108,6 @@ const repoParams = reactive({
   page: 1,
   per_page: 40,
   keyword: '',
-  public: true,
   status: '开始',
   sig: '',
   total: 0,
@@ -114,8 +118,8 @@ const issueData: IssueData = reactive({
   title: decodeURI(getUrlParam('title')) || '',
   issue_type_id: '',
   sig: '',
-  project_id: Number(getUrlParam('repo_id')) || 7392228,
-  repo: getUrlParam('repo') || 'openeuler/community-issue',
+  project_id: Number(getUrlParam('repo_id')) || defaultIssueRepoID,
+  repo: getUrlParam('repo') || defaultIssueRepo,
   email: '',
   code: '',
   description: '',
@@ -148,8 +152,8 @@ function getRepoBySigName() {
         type: 'warning',
         duration: 10000,
       });
-      issueData.repo = 'openeuler/community-issue';
-      issueData.project_id = 7392228;
+      issueData.repo = defaultIssueRepo;
+      issueData.project_id = defaultIssueRepoID;
     }
   });
 }
@@ -267,7 +271,8 @@ function resetForm(verify: FormInstance) {
   repoParams.sig = '';
   issueData.privacy = ['true'];
   issueData.description = '';
-  issueData.repo = '';
+  issueData.repo = defaultIssueRepo;
+  issueData.project_id = defaultIssueRepoID;
   challenge.value = '';
   verify.scrollToField('title');
 }
-- 
Gitee


From 8e8809f1729fffc0bbcecf780455d26180fac676 Mon Sep 17 00:00:00 2001
From: haml-707 <845831435@qq.com>
Date: Mon, 3 Jun 2024 15:19:39 +0800
Subject: [PATCH 4/6] =?UTF-8?q?fix:=20issue=20=E9=95=BF=E5=BA=A6=E5=89=8D?=
 =?UTF-8?q?=E5=90=8E=E7=AB=AF=E5=AF=B9=E9=BD=90=EF=BC=8C=E4=B8=BA191?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/quick-issue/quick-issue-en.ts | 4 ++--
 src/i18n/quick-issue/quick-issue-zh.ts | 4 ++--
 src/shared/index.ts                    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/i18n/quick-issue/quick-issue-en.ts b/src/i18n/quick-issue/quick-issue-en.ts
index 293ad50..c61e680 100644
--- a/src/i18n/quick-issue/quick-issue-en.ts
+++ b/src/i18n/quick-issue/quick-issue-en.ts
@@ -46,7 +46,7 @@ export default {
   MANDATORY: 'Mandatory',
   MANDATORY1: 'Mandatory',
   EMAIL_ADRESS: 'Enter an email address',
-  TITLE_LIMIT: 'Title cannot exceed 100 characters',
+  TITLE_LIMIT: 'Title cannot exceed 191 characters',
   RIGHT_EMAIL_ADRESS: 'Enter a valid email address',
   VER_CODE: 'Enter the verification code',
   VER_CODE1: 'Enter the 6-digit verification code',
@@ -63,7 +63,7 @@ export default {
   VERIFY_FAIL: 'Verification failed.',
   VERIFY_SUCCESS: 'Verification succeeds in',
   VERIFY_TITLE: 'Please complete the verification code',
-  VERIFY_PLH: 'Please enter the numbers in the image',
+  VERIFY_PLH: 'Please enter the characters in the image',
   VERIFY_CONFIRM: 'Confirm',
   VERIFY_CANCEL: 'Cancel',
 };
diff --git a/src/i18n/quick-issue/quick-issue-zh.ts b/src/i18n/quick-issue/quick-issue-zh.ts
index 8061482..61a0b36 100644
--- a/src/i18n/quick-issue/quick-issue-zh.ts
+++ b/src/i18n/quick-issue/quick-issue-zh.ts
@@ -46,7 +46,7 @@ export default {
   SEND_CODE: '发送验证码',
   MANDATORY: '必选项',
   MANDATORY1: '必填项',
-  TITLE_LIMIT: '标题长度不超过100字符',
+  TITLE_LIMIT: '标题长度不超过191字符',
   EMAIL_ADRESS: '请填写邮箱',
   RIGHT_EMAIL_ADRESS: '请输入正确格式邮箱',
   VER_CODE: '请填写验证码',
@@ -62,7 +62,7 @@ export default {
   VERIFY_FAIL: '验证失败',
   VERIFY_SUCCESS: '验证成功',
   VERIFY_TITLE: '请完成验证码',
-  VERIFY_PLH: '请输入图片中的数字',
+  VERIFY_PLH: '请输入图片中的字符',
   VERIFY_CONFIRM: '确定',
   VERIFY_CANCEL: '取消',
 };
diff --git a/src/shared/index.ts b/src/shared/index.ts
index fffcb59..d91ffc1 100644
--- a/src/shared/index.ts
+++ b/src/shared/index.ts
@@ -68,7 +68,7 @@ export const rules: any = reactive({
     },
     {
       min: 1,
-      max: 100,
+      max: 191,
       message: t('quickIssue.TITLE_LIMIT'),
       trigger: 'blur',
     },
-- 
Gitee


From ba9bedb6edc73b0900fc6fc7f5c13cbba9530c7c Mon Sep 17 00:00:00 2001
From: haml-707 <845831435@qq.com>
Date: Mon, 3 Jun 2024 19:52:13 +0800
Subject: [PATCH 5/6] =?UTF-8?q?chore:=20nginx=E5=BC=80=E5=90=AF=E9=99=90?=
 =?UTF-8?q?=E9=80=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile              |  2 +-
 deploy/nginx/nginx.conf | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3d933cb..7e34497 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@ RUN ls /home/quick-isuue/web
 
 FROM swr.cn-north-4.myhuaweicloud.com/opensourceway/openeuler/nginx:1.24.0-22.03-lts-sp1 as NginxBuilder
 
-FROM swr.cn-north-4.myhuaweicloud.com/opensourceway/website/openeuler:22.03-lts-sp1-latest
+FROM openeuler/openeuler:22.03
 
 ENV NGINX_CONFIG_FILE /etc/nginx/nginx.conf
 ENV NGINX_CONFIG_PATH /etc/nginx/
diff --git a/deploy/nginx/nginx.conf b/deploy/nginx/nginx.conf
index 17b1eb0..87aec6c 100644
--- a/deploy/nginx/nginx.conf
+++ b/deploy/nginx/nginx.conf
@@ -42,8 +42,11 @@ http {
   proxy_hide_header X-Powered-By;
   proxy_request_buffering off;
 
-  limit_conn_zone $binary_remote_addr zone=limitperip:10m;
-  limit_req_zone $binary_remote_addr zone=ratelimit:10m rate=1000r/s;
+  real_ip_header X-Real-IP;
+
+  limit_conn_zone $http_x_real_ip zone=limitperip:10m;
+  limit_req_zone $http_x_real_ip zone=frontendratelimit:10m rate=1000r/s;
+  limit_req_zone $http_x_real_ip zone=ratelimit:10m rate=1000r/s;
 
   gzip on;
   gzip_min_length 1k;
@@ -96,10 +99,12 @@ http {
     }
 
     location / {
+      limit_req zone=frontendratelimit burst=2 nodelay;
       proxy_set_header X-Forwarded-For $http_x_real_ip;
       proxy_set_header Host $host;
 
       location /assets {
+        limit_req zone=frontendratelimit burst=2 nodelay;
         add_header X-XSS-Protection "1; mode=block";
         add_header X-Frame-Options DENY;
         add_header X-Content-Type-Options nosniff;
@@ -117,12 +122,14 @@ http {
     }
 
     location /api-dsapi/ {
+      limit_req zone=ratelimit burst=2 nodelay;
       proxy_set_header X-Forwarded-For $http_x_real_ip;
 
       proxy_pass https://dsapi.osinfra.cn/;
     }
 
     location /api-omapi/ {
+      limit_req zone=ratelimit burst=2 nodelay;
       proxy_set_header X-Forwarded-For $http_x_real_ip;
 
       proxy_pass https://omapi.test.osinfra.cn/;
@@ -130,9 +137,10 @@ http {
     }
 
     location /api-issues/ {
+      limit_req zone=ratelimit burst=2 nodelay;
       proxy_set_header X-Forwarded-For $http_x_real_ip;
 
-      proxy_pass https://quickissue-server.test.osinfra.cn/;
+         proxy_pass https://quickissue-server.test.osinfra.cn/;
 
     }
 
-- 
Gitee


From 1f7315b4410538f9a3d1abbaf2dfb052a6975a0b Mon Sep 17 00:00:00 2001
From: haml-707 <845831435@qq.com>
Date: Mon, 3 Jun 2024 19:52:23 +0800
Subject: [PATCH 6/6] =?UTF-8?q?fix:=20TS=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/api-quick-issue.ts             | 2 +-
 src/views/submit-issue/SubmitIssue.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/api/api-quick-issue.ts b/src/api/api-quick-issue.ts
index 90aa0dc..283e606 100644
--- a/src/api/api-quick-issue.ts
+++ b/src/api/api-quick-issue.ts
@@ -117,7 +117,7 @@ export function reqGet() {
  */
 export function reqCheck(data: {
   captcha_id: number;
-  challenge: number;
+  challenge: string;
   email: string;
 }) {
   const url = '/api-issues/verify/check';
diff --git a/src/views/submit-issue/SubmitIssue.vue b/src/views/submit-issue/SubmitIssue.vue
index ce1158f..f95714b 100644
--- a/src/views/submit-issue/SubmitIssue.vue
+++ b/src/views/submit-issue/SubmitIssue.vue
@@ -79,7 +79,7 @@ const totalTime = ref(60);
 const tabType = ref(titleList.value[0].key);
 const isGiteeUser = ref(false);
 const clock = ref();
-const challenge = ref();
+const challenge = ref('');
 const isVerifyShown = ref(false);
 
 const verifyEmail = () => {
-- 
Gitee