diff --git a/manager/pom.xml b/manager/pom.xml index 1c66c88..e3a9f3d 100644 --- a/manager/pom.xml +++ b/manager/pom.xml @@ -8,8 +8,8 @@ 1.0-SNAPSHOT 4.0.0 - manager + jar 8.0.16 @@ -94,4 +94,21 @@ + + + + org.springframework.boot + spring-boot-maven-plugin + 2.4.13 + + + + repackage + + + + + + + \ No newline at end of file diff --git a/manager/src/main/java/com/usthe/manager/controller/AppController.java b/manager/src/main/java/com/usthe/manager/controller/AppController.java index b488ba4..2090540 100644 --- a/manager/src/main/java/com/usthe/manager/controller/AppController.java +++ b/manager/src/main/java/com/usthe/manager/controller/AppController.java @@ -34,7 +34,7 @@ public class AppController { @ApiOperation(value = "查询监控类型的参数结构", notes = "根据app查询指定监控类型的需要输入参数的结构") public ResponseEntity>> queryAppParamDefines( @ApiParam(value = "监控类型名称", example = "api") @PathVariable("app") String app) { - List paramDefines = appService.getAppParamDefines(app); + List paramDefines = appService.getAppParamDefines(app.toLowerCase()); return ResponseEntity.ok(new Message<>(paramDefines)); } diff --git a/manager/src/main/java/com/usthe/manager/service/impl/AppServiceImpl.java b/manager/src/main/java/com/usthe/manager/service/impl/AppServiceImpl.java index aa1a323..85d3d52 100644 --- a/manager/src/main/java/com/usthe/manager/service/impl/AppServiceImpl.java +++ b/manager/src/main/java/com/usthe/manager/service/impl/AppServiceImpl.java @@ -72,7 +72,7 @@ public class AppServiceImpl implements AppService, CommandLineRunner { if (appFile.exists()) { try (FileInputStream fileInputStream = new FileInputStream(appFile)) { Job app = yaml.loadAs(fileInputStream, Job.class); - appDefines.put(app.getApp(), app); + appDefines.put(app.getApp().toLowerCase(), app); } catch (IOException e) { log.error(e.getMessage(), e); throw new IOException(e); @@ -91,7 +91,7 @@ public class AppServiceImpl implements AppService, CommandLineRunner { if (appFile.exists()) { try (FileInputStream fileInputStream = new FileInputStream(appFile)) { ParamDefineDto paramDefine = yaml.loadAs(fileInputStream, ParamDefineDto.class); - paramDefines.put(paramDefine.getApp(), paramDefine.getParam()); + paramDefines.put(paramDefine.getApp().toLowerCase(), paramDefine.getParam()); } catch (IOException e) { log.error(e.getMessage(), e); throw new IOException(e); diff --git a/manager/src/main/java/com/usthe/manager/support/GlobalExceptionHandler.java b/manager/src/main/java/com/usthe/manager/support/GlobalExceptionHandler.java index c384d4f..cd172a5 100644 --- a/manager/src/main/java/com/usthe/manager/support/GlobalExceptionHandler.java +++ b/manager/src/main/java/com/usthe/manager/support/GlobalExceptionHandler.java @@ -18,8 +18,6 @@ import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestControllerAdvice; -import javax.validation.ConstraintViolationException; -import javax.validation.ValidationException; import java.lang.reflect.Field; import static com.usthe.common.util.CommonConstants.DETECT_FAILED; diff --git a/manager/src/main/resources/define/param/A-example.yml b/manager/src/main/resources/define/param/A-example.yml index 43fdf24..755df76 100644 --- a/manager/src/main/resources/define/param/A-example.yml +++ b/manager/src/main/resources/define/param/A-example.yml @@ -28,7 +28,8 @@ param: required: false - field: ssl name: 启动SSL - type: radio + type: boolean required: false + # 当type为boolean时,前端用switch展示开关 # 当type为radio单选框,checkbox复选框时,option表示可选项值列表 option: Yes,No \ No newline at end of file