feat: swagger定时自动同步

2021-01-18 18:05:25 +08:00 · 2021-01-18 18:05:25 +08:00 · 5b2359ec3c
parent 41f928aa89
commit 5b2359ec3c
9 changed files with 228 additions and 196 deletions
--- a/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java
@ -163,7 +163,7 @@ public class APIBackendListenerClient extends AbstractBackendListenerClient impl
            apiReportService.complete(testResult, report);
        } else if (StringUtils.equals(this.runMode, ApiRunMode.DELIMIT.name())) {
            // 调试操作，不需要存储结果
-            if (!StringUtils.isBlank(debugReportId)) {
+            if (StringUtils.isBlank(debugReportId)) {
                apiDefinitionService.addResult(testResult);
            } else {
                apiDefinitionService.addResult(testResult);
--- a/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
@ -486,10 +486,7 @@ public class ApiTestCaseService {
    }

    public String getExecResult(String id){
-        ApiDefinitionExecResultExample apidefinitionexecresultexample = new ApiDefinitionExecResultExample();
-        ApiDefinitionExecResultExample.Criteria criteria = apidefinitionexecresultexample.createCriteria();
-        criteria.andResourceIdEqualTo(id);
-        String status=apiDefinitionExecResultMapper.selectByExample(apidefinitionexecresultexample).get(0).getStatus();
+        String status=apiDefinitionExecResultMapper.selectExecResult(id);
        return status;
    }
 }
--- a/backend/src/main/java/io/metersphere/base/mapper/ApiDefinitionExecResultMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/ApiDefinitionExecResultMapper.java
@ -33,4 +33,6 @@ public interface ApiDefinitionExecResultMapper {
    int updateByPrimaryKeyWithBLOBs(ApiDefinitionExecResult record);

    int updateByPrimaryKey(ApiDefinitionExecResult record);
+
+    String  selectExecResult(String resourceId);
 }
--- a/backend/src/main/java/io/metersphere/base/mapper/ApiDefinitionExecResultMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ApiDefinitionExecResultMapper.xml
@ -210,6 +210,9 @@
      <include refid="Example_Where_Clause" />
    </if>
  </select>
+  <select id="selectExecResult" resultType="java.lang.String">
+    select ader.status from api_definition_exec_result ader where ader.resource_id=#{resourceId}
+  </select>
  <update id="updateByExampleSelective" parameterType="map">
    update api_definition_exec_result
    <set>
--- a/frontend/src/business/components/api/definition/components/import/ApiImport.vue
+++ b/frontend/src/business/components/api/definition/components/import/ApiImport.vue
@ -3,17 +3,17 @@
             :visible.sync="visible" class="api-import" v-loading="result.loading" @close="close">

    <div class="header-bar">
-      <div>{{$t('api_test.api_import.data_format')}}</div>
+      <div>{{ $t('api_test.api_import.data_format') }}</div>
      <el-radio-group v-model="selectedPlatformValue">
-        <el-radio v-for="(item, index) in platforms" :key="index" :label="item.value">{{item.name}}</el-radio>
+        <el-radio v-for="(item, index) in platforms" :key="index" :label="item.value">{{ item.name }}</el-radio>
      </el-radio-group>

      <div class="operate-button">
        <el-button class="save-button" type="primary" plain @click="save">
-          {{$t('commons.save')}}
+          {{ $t('commons.save') }}
        </el-button>
        <el-button class="cancel-button" type="warning" plain @click="visible = false">
-          {{$t('commons.cancel')}}
+          {{ $t('commons.cancel') }}
        </el-button>
      </div>
    </div>
@ -34,7 +34,7 @@
        multiple>
        <i class="el-icon-upload"></i>
        <div class="el-upload__text" v-html="$t('load_test.upload_tips')"></div>
-        <div class="el-upload__tip" slot="tip">{{$t('api_test.api_import.file_size_limit')}}</div>
+        <div class="el-upload__tip" slot="tip">{{ $t('api_test.api_import.file_size_limit') }}</div>
      </el-upload>

      <el-form-item :label="'Swagger URL'" prop="wgerUrl" v-if="isSwagger2 && swaggerUrlEable" class="swagger-url">
@ -47,15 +47,29 @@
          :active-text="$t('api_test.api_import.swagger_url_import')">
        </el-switch>
      </el-form-item>
+      <el-form-item v-if="isSwagger2 && swaggerUrlEable">
+        <el-switch
+          v-model="swaggerSynchronization"
+          @click.native="scheduleEdit"
+          :active-text="$t('api_test.api_import.timing_synchronization')">
+        </el-switch>
+        <span>
+          {{ $t('api_test.api_import.next_synchronization_time') }}：
+<!--          <span :class="{'disable-character': !schedule.enable}"
+                v-if="!schedule.enable">{{ $t('schedule.not_set') }}</span>
+          <crontab-result v-if="schedule.enable" :enable-simple-mode="true" :ex="schedule.value" ref="crontabResult"/>-->
+        </span>
+      </el-form-item>
+      <schedule-import ref="scheduleEdit"></schedule-import>

    </el-form>

    <div class="format-tip">
      <div>
-        <span>{{$t('api_test.api_import.tip')}}：{{selectedPlatform.tip}}</span>
+        <span>{{ $t('api_test.api_import.tip') }}：{{ selectedPlatform.tip }}</span>
      </div>
      <div>
-        <span>{{$t('api_test.api_import.export_tip')}}：{{selectedPlatform.exportTip}}</span>
+        <span>{{ $t('api_test.api_import.export_tip') }}：{{ selectedPlatform.exportTip }}</span>
      </div>
    </div>

@ -63,217 +77,223 @@
 </template>

 <script>
-  import MsDialogFooter from "../../../../common/components/MsDialogFooter";
-  import {listenGoBack, removeGoBackListener} from "@/common/js/utils";
-  import {getCurrentProjectID} from "../../../../../../common/js/utils";
-
-  export default {
-    name: "ApiImport",
-    components: {MsDialogFooter},
-    props: {
-      saved: {
-        type: Boolean,
-        default: true,
-      }
-    },
-    data() {
-      return {
-        visible: false,
-        swaggerUrlEable: false,
-        showEnvironmentSelect: true,
-        platforms: [
-          {
-            name: 'Metersphere',
-            value: 'Metersphere',
-            tip: this.$t('api_test.api_import.ms_tip'),
-            exportTip: this.$t('api_test.api_import.ms_export_tip'),
-            suffixes: new Set(['json'])
-          },
-          {
-            name: 'Postman',
-            value: 'Postman',
-            tip: this.$t('api_test.api_import.postman_tip'),
-            exportTip: this.$t('api_test.api_import.post_export_tip'),
-            suffixes: new Set(['json'])
-          },
-          {
-            name: 'Swagger',
-            value: 'Swagger2',
-            tip: this.$t('api_test.api_import.swagger_tip'),
-            exportTip: this.$t('api_test.api_import.swagger_export_tip'),
-            suffixes: new Set(['json'])
-          }
-        ],
-        selectedPlatform: {},
-        selectedPlatformValue: 'Metersphere',
-        result: {},
-        projects: [],
-        environments: [],
-        useEnvironment: false,
-        formData: {
-          file: undefined,
-          swaggerUrl: ''
+import MsDialogFooter from "../../../../common/components/MsDialogFooter";
+import {listenGoBack, removeGoBackListener} from "@/common/js/utils";
+import {getCurrentProjectID} from "../../../../../../common/js/utils";
+import ScheduleImport from "@/business/components/api/definition/components/import/ImportScheduleEdit";
+export default {
+  name: "ApiImport",
+  components: {ScheduleImport, MsDialogFooter},
+  props: {
+    saved: {
+      type: Boolean,
+      default: true,
+    }
+  },
+  data() {
+    return {
+      visible: false,
+      swaggerUrlEable: false,
+      swaggerSynchronization:false,
+      showEnvironmentSelect: true,
+      platforms: [
+        {
+          name: 'Metersphere',
+          value: 'Metersphere',
+          tip: this.$t('api_test.api_import.ms_tip'),
+          exportTip: this.$t('api_test.api_import.ms_export_tip'),
+          suffixes: new Set(['json'])
        },
-        rules: {},
-        currentModule: {},
-        fileList: []
-      }
-    },
-    activated() {
-      this.selectedPlatform = this.platforms[0];
-    },
-    watch: {
-      selectedPlatformValue() {
-        for (let i in this.platforms) {
-          if (this.platforms[i].value === this.selectedPlatformValue) {
-            this.selectedPlatform = this.platforms[i];
-            break;
-          }
+        {
+          name: 'Postman',
+          value: 'Postman',
+          tip: this.$t('api_test.api_import.postman_tip'),
+          exportTip: this.$t('api_test.api_import.post_export_tip'),
+          suffixes: new Set(['json'])
+        },
+        {
+          name: 'Swagger',
+          value: 'Swagger2',
+          tip: this.$t('api_test.api_import.swagger_tip'),
+          exportTip: this.$t('api_test.api_import.swagger_export_tip'),
+          suffixes: new Set(['json'])
        }
+      ],
+      selectedPlatform: {},
+      selectedPlatformValue: 'Metersphere',
+      result: {},
+      projects: [],
+      environments: [],
+      useEnvironment: false,
+      formData: {
+        file: undefined,
+        swaggerUrl: ''
      },
-    },
-    computed: {
-      isSwagger2() {
-        return this.selectedPlatformValue === 'Swagger2';
+      rules: {},
+      currentModule: {},
+      fileList: []
+    }
+  },
+  activated() {
+    this.selectedPlatform = this.platforms[0];
+  },
+  watch: {
+    selectedPlatformValue() {
+      for (let i in this.platforms) {
+        if (this.platforms[i].value === this.selectedPlatformValue) {
+          this.selectedPlatform = this.platforms[i];
+          break;
+        }
      }
    },
-    methods: {
-      open(module) {
-        this.currentModule = module;
-        this.visible = true;
-        listenGoBack(this.close);
-      },
-      upload(file) {
-        this.formData.file = file.file;
-      },
-      handleExceed(files, fileList) {
-        this.$warning(this.$t('test_track.case.import.upload_limit_count'));
-      },
-      handleRemove(file, fileList) {
-        this.formData.file = undefined;
-      },
-      uploadValidate(file, fileList) {
-        let suffix = file.name.substring(file.name.lastIndexOf('.') + 1);
-        if (this.selectedPlatform.suffixes && !this.selectedPlatform.suffixes.has(suffix)) {
-          this.$warning(this.$t('api_test.api_import.suffixFormatErr'));
+  },
+  computed: {
+    isSwagger2() {
+      return this.selectedPlatformValue === 'Swagger2';
+    }
+  },
+  methods: {
+    scheduleEdit(){
+      if(this.swaggerSynchronization){
+      /* this.$refs.scheduleEdit.open();*/
+      }
+    },
+    open(module) {
+      this.currentModule = module;
+      this.visible = true;
+      listenGoBack(this.close);
+    },
+    upload(file) {
+      this.formData.file = file.file;
+    },
+    handleExceed(files, fileList) {
+      this.$warning(this.$t('test_track.case.import.upload_limit_count'));
+    },
+    handleRemove(file, fileList) {
+      this.formData.file = undefined;
+    },
+    uploadValidate(file, fileList) {
+      let suffix = file.name.substring(file.name.lastIndexOf('.') + 1);
+      if (this.selectedPlatform.suffixes && !this.selectedPlatform.suffixes.has(suffix)) {
+        this.$warning(this.$t('api_test.api_import.suffixFormatErr'));
+        return false;
+      }
+      if (file.size / 1024 / 1024 > 20) {
+        this.$warning(this.$t('test_track.case.import.upload_limit_size'));
+        return false;
+      }
+      return true;
+    },
+    save() {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          if ((this.selectedPlatformValue != 'Swagger2' || (this.selectedPlatformValue == 'Swagger2' && !this.swaggerUrlEable)) && !this.formData.file) {
+            this.$warning(this.$t('commons.please_upload'));
+            return;
+          }
+          let param = this.buildParam();
+          this.result = this.$fileUpload('/api/definition/import', param.file, null, this.buildParam(), response => {
+            let res = response.data;
+            this.$success(this.$t('test_track.case.import.success'));
+            this.visible = false;
+            this.$emit('refresh', res);
+          });
+        } else {
          return false;
        }
-        if (file.size / 1024 / 1024 > 20) {
-          this.$warning(this.$t('test_track.case.import.upload_limit_size'));
-          return false;
-        }
-        return true;
-      },
-      save() {
-        this.$refs.form.validate(valid => {
-          if (valid) {
-            if ((this.selectedPlatformValue != 'Swagger2' || (this.selectedPlatformValue == 'Swagger2' && !this.swaggerUrlEable)) && !this.formData.file) {
-              this.$warning(this.$t('commons.please_upload'));
-              return;
-            }
-            let param = this.buildParam();
-            this.result = this.$fileUpload('/api/definition/import', param.file, null, this.buildParam(), response => {
-              let res = response.data;
-              this.$success(this.$t('test_track.case.import.success'));
-              this.visible = false;
-              this.$emit('refresh', res);
-            });
-          } else {
-            return false;
-          }
-        });
-      },
-      buildParam() {
-        let param = {};
-        Object.assign(param, this.formData);
-        param.platform = this.selectedPlatformValue;
-        param.saved = this.saved;
-        if (this.currentModule) {
-          param.moduleId = this.currentModule.id;
-          param.modulePath = this.currentModule.path;
-        }
-        param.projectId = getCurrentProjectID();
-        if (!this.swaggerUrlEable) {
-          param.swaggerUrl = undefined;
-        }
-        return param;
-      },
-      close() {
-        this.formData = {
-          file: undefined,
-          swaggerUrl: ''
-        };
-        this.fileList = [];
-        removeGoBackListener(this.close);
-        this.visible = false;
+      });
+    },
+    buildParam() {
+      let param = {};
+      Object.assign(param, this.formData);
+      param.platform = this.selectedPlatformValue;
+      param.saved = this.saved;
+      if (this.currentModule) {
+        param.moduleId = this.currentModule.id;
+        param.modulePath = this.currentModule.path;
      }
+      param.projectId = getCurrentProjectID();
+      if (!this.swaggerUrlEable) {
+        param.swaggerUrl = undefined;
+      }
+      return param;
+    },
+    close() {
+      this.formData = {
+        file: undefined,
+        swaggerUrl: ''
+      };
+      this.fileList = [];
+      removeGoBackListener(this.close);
+      this.visible = false;
    }
  }
+}
 </script>

 <style scoped>

-  .api-import >>> .el-dialog {
-    min-width: 700px;
-  }
+.api-import >>> .el-dialog {
+  min-width: 700px;
+}

-  .format-tip {
-    background: #EDEDED;
-  }
+.format-tip {
+  background: #EDEDED;
+}

-  .api-upload {
-    text-align: center;
-    margin: auto 0;
-  }
+.api-upload {
+  text-align: center;
+  margin: auto 0;
+}

-  .api-upload >>> .el-upload {
-    width: 100%;
-    max-width: 350px;
-  }
+.api-upload >>> .el-upload {
+  width: 100%;
+  max-width: 350px;
+}

-  .api-upload >>> .el-upload-dragger {
-    width: 100%;
-  }
+.api-upload >>> .el-upload-dragger {
+  width: 100%;
+}

-  .el-radio-group {
-    margin: 10px 0;
-  }
+.el-radio-group {
+  margin: 10px 0;
+}

-  .header-bar, .format-tip, .el-form {
-    border: solid #E1E1E1 1px;
-    margin: 10px 0;
-    padding: 10px;
-    border-radius: 3px;
-  }
+.header-bar, .format-tip, .el-form {
+  border: solid #E1E1E1 1px;
+  margin: 10px 0;
+  padding: 10px;
+  border-radius: 3px;
+}

-  .header-bar {
-    padding: 10px 30px;
-  }
+.header-bar {
+  padding: 10px 30px;
+}

-  .api-import >>> .el-dialog__body {
-    padding: 15px 25px;
-  }
+.api-import >>> .el-dialog__body {
+  padding: 15px 25px;
+}

-  .operate-button {
-    float: right;
-  }
+.operate-button {
+  float: right;
+}

-  .save-button {
-    margin-left: 10px;
-  }
+.save-button {
+  margin-left: 10px;
+}

-  .el-form {
-    padding: 30px 10px;
-  }
+.el-form {
+  padding: 30px 10px;
+}

-  .dialog-footer {
-    float: right;
-  }
+.dialog-footer {
+  float: right;
+}

-  .swagger-url-disable {
-    margin-top: 10px;
+.swagger-url-disable {
+  margin-top: 10px;

-    margin-left: 80px;
-  }
+  margin-left: 80px;
+}

 </style>
--- a/frontend/src/business/components/api/definition/components/import/ImportScheduleEdit.vue
+++ b/frontend/src/business/components/api/definition/components/import/ImportScheduleEdit.vue
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@ -826,6 +826,9 @@ export default {
      swagger_export_tip: "Export jSON-formatted files via Swagger website",
      suffixFormatErr: "The file format does not meet the requirements",
      swagger_url_import: "Import using URL",
+      timing_synchronization:"Timing synchronization",
+      next_synchronization_time:"Next synchronization time",
+
    },
    home_page: {
      unit_of_measurement: "",
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@ -827,6 +827,10 @@ export default {
      swagger_export_tip: "通过 Swagger 页面导出",
      suffixFormatErr: "文件格式不符合要求",
      swagger_url_import: "使用URL导入",
+      timing_synchronization:"定时同步",
+      next_synchronization_time:"下次同步时间"
+
+
    },
    home_page: {
      unit_of_measurement: "个",
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@ -827,6 +827,9 @@ export default {
      swagger_export_tip: "通過 Swagger 頁面導出",
      suffixFormatErr: "文件格式不符合要求",
      swagger_url_import: "使用URL導入",
+      timing_synchronization:"定時同步",
+      next_synchronization_time:"下次同步時間",
+
    },
    home_page: {
      unit_of_measurement: "個",