From fad9367f81ddf431f82fd440cbe1da2db252b7fe Mon Sep 17 00:00:00 2001
From: tomsun28 <tomsun28@outlook.com>
Date: Tue, 30 Nov 2021 22:18:03 +0800
Subject: [PATCH] =?UTF-8?q?[manager]=20=E7=9B=91=E6=8E=A7=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=EF=BC=8Cjar?=
 =?UTF-8?q?=E5=90=AF=E5=8A=A8=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/pom.xml                               | 19 ++++++++++++++++++-
 .../manager/controller/AppController.java     |  2 +-
 .../manager/service/impl/AppServiceImpl.java  |  4 ++--
 .../support/GlobalExceptionHandler.java       |  2 --
 .../main/resources/define/param/A-example.yml |  3 ++-
 5 files changed, 23 insertions(+), 7 deletions(-)

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 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-
     <artifactId>manager</artifactId>
+    <packaging>jar</packaging>
 
     <properties>
         <mysql.version>8.0.16</mysql.version>
@@ -94,4 +94,21 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.4.13</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
\ 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<Message<List<ParamDefine>>> queryAppParamDefines(
             @ApiParam(value = "监控类型名称", example = "api") @PathVariable("app") String app) {
-        List<ParamDefine> paramDefines = appService.getAppParamDefines(app);
+        List<ParamDefine> 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