From d9efaa741fa2bc404287b1046ec123511ad6f943 Mon Sep 17 00:00:00 2001
From: 10086 <845831435@qq.com>
Date: Wed, 19 Jun 2024 09:17:38 +0800
Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E5=8E=BB=E9=99=A4=20RepoID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/index.ts                    |  1 -
 src/shared/@types/type-quick-issue.ts  |  1 -
 src/views/submit-issue/SubmitIssue.vue | 17 ++++-------------
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/config/index.ts b/src/config/index.ts
index 4fa5aea..a80ebba 100644
--- a/src/config/index.ts
+++ b/src/config/index.ts
@@ -108,5 +108,4 @@ export const linksData2 = {
 };
 
 export const defaultIssueRepo = 'openeuler/community-issue';
-export const defaultIssueRepoID = 7392228;
 export const giteeUrl = 'https://gitee.com';
diff --git a/src/shared/@types/type-quick-issue.ts b/src/shared/@types/type-quick-issue.ts
index 542b9d2..04e9eb3 100644
--- a/src/shared/@types/type-quick-issue.ts
+++ b/src/shared/@types/type-quick-issue.ts
@@ -26,7 +26,6 @@ export interface IssueData {
   title: string;
   issue_type_id: string | number | undefined;
   sig?: string;
-  project_id: number;
   repo?: string;
   email: string;
   code: string;
diff --git a/src/views/submit-issue/SubmitIssue.vue b/src/views/submit-issue/SubmitIssue.vue
index 04dbeb3..56e8270 100644
--- a/src/views/submit-issue/SubmitIssue.vue
+++ b/src/views/submit-issue/SubmitIssue.vue
@@ -23,7 +23,7 @@ import {
 } from '@/api/api-quick-issue';
 
 import { OptionList, IssueData } from '@/shared/@types/type-quick-issue';
-import { defaultIssueRepo, defaultIssueRepoID, giteeUrl } from '@/config';
+import { defaultIssueRepo, giteeUrl } from '@/config';
 
 import { getSigLandscape } from '@/api/api-sig';
 
@@ -108,7 +108,6 @@ const repoParams = reactive({
   page: 1,
   per_page: 40,
   keyword: '',
-  status: '开始',
   sig: '',
   total: 0,
 });
@@ -118,7 +117,6 @@ const issueData: IssueData = reactive({
   title: decodeURI(getUrlParam('title')) || '',
   issue_type_id: '',
   sig: '',
-  project_id: Number(getUrlParam('repo_id')) || defaultIssueRepoID,
   repo: getUrlParam('repo') || defaultIssueRepo,
   email: '',
   code: '',
@@ -153,7 +151,6 @@ function getRepoBySigName() {
         duration: 10000,
       });
       issueData.repo = defaultIssueRepo;
-      issueData.project_id = defaultIssueRepoID;
     }
   });
 }
@@ -235,9 +232,9 @@ async function submitForm(
       const parmes = {
         title: issueData.title,
         issue_type_id: issueData.issue_type_id,
-        project_id: issueData.project_id,
         email: issueData.email,
         code: issueData.code,
+        repo: issueData.repo,
         description: issueData.description,
         privacy:
           Array.isArray(issueData.privacy) && issueData.privacy.length
@@ -283,17 +280,10 @@ function resetForm(verify: FormInstance) {
   issueData.privacy = [];
   issueData.description = '';
   issueData.repo = defaultIssueRepo;
-  issueData.project_id = defaultIssueRepoID;
   challenge.value = '';
   verify.scrollToField('title');
 }
 
-function optionClick(item: { enterprise_number: number }) {
-  if (item?.enterprise_number) {
-    issueData.project_id = item.enterprise_number;
-  }
-}
-
 function sigValueChange(val: string) {
   repoParams.sig = val;
   repoParams.page = 1;
@@ -477,7 +467,6 @@ watch(
                   :key="item.repo"
                   :label="item.repo"
                   :value="item.repo"
-                  @click="optionClick(item)"
                 />
               </el-scrollbar>
             </OSelect>
@@ -578,6 +567,7 @@ watch(
       </el-form>
     </div>
   </AppContent>
+  <!-- -------------landscape-------------------- -->
   <div class="mo-content"></div>
   <ODialog v-model="isMenuShown" class="menu-dialog" :show-close="true">
     <h1 id="tech"></h1>
@@ -602,6 +592,7 @@ watch(
       </div>
     </OTabs>
   </ODialog>
+  <!-- ------- 邮件发送验证-------------- -->
   <AppVerify
     v-model="isVerifyShown"
     :challenge="challenge"
-- 
Gitee


From ec65b6f77f14d4a63506af60fe6670f01529e8e1 Mon Sep 17 00:00:00 2001
From: 10086 <845831435@qq.com>
Date: Wed, 19 Jun 2024 14:36:51 +0800
Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E5=86=97=E4=BD=99?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=20totle?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AppVerify.vue           | 7 ++++---
 src/views/submit-issue/SubmitIssue.vue | 3 +--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/AppVerify.vue b/src/components/AppVerify.vue
index 8aa1471..1ed8140 100644
--- a/src/components/AppVerify.vue
+++ b/src/components/AppVerify.vue
@@ -65,12 +65,13 @@ const { t, locale } = useI18n();
 </template>
 
 <style lang="scss">
-.o-icon {
+
+.verify-dialog {
+  padding: 32px 46px;
+  .o-icon {
   cursor: pointer;
   font-size: 24px;
 }
-.verify-dialog {
-  padding: 32px 46px;
   .el-dialog__header {
     padding: 0;
     text-align: center;
diff --git a/src/views/submit-issue/SubmitIssue.vue b/src/views/submit-issue/SubmitIssue.vue
index 56e8270..6cfa78f 100644
--- a/src/views/submit-issue/SubmitIssue.vue
+++ b/src/views/submit-issue/SubmitIssue.vue
@@ -80,7 +80,7 @@ const tabType = ref(titleList.value[0].key);
 const isGiteeUser = ref(false);
 const clock = ref();
 const challenge = ref('');
-const isVerifyShown = ref(false);
+const isVerifyShown = ref(true);
 
 const verifyEmail = () => {
   if (challenge.value.length !== 6) {
@@ -109,7 +109,6 @@ const repoParams = reactive({
   per_page: 40,
   keyword: '',
   sig: '',
-  total: 0,
 });
 
 // 表单数据
-- 
Gitee


From 371f5b058ab618a8e30d44471b4ff2f177b9eb27 Mon Sep 17 00:00:00 2001
From: 10086 <845831435@qq.com>
Date: Wed, 19 Jun 2024 15:32:24 +0800
Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E9=82=AE=E7=AE=B1=E6=AD=A3=E5=88=99?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/shared/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shared/index.ts b/src/shared/index.ts
index d91ffc1..1dc927b 100644
--- a/src/shared/index.ts
+++ b/src/shared/index.ts
@@ -106,7 +106,7 @@ export const emailRules = [
   },
   {
     pattern: new RegExp(
-      '^[a-z0-9A-Z]+[- | a-z0-9A-Z . _]+@([a-z0-9A-Z]+(-[a-z0-9A-Z]+)?\\.)+[a-z]{2,}$'
+      '^[a-z0-9A-Z]+[- | a-z0-9A-Z . _]+@([a-z0-9A-Z]+(-[a-z0-9A-Z]+)?\\.)+[a-zA-Z]{2,}$'
     ),
     message: t('quickIssue.RIGHT_EMAIL_ADRESS'),
     trigger: 'change',
-- 
Gitee


From 017dbee2db36e724afef88095b1ebe094c78a216 Mon Sep 17 00:00:00 2001
From: 10086 <845831435@qq.com>
Date: Wed, 19 Jun 2024 17:27:41 +0800
Subject: [PATCH 4/5] =?UTF-8?q?fix=EF=BC=9A=20=E9=AA=8C=E8=AF=81=E7=A0=81?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E9=BB=98=E8=AE=A4=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/submit-issue/SubmitIssue.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/submit-issue/SubmitIssue.vue b/src/views/submit-issue/SubmitIssue.vue
index 6cfa78f..0932234 100644
--- a/src/views/submit-issue/SubmitIssue.vue
+++ b/src/views/submit-issue/SubmitIssue.vue
@@ -80,7 +80,7 @@ const tabType = ref(titleList.value[0].key);
 const isGiteeUser = ref(false);
 const clock = ref();
 const challenge = ref('');
-const isVerifyShown = ref(true);
+const isVerifyShown = ref(false);
 
 const verifyEmail = () => {
   if (challenge.value.length !== 6) {
-- 
Gitee


From d3457ad20a41c2fcce79b656c2f1212e25eea4ef Mon Sep 17 00:00:00 2001
From: 10086 <845831435@qq.com>
Date: Wed, 19 Jun 2024 18:41:12 +0800
Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=E9=AA=8C=E8=AF=81=E7=A0=81=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E5=A4=B1=E8=B4=A5=EF=BC=8C=E9=87=8D=E6=96=B0=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E9=AA=8C=E8=AF=81=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deploy/nginx/nginx.conf                |  2 +-
 src/views/submit-issue/SubmitIssue.vue | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/deploy/nginx/nginx.conf b/deploy/nginx/nginx.conf
index 87aec6c..d4120c8 100644
--- a/deploy/nginx/nginx.conf
+++ b/deploy/nginx/nginx.conf
@@ -137,7 +137,7 @@ http {
     }
 
     location /api-issues/ {
-      limit_req zone=ratelimit burst=2 nodelay;
+      limit_req zone=ratelimit burst=20 nodelay;
       proxy_set_header X-Forwarded-For $http_x_real_ip;
 
          proxy_pass https://quickissue-server.test.osinfra.cn/;
diff --git a/src/views/submit-issue/SubmitIssue.vue b/src/views/submit-issue/SubmitIssue.vue
index 0932234..992edb1 100644
--- a/src/views/submit-issue/SubmitIssue.vue
+++ b/src/views/submit-issue/SubmitIssue.vue
@@ -90,11 +90,15 @@ const verifyEmail = () => {
     captcha_id: veriflyData.value.captcha_id,
     challenge: challenge.value,
     email: issueData.email,
-  }).then(() => {
-    challenge.value = '';
-    isVerifyShown.value = false;
-    sendVerifyEmail();
-  });
+  })
+    .then(() => {
+      challenge.value = '';
+      isVerifyShown.value = false;
+      sendVerifyEmail();
+    })
+    .catch(() => {
+      queryGetReq();
+    });
 };
 
 const reposList = ref<OptionList>({
@@ -154,6 +158,7 @@ function getRepoBySigName() {
   });
 }
 
+// 刷新验证码
 function queryGetReq() {
   reqGet().then((res) => {
     veriflyData.value = res.data;
@@ -338,11 +343,6 @@ const debounceEvent = debounce(
   }
 );
 
-// 刷新验证码
-const changeVerifyCode = () => {
-  queryGetReq();
-};
-
 onMounted(async () => {
   getRepoBySigName();
   try {
@@ -596,7 +596,7 @@ watch(
     v-model="isVerifyShown"
     :challenge="challenge"
     :src="veriflyData.src"
-    @change-verify-code="changeVerifyCode"
+    @change-verify-code="queryGetReq"
     @verify-email="verifyEmail"
     @update:challenge="(val) => (challenge = val)"
     @close-dlg="isVerifyShown = false"
-- 
Gitee