优化server context-path, gray infos

Author: saleson

spring-cloud-gray-core/pom.xml

@@ -16,7 +16,11 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>

spring-cloud-gray-core/src/main/java/cn/springcloud/gray/model/GrayInstance.java

@@ -1,5 +1,6 @@
 package cn.springcloud.gray.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -15,6 +16,7 @@
 @ToString
 @Setter
 @Getter
+@JsonIgnoreProperties({"gray"})
 public class GrayInstance implements Serializable {
 
     private static final long serialVersionUID = 1604426811546120884L;

spring-cloud-gray-plugins/spring-cloud-gray-plugin-webmvc/src/main/java/cn/springcloud/gray/client/config/GrayClientWebAutoConfiguration.java

@@ -3,10 +3,10 @@
 
 import cn.springcloud.gray.GrayManager;
 import cn.springcloud.gray.web.resources.DiscoveryInstanceResource;
+import cn.springcloud.gray.web.resources.GrayListResource;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
@@ -20,4 +20,9 @@ public DiscoveryInstanceResource discoveryInstanceResource() {
         return new DiscoveryInstanceResource();
     }
 
+    @Bean
+    public GrayListResource grayListResource() {
+        return new GrayListResource();
+    }
+
 }

spring-cloud-gray-plugins/spring-cloud-gray-plugin-webmvc/src/main/java/cn/springcloud/gray/web/resources/GrayListResource.java

@@ -37,6 +37,7 @@ public class GrayListResource {
     @GetMapping("/service/allInfos")
     public ApiRes<Map<String, Collection<GrayInstance>>> getAllGrayServiceInfos() {
         return ApiRes.<Map<String, Collection<GrayInstance>>>builder()
+                .code(ApiRes.CODE_SUCCESS)
                 .data(grayManager.getMapByAllGrayServices())
                 .build();
     }
@@ -49,6 +50,7 @@ public ApiRes<Map<String, Collection<GrayInstance>>> getAllGrayServiceInfos() {
     @GetMapping("/track/allDefinitions")
     public ApiRes<Collection<GrayTrackDefinition>> getAllGrayTracks() {
         return ApiRes.<Collection<GrayTrackDefinition>>builder()
+                .code(ApiRes.CODE_SUCCESS)
                 .data(grayTrackHolder.getTrackDefinitions())
                 .build();
     }

spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/ClientRemoteConfiguration.java renamed to spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/configuration/ClientRemoteConfiguration.java

@@ -1,4 +1,4 @@
-package cn.springcloud.gray.server;
+package cn.springcloud.gray.server.configuration;
 
 import cn.springcloud.gray.server.discovery.ServiceDiscovery;
 import cn.springcloud.gray.server.module.client.ClientRemoteModule;

spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/resources/ExceptionTranslator.java

@@ -2,6 +2,7 @@
 
 import cn.springcloud.gray.api.ApiRes;
 import cn.springcloud.gray.exceptions.NotFoundException;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ControllerAdvice;
@@ -14,24 +15,27 @@
  * @date 2019-11-25 21:49
  */
 @ControllerAdvice
+@Slf4j
 public class ExceptionTranslator {
 
 
     @ExceptionHandler(NotFoundException.class)
     @ResponseStatus(HttpStatus.NOT_FOUND)
     @ResponseBody
     public ApiRes<Void> processNotFoundException(NotFoundException ex) {
+        log.error("{}", ex.getMessage(), ex);
         return ApiRes.<Void>builder()
                 .code(ApiRes.CODE_NOT_FOUND)
                 .message(StringUtils.defaultIfEmpty(ex.getMessage(), HttpStatus.NOT_FOUND.getReasonPhrase()))
                 .build();
     }
 
 
-    @ExceptionHandler(NotFoundException.class)
+    @ExceptionHandler(IllegalArgumentException.class)
     @ResponseStatus(HttpStatus.BAD_REQUEST)
     @ResponseBody
     public ApiRes<Void> processIllegalArgumentException(IllegalArgumentException ex) {
+        log.error("{}", ex.getMessage(), ex);
         return ApiRes.<Void>builder()
                 .code(String.valueOf(HttpStatus.BAD_REQUEST))
                 .message(StringUtils.defaultIfEmpty(ex.getMessage(), "instance host or port is empty"))
@@ -43,6 +47,7 @@ public ApiRes<Void> processIllegalArgumentException(IllegalArgumentException ex)
     @ResponseStatus(HttpStatus.BAD_REQUEST)
     @ResponseBody
     public ApiRes<Void> processException(Exception ex) {
+        log.error("{}", ex.getMessage(), ex);
         return ApiRes.<Void>builder()
                 .code(String.valueOf(HttpStatus.BAD_REQUEST))
                 .message(StringUtils.defaultIfEmpty(ex.getMessage(), "error"))

spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/resources/rest/ClientGrayListResource.java

@@ -11,6 +11,7 @@
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.client.RestTemplate;
 
 import java.util.List;
@@ -20,6 +21,7 @@
  * @author saleson
  * @date 2019-11-24 14:40
  */
+@RestController
 @RequestMapping("/gray/client/grayList")
 public class ClientGrayListResource {
 

spring-cloud-gray-webui/src/views/gray-instance/complex-table.vue

@@ -104,7 +104,7 @@
             </el-dropdown-menu>
           </el-dropdown>
           <el-dropdown trigger="click">
-            <el-button size="mini" type="info" style="width:80px">
+            <el-button size="mini" type="info" style="width:80px" class="list-button">
               灰度信息
               <i class="el-icon-arrow-down" />
             </el-button>
@@ -158,7 +158,7 @@
     </el-dialog>
 
     <el-dialog :title="grayInfo.type" :visible.sync="grayInfo.dialogVisible" :loading="grayInfo.loading">
-      {{ grayInfo.content }}
+      <pre>{{ grayInfo.content }}</pre>
       <div slot="footer" class="dialog-footer">
         <el-button @click="grayInfo.dialogVisible = false">
           Cancel
@@ -441,6 +441,7 @@ export default {
       this.grayInfo.instanceId = row.instanceId
       this.grayInfo.type = type
       this.grayInfo.dialogVisible = true
+      this.grayInfo.content = ''
       this.refershGrayInfos()
     },
     refershGrayInfos() {

spring-cloud-gray-webui/src/views/gray-instance/discovery-instances.vue

@@ -68,7 +68,7 @@
             </el-dropdown-menu>
           </el-dropdown>
           <el-dropdown trigger="click">
-            <el-button size="mini" type="info" style="width:80px">
+            <el-button size="mini" type="info" style="width:80px" class="list-button">
               灰度信息
               <i class="el-icon-arrow-down" />
             </el-button>
@@ -80,12 +80,26 @@
         </template>
       </el-table-column>
     </el-table>
+
+    <el-dialog :title="grayInfo.type" :visible.sync="grayInfo.dialogVisible" :loading="grayInfo.loading">
+      <pre>{{ grayInfo.content }}</pre>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="grayInfo.dialogVisible = false">
+          Cancel
+        </el-button>
+        <el-button type="primary" @click="refershGrayInfos()">
+          Refersh
+        </el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
 import { fetchList, createInstance, tryChangeInstanceStatus } from '@/api/discovery-instance'
 import waves from '@/directive/waves' // waves directive
+import { getServiceAllInfos, getAllDefinitions } from '@/api/gray-client'
 import { parseTime } from '@/utils'
 
 export default {
@@ -127,6 +141,13 @@ export default {
         grayStatus: 'OPEN',
         des: ''
       },
+      grayInfo: {
+        instanceId: '',
+        type: '',
+        content: '',
+        dialogVisible: false,
+        loading: false
+      },
       downloadLoading: false,
       tempRoute: {}
     }
@@ -238,6 +259,27 @@ export default {
         this.downloadLoading = false
       })
     },
+    showGrayInfos(row, type) {
+      this.grayInfo.instanceId = row.instanceId
+      this.grayInfo.type = type
+      this.grayInfo.dialogVisible = true
+      this.grayInfo.content = ''
+      this.refershGrayInfos()
+    },
+    refershGrayInfos() {
+      this.grayInfo.loading = true
+      if (this.grayInfo.type === 'SERVICES') {
+        getServiceAllInfos(this.listQuery.serviceId, this.grayInfo.instanceId).then(res => {
+          this.grayInfo.content = res.data
+          this.grayInfo.loading = false
+        })
+      } else if (this.grayInfo.type === 'TRACKS') {
+        getAllDefinitions(this.listQuery.serviceId, this.grayInfo.instanceId).then(res => {
+          this.grayInfo.content = res.data
+          this.grayInfo.loading = false
+        })
+      }
+    },
     formatJson(filterVal, jsonData) {
       return jsonData.map(v => filterVal.map(j => {
         if (j === 'timestamp') {

spring-cloud-starter-gray-server/src/main/resources/META-INF/spring.factories

@@ -4,4 +4,5 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
   cn.springcloud.gray.server.configuration.DBStorageConfiguration,\
   cn.springcloud.gray.server.configuration.OperateAuditConfiguration,\
   cn.springcloud.gray.server.configuration.GrayServerEventAutoConfiguration,\
-  cn.springcloud.gray.server.configuration.OAuth2Config
+  cn.springcloud.gray.server.configuration.OAuth2Config,\
+  cn.springcloud.gray.server.configuration.ClientRemoteConfiguration