Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7
This commit is contained in:
commit
1b3a95fde2
backend/src/main/java/io/metersphere/api/service
frontend/src/business/components
|
@ -661,7 +661,10 @@ public class ApiDefinitionService {
|
||||||
public String getResourceId(SwaggerUrlRequest swaggerUrlRequest) {
|
public String getResourceId(SwaggerUrlRequest swaggerUrlRequest) {
|
||||||
SwaggerUrlProjectExample swaggerUrlProjectExample = new SwaggerUrlProjectExample();
|
SwaggerUrlProjectExample swaggerUrlProjectExample = new SwaggerUrlProjectExample();
|
||||||
SwaggerUrlProjectExample.Criteria criteria = swaggerUrlProjectExample.createCriteria();
|
SwaggerUrlProjectExample.Criteria criteria = swaggerUrlProjectExample.createCriteria();
|
||||||
criteria.andProjectIdEqualTo(swaggerUrlRequest.getProjectId()).andSwaggerUrlEqualTo(swaggerUrlRequest.getSwaggerUrl()).andModuleIdEqualTo(swaggerUrlRequest.getModuleId());
|
criteria.andProjectIdEqualTo(swaggerUrlRequest.getProjectId()).andSwaggerUrlEqualTo(swaggerUrlRequest.getSwaggerUrl());
|
||||||
|
if (StringUtils.isNotBlank(swaggerUrlRequest.getModuleId())) {
|
||||||
|
criteria.andModuleIdEqualTo(swaggerUrlRequest.getModuleId());
|
||||||
|
}
|
||||||
List<SwaggerUrlProject> list = swaggerUrlProjectMapper.selectByExample(swaggerUrlProjectExample);
|
List<SwaggerUrlProject> list = swaggerUrlProjectMapper.selectByExample(swaggerUrlProjectExample);
|
||||||
String resourceId = "";
|
String resourceId = "";
|
||||||
if (list.size() == 1) {
|
if (list.size() == 1) {
|
||||||
|
|
|
@ -117,7 +117,7 @@ export default {
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
id: 'incrementalMerge',
|
id: 'incrementalMerge',
|
||||||
name: this.$t('commons.not.cover')
|
name: this.$t('commons.not_cover')
|
||||||
}],
|
}],
|
||||||
protocol: "",
|
protocol: "",
|
||||||
platforms: [
|
platforms: [
|
||||||
|
@ -152,7 +152,7 @@ export default {
|
||||||
formData: {
|
formData: {
|
||||||
file: undefined,
|
file: undefined,
|
||||||
swaggerUrl: '',
|
swaggerUrl: '',
|
||||||
modeId: this.$t('commons.not.cover'),
|
modeId: this.$t('commons.not_cover'),
|
||||||
moduleId: '',
|
moduleId: '',
|
||||||
},
|
},
|
||||||
rules: {},
|
rules: {},
|
||||||
|
|
|
@ -252,9 +252,6 @@ export default {
|
||||||
activated() {
|
activated() {
|
||||||
this.initTableData();
|
this.initTableData();
|
||||||
},
|
},
|
||||||
created() {
|
|
||||||
this.list()
|
|
||||||
},
|
|
||||||
methods: {
|
methods: {
|
||||||
create() {
|
create() {
|
||||||
this.dialogOrgAddVisible = true;
|
this.dialogOrgAddVisible = true;
|
||||||
|
|
Loading…
Reference in New Issue