diff --git a/framework/sdk-parent/sdk/src/main/java/io/metersphere/controller/remote/BasePlatformPluginController.java b/framework/sdk-parent/sdk/src/main/java/io/metersphere/controller/remote/BasePlatformPluginController.java index 6be4fcf099..67002fa9b3 100644 --- a/framework/sdk-parent/sdk/src/main/java/io/metersphere/controller/remote/BasePlatformPluginController.java +++ b/framework/sdk-parent/sdk/src/main/java/io/metersphere/controller/remote/BasePlatformPluginController.java @@ -1,6 +1,6 @@ package io.metersphere.controller.remote; -import io.metersphere.service.remote.SystemSettingService; +import io.metersphere.service.remote.BaseSystemSettingService; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -12,17 +12,17 @@ import javax.servlet.http.HttpServletRequest; public class BasePlatformPluginController { @Resource - SystemSettingService systemSettingService; + BaseSystemSettingService baseSystemSettingService; @PostMapping("/**") public Object list(HttpServletRequest request, @RequestBody Object param) { String url = request.getRequestURI().replace("/global", ""); - return systemSettingService.post(url, param); + return baseSystemSettingService.post(url, param); } @GetMapping("/**") public Object get(HttpServletRequest request) { String url = request.getRequestURI().replace("/global", ""); - return systemSettingService.get(url); + return baseSystemSettingService.get(url); } } diff --git a/framework/sdk-parent/sdk/src/main/java/io/metersphere/service/remote/SystemSettingService.java b/framework/sdk-parent/sdk/src/main/java/io/metersphere/service/remote/BaseSystemSettingService.java similarity index 71% rename from framework/sdk-parent/sdk/src/main/java/io/metersphere/service/remote/SystemSettingService.java rename to framework/sdk-parent/sdk/src/main/java/io/metersphere/service/remote/BaseSystemSettingService.java index bb9a318b08..b256429ee6 100644 --- a/framework/sdk-parent/sdk/src/main/java/io/metersphere/service/remote/SystemSettingService.java +++ b/framework/sdk-parent/sdk/src/main/java/io/metersphere/service/remote/BaseSystemSettingService.java @@ -5,8 +5,8 @@ import io.metersphere.service.RemoteService; import org.springframework.stereotype.Service; @Service -public class SystemSettingService extends RemoteService { - public SystemSettingService() { +public class BaseSystemSettingService extends RemoteService { + public BaseSystemSettingService() { super(MicroServiceName.SYSTEM_SETTING); } } diff --git a/project-management/backend/src/main/java/io/metersphere/controller/remote/SystemSettingController.java b/project-management/backend/src/main/java/io/metersphere/controller/remote/SystemSettingController.java index c7b1244cee..8875819f08 100644 --- a/project-management/backend/src/main/java/io/metersphere/controller/remote/SystemSettingController.java +++ b/project-management/backend/src/main/java/io/metersphere/controller/remote/SystemSettingController.java @@ -1,7 +1,7 @@ package io.metersphere.controller.remote; import io.metersphere.remote.service.PlatformPluginService; -import io.metersphere.service.remote.SystemSettingService; +import io.metersphere.service.remote.BaseSystemSettingService; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -14,18 +14,18 @@ import javax.servlet.http.HttpServletResponse; }) public class SystemSettingController { @Resource - SystemSettingService systemSettingService; + BaseSystemSettingService baseSystemSettingService; @Resource PlatformPluginService platformPluginService; @PostMapping("/**") public Object list(HttpServletRequest request, @RequestBody Object param) { - return systemSettingService.post(request, param); + return baseSystemSettingService.post(request, param); } @GetMapping("/**") public Object get(HttpServletRequest request) { - return systemSettingService.get(request); + return baseSystemSettingService.get(request); } @GetMapping("/resource/{pluginId}")