test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

This commit is contained in:
liqiang-fit2cloud 2022-10-17 15:17:26 +08:00
parent 1548ddd25b 0dd84e128e
commit 36b24c44da
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
framework/sdk-parent/frontend/src/api/environment.js
View File

@ -137,9 +137,9 @@ export function jsonGenerator(params) {
export function getUserDefaultApiType() { export function getUserDefaultApiType() {
if (currentModuleName === 'api') { if (currentModuleName === 'api') {
return get('/api/module/getUserDefaultApiType'); return get('/api/module/default-type');
} }
return get('/environment/relate/api/module/getUserDefaultApiType'); return get('/environment/relate/api/module/default-type');
} }
export function getModuleByUrl(url) { export function getModuleByUrl(url) {

6
framework/sdk-parent/sdk/src/main/java/io/metersphere/environment/controller/EnvironmentRelateController.java
View File

@ -25,7 +25,7 @@ public class EnvironmentRelateController {
@PostMapping("/api/definition/list/batch") @PostMapping("/api/definition/list/batch")
public Object listBatch(@RequestBody Object obj) { public Object listBatch(@RequestBody Object obj) {
return microService.postForData(MicroServiceName.API_TEST, "/api/definition/generator", obj); return microService.postForData(MicroServiceName.API_TEST, "/api/definition/list/batch", obj);
} }
@PostMapping("/api/testcase/list-blobs") @PostMapping("/api/testcase/list-blobs")
@ -38,9 +38,9 @@ public class EnvironmentRelateController {
return microService.postForData(MicroServiceName.API_TEST, "/api/definition/generator", obj); return microService.postForData(MicroServiceName.API_TEST, "/api/definition/generator", obj);
} }
@GetMapping("/api/module/getUserDefaultApiType") @GetMapping("/api/module/default-type")
public Object getUserDefaultApiType() { public Object getUserDefaultApiType() {
return microService.getForData(MicroServiceName.API_TEST, "/api/module/getUserDefaultApiType/"); return microService.getForData(MicroServiceName.API_TEST, "/api/module/default-type");
} }
@PostMapping("/api/definition/list/{goPage}/{pageSize}") @PostMapping("/api/definition/list/{goPage}/{pageSize}")