diff --git a/backend/services/system-setting/pom.xml b/backend/services/system-setting/pom.xml index e9d2552513..bba7b2bd85 100644 --- a/backend/services/system-setting/pom.xml +++ b/backend/services/system-setting/pom.xml @@ -30,6 +30,27 @@ + + org.apache.maven.plugins + maven-antrun-plugin + + + main-class-placement + generate-resources + + ${skipAntRunForJenkins} + + + + + + + + run + + + + org.mybatis.generator mybatis-generator-maven-plugin diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/controller/BaseDisplayController.java b/backend/services/system-setting/src/main/java/io/metersphere/system/controller/BaseDisplayController.java index 8b358ca49b..e68bb401c1 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/controller/BaseDisplayController.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/controller/BaseDisplayController.java @@ -17,31 +17,31 @@ import java.io.IOException; public class BaseDisplayController { @Resource - private BaseDisplayService displayService; + private BaseDisplayService baseDisplayService; @Operation(summary = "获取icon图片") @GetMapping("/get/icon") public ResponseEntity getIcon() throws IOException { - return displayService.getFile("icon"); + return baseDisplayService.getFile("icon"); } @Operation(summary = "获取loginImage图片") @GetMapping("/get/login-image") public ResponseEntity getLoginImage() throws IOException { - return displayService.getFile("loginImage"); + return baseDisplayService.getFile("loginImage"); } @Operation(summary = "获取loginLogo图片") @GetMapping("/get/login-logo") public ResponseEntity getLoginLogo() throws IOException { - return displayService.getFile("loginLogo"); + return baseDisplayService.getFile("loginLogo"); } @Operation(summary = "获取logoPlatform图片") @GetMapping("/get/logo-platform") public ResponseEntity getLogoPlatform() throws IOException { - return displayService.getFile("logoPlatform"); + return baseDisplayService.getFile("logoPlatform"); } } diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/dto/AuthSourceDTO.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/AuthSourceDTO.java index 073cd42de4..e628263611 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/dto/AuthSourceDTO.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/AuthSourceDTO.java @@ -27,4 +27,7 @@ public class AuthSourceDTO implements Serializable { @Schema(title = "认证源配置", requiredMode = Schema.RequiredMode.REQUIRED) private String configuration; + + @Schema(title = "是否启用") + private Boolean enable; } diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/AuthSourceService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/AuthSourceService.java index 4be5024005..26fa03756b 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/AuthSourceService.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/AuthSourceService.java @@ -87,6 +87,7 @@ public class AuthSourceService { source.setName(authSource.getName()); source.setDescription(authSource.getDescription()); source.setConfiguration(authSource.getConfiguration().getBytes()); + source.setType(authSource.getType()); source.setUpdateTime(System.currentTimeMillis()); authSourceMapper.updateByPrimaryKeySelective(source); } diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseDisplayService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseDisplayService.java index f6c9690cab..af648b585a 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseDisplayService.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseDisplayService.java @@ -50,14 +50,14 @@ public class BaseDisplayService { bytes = IOUtils.toByteArray(resolver.getResource("/static/favicon.ico").getInputStream()); break; case "logoPlatform": - bytes = IOUtils.toByteArray(resolver.getResource("/static/svg/MS-full-logo.svg").getInputStream()); + bytes = IOUtils.toByteArray(resolver.getResource("/static/images/MS-full-logo.svg").getInputStream()); contentType = MediaType.valueOf("image/svg+xml"); break; case "loginImage": bytes = IOUtils.toByteArray(resolver.getResource("/static/images/login-banner.jpg").getInputStream()); break; default: - bytes = IOUtils.toByteArray(resolver.getResource("/static/svg/login-logo.svg").getInputStream()); + bytes = IOUtils.toByteArray(resolver.getResource("/static/images/login-logo.svg").getInputStream()); contentType = MediaType.valueOf("image/svg+xml"); break; }