Merge pull request #31 from SpringCloud/develop

app增加功能合并到master

Author: SoftwareKing

README.md

@@ -72,7 +72,8 @@ Roadmap 时间点：
 | 姓名 | 角色 | github地址|
 | -------- | -------- | -------- |
 |    SoftwareKing  | Owner | https://github.com/SoftwareKing|
-|   iShawnWang  | 前端开发 |https://github.com/iShawnWang |
+|   iShawnWang  | 前端开发 | https://github.com/iShawnWang |
+| homeant | 前后台开发 | https://github.com/homeant |
 
 ### 1.3 Moss的功能
 

moss-client/moss-client-2.x/src/main/java/org/xujin/moss/client/endpoint/MossMetricsEndpoint.java

@@ -53,19 +53,18 @@ public HaloMetricResponse HaloMetric() {
         haloMetricResponse.setJvmMemoryUsedHeap(String.valueOf(jvmNemoryUsedHeap.getMeasurements().get(0).getValue()));
         MetricResponse jvmNemoryUsedNonHeap=metric("jvm.memory.used", Arrays.asList("area:nonheap") );
         haloMetricResponse.setJvmMemoryUsedNonHeap(String.valueOf(jvmNemoryUsedNonHeap.getMeasurements().get(0).getValue()));
-
+        // 2.0 actuator/metrics 中没有这个key
         MetricResponse systemLoadAverage=metric("system.load.average.1m", null );
-        haloMetricResponse.setSystemloadAverage(String.valueOf(systemLoadAverage.getMeasurements().get(0).getValue()));
-
+        if(systemLoadAverage!=null){
+            haloMetricResponse.setSystemloadAverage(String.valueOf(systemLoadAverage.getMeasurements().get(0).getValue()));
+        }
         MetricResponse heapCommitted=metric("jvm.memory.committed", Arrays.asList("area:heap") );
         haloMetricResponse.setHeapCommitted(String.valueOf(heapCommitted.getMeasurements().get(0).getValue()));
         MetricResponse nonheapCommitted=metric("jvm.memory.committed", Arrays.asList("area:nonheap") );
         haloMetricResponse.setNonheapCommitted(String.valueOf(nonheapCommitted.getMeasurements().get(0).getValue()));
 
         MetricResponse heapMax=metric("jvm.memory.max", Arrays.asList("area:heap") );
         haloMetricResponse.setHeapMax(String.valueOf(heapMax.getMeasurements().get(0).getValue()));
-
-
         getGcinfo(haloMetricResponse);
         MemoryUsage memoryUsage = ManagementFactory.getMemoryMXBean()
                 .getHeapMemoryUsage();

moss-extension/src/main/java/org/xujin/moss/controller/AppController.java

@@ -42,10 +42,10 @@ public class AppController {
      */
     @PostMapping("/add")
     public ResultData addApp(@RequestBody AppModel appModel) {
-        ResultData result = new ResultData();
         appModel.setIsDeleted(Constants.IS_DELETE_FALSE);
         appService.addApp(appModel);
-        return result;
+        //返回成功状态
+        return ResultData.builder().data(appModel).build();
     }
 
     @GetMapping("/{id}")

moss-web/pom.xml

@@ -75,7 +75,7 @@
             <artifactId>springfox-swagger-ui</artifactId>
             <version>2.9.2</version>
         </dependency>
-        
+
 
 
 	</dependencies>

moss-web/src/main/resources/application.yml

@@ -20,7 +20,6 @@ spring:
     testOnReturn: false
     poolPreparedStatements: true
     maxOpenPreparedStatements: 20
-
   boot:
     admin:
       ## 兼容配置Spring Boot 1.X的端点和自定义的端点
@@ -29,7 +28,6 @@ spring:
 server:
   port: 8080
 
-
 eureka:
   instance:
     leaseRenewalIntervalInSeconds: 10