Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7

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);

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: [
@@ -152,8 +152,8 @@ export default {
       formData: {
         file: undefined,
         swaggerUrl: '',
-        modeId: '',
-        moduleId: ''
+        modeId: this.$t('commons.not.cover'),
+        moduleId: '',
       },
       rules: {},
       currentModule: {},

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',

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: '请填写模版内容',

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: '請填寫模版內容',