From 86c079c62a99f9ac572be1306f9292c5bb612de1 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Fri, 29 Jan 2021 11:08:52 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20swagger=E5=AE=9A=E6=97=B6=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/migration/V72__modify_swagger_url_project.sql        | 6 ++++++
 .../api/definition/components/import/ApiImport.vue          | 6 +++---
 frontend/src/i18n/en-US.js                                  | 2 ++
 frontend/src/i18n/zh-CN.js                                  | 2 ++
 frontend/src/i18n/zh-TW.js                                  | 2 ++
 5 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 backend/src/main/resources/db/migration/V72__modify_swagger_url_project.sql

diff --git a/backend/src/main/resources/db/migration/V72__modify_swagger_url_project.sql b/backend/src/main/resources/db/migration/V72__modify_swagger_url_project.sql
new file mode 100644
index 0000000000..bba509bd4a
--- /dev/null
+++ b/backend/src/main/resources/db/migration/V72__modify_swagger_url_project.sql
@@ -0,0 +1,6 @@
+ALTER TABLE swagger_url_project
+    MODIFY COLUMN id VARCHAR(120);
+ALTER TABLE swagger_url_project
+    MODIFY COLUMN project_id VARCHAR(120);
+ALTER TABLE swagger_url_project
+    MODIFY COLUMN mode_id VARCHAR(120);
diff --git a/frontend/src/business/components/api/definition/components/import/ApiImport.vue b/frontend/src/business/components/api/definition/components/import/ApiImport.vue
index a7bb46b646..0998fb2b28 100644
--- a/frontend/src/business/components/api/definition/components/import/ApiImport.vue
+++ b/frontend/src/business/components/api/definition/components/import/ApiImport.vue
@@ -113,11 +113,11 @@ export default {
       showEnvironmentSelect: true,
       modeOptions: [{
         id: 'fullCoverage',
-        name: '全量覆盖'
+        name: this.$t('commons.cover')
       },
         {
           id: 'incrementalMerge',
-          name: '增量合并'
+          name: this.$t('commons.not.cover')
         }],
       protocol: "",
       platforms: [
@@ -153,7 +153,7 @@ export default {
         file: undefined,
         swaggerUrl: '',
         modeId: '',
-        moduleId: ''
+        moduleId: this.$t('commons.not.cover')
       },
       rules: {},
       currentModule: {},
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 3d7b54e1d1..b57556fa94 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -1,5 +1,7 @@
 export default {
   commons: {
+    cover:'Cover',
+    not_cover:'Not Cover',
     import_mode: 'Import mode',
     import_module: 'Import module',
     please_fill_in_the_template: 'Please fill in the template',
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 9c9f5ef10f..01c88a49b7 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -1,5 +1,7 @@
 export default {
   commons: {
+    cover:'覆盖',
+    not_cover:'不覆盖',
     import_mode: '导入模式',
     import_module: '导入模块',
     please_fill_in_the_template: '请填写模版内容',
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index ef1230efc6..6d81c01325 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -1,5 +1,7 @@
 export default {
   commons: {
+    cover:'覆蓋',
+    not_cover:'不覆蓋',
     import_mode: '導入模式',
     import_module: '導入模塊',
     please_fill_in_the_template: '請填寫模版內容',

From 0b1a1e0135dc95790e25daebee9be4da3f9f998a Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Fri, 29 Jan 2021 11:12:37 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E9=BB=98=E8=AE=A4=E5=80=BC=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/api/definition/components/import/ApiImport.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/business/components/api/definition/components/import/ApiImport.vue b/frontend/src/business/components/api/definition/components/import/ApiImport.vue
index 0998fb2b28..005ad19883 100644
--- a/frontend/src/business/components/api/definition/components/import/ApiImport.vue
+++ b/frontend/src/business/components/api/definition/components/import/ApiImport.vue
@@ -152,8 +152,8 @@ export default {
       formData: {
         file: undefined,
         swaggerUrl: '',
-        modeId: '',
-        moduleId: this.$t('commons.not.cover')
+        modeId: this.$t('commons.not.cover'),
+        moduleId: '',
       },
       rules: {},
       currentModule: {},