support app-detail and app-service

robberphex · robberphex · commit 54e27ab65406 · 2022-05-09T16:52:41.000+08:00
diff --git a/opensergo-dashboard-server/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/MachineRegistryController.java b/opensergo-dashboard-server/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/MachineRegistryController.java
@@ -20,7 +20,6 @@
 import com.alibaba.csp.sentinel.dashboard.domain.Result;
 import com.alibaba.csp.sentinel.util.StringUtil;
 import com.google.common.net.InetAddresses;
-import io.opensergo.dashboard.repository.application.ApplicationRepository;
 import io.opensergo.dashboard.service.application.ApplicationService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -83,7 +82,7 @@ public Result<?> receiveHeartBeat(String app,
             machineInfo.setVersion(sentinelVersion);
             appManagement.addMachine(machineInfo);
 
-            applicationService.createApplication(app);
+            applicationService.createApplication(app, "");
 
             return Result.ofSuccessMsg("success");
         } catch (Exception e) {
diff --git a/opensergo-dashboard-server/src/main/java/io/opensergo/dashboard/controller/application/ApplicationController.java b/opensergo-dashboard-server/src/main/java/io/opensergo/dashboard/controller/application/ApplicationController.java
@@ -50,6 +50,7 @@ public Result<ApplicationItem> describeApplication(
         if (appEntity.isPresent()) {
             ApplicationItem appItem = new ApplicationItem();
             appItem.setAppName(appEntity.get().getName());
+            appItem.setSha256(appEntity.get().getSha256());
             return Result.ofSuccess(appItem);
         }
         return Result.ofSuccess(null);
diff --git a/opensergo-dashboard-server/src/main/java/io/opensergo/dashboard/controller/service/ServiceController.java b/opensergo-dashboard-server/src/main/java/io/opensergo/dashboard/controller/service/ServiceController.java
@@ -0,0 +1,105 @@
+package io.opensergo.dashboard.controller.service;
+
+import com.alibaba.csp.sentinel.dashboard.domain.PagedResult;
+import com.alibaba.csp.sentinel.dashboard.domain.Result;
+import com.google.protobuf.InvalidProtocolBufferException;
+import com.google.protobuf.util.JsonFormat;
+import io.opensergo.dashboard.domain.application.MetadataEntity;
+import io.opensergo.dashboard.repository.application.ApplicationRepository;
+import io.opensergo.dashboard.repository.application.MetadataRepository;
+import io.opensergo.dashboard.vo.service.MethodItem;
+import io.opensergo.dashboard.vo.service.ServiceItem;
+import io.opensergo.proto.service_contract.v1.MethodDescriptor;
+import io.opensergo.proto.service_contract.v1.ReportMetadataRequest;
+import io.opensergo.proto.service_contract.v1.ServiceDescriptor;
+import io.opensergo.proto.service_contract.v1.ServiceMetadata;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Pageable;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.*;
+
+/**
+ * @author luyanbo
+ */
+@RestController
+@RequestMapping(value = "/api/service/")
+public class ServiceController {
+
+    @Autowired
+    private ApplicationRepository applicationRepository;
+
+    @Autowired
+    private MetadataRepository metadataRepository;
+
+    @GetMapping("/queryService")
+    public PagedResult<List<ServiceItem>> queryService(
+            String appName,
+            String protocol,
+            Pageable pageable
+    ) throws InvalidProtocolBufferException {
+        Optional<MetadataEntity> metadataOptional = metadataRepository.findByAppName(appName);
+        if (!metadataOptional.isPresent()) {
+            return PagedResult.ofSuccess(new ArrayList<>());
+        }
+        MetadataEntity appEntity = metadataOptional.get();
+        String metadataStr = appEntity.getMetadata();
+        ReportMetadataRequest.Builder reqBuilder = ReportMetadataRequest.newBuilder();
+        JsonFormat.parser().merge(metadataStr, reqBuilder);
+
+        List<ServiceItem> serviceItems = new ArrayList<>();
+        for (ServiceMetadata serviceMetadata : reqBuilder.getServiceMetadataList()) {
+            if (!serviceMetadata.getProtocolsList().contains(protocol)) {
+                continue;
+            }
+            for (ServiceDescriptor serviceDescriptor : serviceMetadata.getServiceContract().getServicesList()) {
+                ServiceItem serviceItem = new ServiceItem();
+                serviceItem.setAppName(reqBuilder.getAppName());
+                serviceItem.setServiceName(serviceDescriptor.getName());
+                serviceItems.add(serviceItem);
+            }
+        }
+        return PagedResult.ofSuccess(serviceItems);
+    }
+
+    @GetMapping("/queryServiceMethod")
+    public Result<List<MethodItem>> queryServiceMethod(
+            String appName,
+            String serviceName,
+            String protocol,
+            Pageable pageable
+    ) throws InvalidProtocolBufferException {
+        Optional<MetadataEntity> metadataOptional = metadataRepository.findByAppName(appName);
+        if (!metadataOptional.isPresent()) {
+            return Result.ofSuccess(null);
+        }
+        MetadataEntity appEntity = metadataOptional.get();
+        String metadataStr = appEntity.getMetadata();
+        ReportMetadataRequest.Builder reqBuilder = ReportMetadataRequest.newBuilder();
+        JsonFormat.parser().merge(metadataStr, reqBuilder);
+
+        List<MethodItem> methodItems = new ArrayList<>();
+        Set<String> methodNames = new HashSet<>();
+        for (ServiceMetadata serviceMetadata : reqBuilder.getServiceMetadataList()) {
+            if (!serviceMetadata.getProtocolsList().contains(protocol)) {
+                continue;
+            }
+            for (ServiceDescriptor serviceDescriptor : serviceMetadata.getServiceContract().getServicesList()) {
+                if (serviceName.equals(serviceDescriptor.getName())) {
+                    for (MethodDescriptor methodDescriptor : serviceDescriptor.getMethodsList()) {
+                        if (methodNames.contains(methodDescriptor.getName())) {
+                            continue;
+                        }
+                        methodNames.add(methodDescriptor.getName());
+                        MethodItem methodItem = new MethodItem();
+                        methodItem.setMethodName(methodDescriptor.getName());
+                        methodItems.add(methodItem);
+                    }
+                }
+            }
+        }
+        return Result.ofSuccess(methodItems);
+    }
+}
diff --git a/opensergo-dashboard-server/src/main/java/io/opensergo/dashboard/domain/application/ApplicationEntity.java b/opensergo-dashboard-server/src/main/java/io/opensergo/dashboard/domain/application/ApplicationEntity.java
@@ -17,4 +17,6 @@ public class ApplicationEntity {
     private Long id;
 
     private String name;
+
+    private String sha256;
 }
diff --git a/opensergo-dashboard-server/src/main/java/io/opensergo/dashboard/domain/application/MetadataEntity.java b/opensergo-dashboard-server/src/main/java/io/opensergo/dashboard/domain/application/MetadataEntity.java
@@ -16,7 +16,7 @@ public class MetadataEntity {
     @Id
     private Long id;
 
-    private String sha512;
+    private String sha256;
 
     private String appName;
 
diff --git a/opensergo-dashboard-server/src/main/java/io/opensergo/dashboard/grpc/service/GrpcMetadataService.java b/opensergo-dashboard-server/src/main/java/io/opensergo/dashboard/grpc/service/GrpcMetadataService.java
@@ -2,7 +2,6 @@
 
 import com.google.protobuf.util.JsonFormat;
 import io.grpc.stub.StreamObserver;
-import io.opensergo.dashboard.domain.application.ApplicationEntity;
 import io.opensergo.dashboard.domain.application.MetadataEntity;
 import io.opensergo.dashboard.repository.application.MetadataRepository;
 import io.opensergo.dashboard.service.application.ApplicationService;
@@ -43,17 +42,17 @@ public void reportMetadata(ReportMetadataRequest request, StreamObserver<ReportM
 
         log.info("reportMetadata request: {}", metadata);
 
-        applicationService.createApplication(appName);
-        recordMetadata(appName, metadataEntity, metadata);
+        metadataEntity = recordMetadata(appName, metadataEntity, metadata);
+        applicationService.createApplication(appName, metadataEntity.getSha256());
 
         responseObserver.onNext(ReportMetadataReply.newBuilder().build());
         responseObserver.onCompleted();
     }
 
-    private void recordMetadata(String appName, MetadataEntity metadataEntity, String metadata) {
+    private MetadataEntity recordMetadata(String appName, MetadataEntity metadataEntity, String metadata) {
         metadataEntity.setAppName(appName);
         metadataEntity.setMetadata(metadata);
-        metadataEntity.setSha512(DigestUtils.sha512Hex(metadata));
-        metadataRepository.save(metadataEntity);
+        metadataEntity.setSha256(DigestUtils.sha256Hex(metadata));
+        return metadataRepository.save(metadataEntity);
     }
 }
diff --git a/opensergo-dashboard-server/src/main/java/io/opensergo/dashboard/repository/application/MetadataRepository.java b/opensergo-dashboard-server/src/main/java/io/opensergo/dashboard/repository/application/MetadataRepository.java
@@ -9,4 +9,6 @@ public interface MetadataRepository extends Repository<MetadataEntity, String> {
     MetadataEntity save(MetadataEntity entity);
 
     Optional<MetadataEntity> findByAppName(String appName);
+
+    Optional<MetadataEntity> findBySha256(String sha256);
 }
diff --git a/opensergo-dashboard-server/src/main/java/io/opensergo/dashboard/service/application/ApplicationService.java b/opensergo-dashboard-server/src/main/java/io/opensergo/dashboard/service/application/ApplicationService.java
@@ -13,10 +13,11 @@ public class ApplicationService {
     @Autowired
     private ApplicationRepository applicationRepository;
 
-    public void createApplication(String appName) {
+    public void createApplication(String appName, String sha256) {
         ApplicationEntity app = applicationRepository.findByName(appName).orElseGet(() ->
                 ApplicationEntity.builder()
                         .name(appName)
+                        .sha256(sha256)
                         .build()
         );
         applicationRepository.save(app);
diff --git a/opensergo-dashboard-server/src/main/java/io/opensergo/dashboard/vo/application/ApplicationItem.java b/opensergo-dashboard-server/src/main/java/io/opensergo/dashboard/vo/application/ApplicationItem.java
@@ -7,4 +7,6 @@
 @NoArgsConstructor
 public class ApplicationItem {
     String appName;
+
+    String sha256;
 }
diff --git a/opensergo-dashboard-server/src/main/java/io/opensergo/dashboard/vo/service/MethodItem.java b/opensergo-dashboard-server/src/main/java/io/opensergo/dashboard/vo/service/MethodItem.java
@@ -0,0 +1,10 @@
+package io.opensergo.dashboard.vo.service;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+public class MethodItem {
+    String methodName;
+}
diff --git a/opensergo-dashboard-server/src/main/java/io/opensergo/dashboard/vo/service/ServiceItem.java b/opensergo-dashboard-server/src/main/java/io/opensergo/dashboard/vo/service/ServiceItem.java
@@ -0,0 +1,12 @@
+package io.opensergo.dashboard.vo.service;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+public class ServiceItem {
+    String appName;
+
+    String serviceName;
+}
diff --git a/opensergo-dashboard-server/src/main/resources/application.yaml b/opensergo-dashboard-server/src/main/resources/application.yaml
@@ -30,7 +30,7 @@ logging:
 #auth settings
 auth:
   filter:
-    exclude-urls: /,/sentinel,/auth/login,/auth/logout,/registry/machine,/version,/api/application/**
+    exclude-urls: /,/sentinel,/auth/login,/auth/logout,/registry/machine,/version,/api/**
     exclude-url-suffixes: htm,html,js,css,map,ico,ttf,woff,png
   # If auth.enabled=false, Sentinel console disable login
   username: sentinel
diff --git a/opensergo-dashboard-server/src/main/resources/schema.sql b/opensergo-dashboard-server/src/main/resources/schema.sql
@@ -2,14 +2,15 @@ CREATE TABLE `application`
 (
     `id`   bigint(20) NOT NULL AUTO_INCREMENT,
     `name` varchar(100) NOT NULL,
+    `sha256` char(64) NOT NULL,
     PRIMARY KEY (`id`),
     UNIQUE KEY `uniq_name` (`name`)
 ) DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE `metadata`
 (
     `id`   bigint(20) NOT NULL AUTO_INCREMENT,
-    `sha512` char(128) NOT NULL,
+    `sha256` char(64) NOT NULL,
     `app_name` varchar(100) NOT NULL,
     `metadata` mediumtext NOT NULL,
     PRIMARY KEY (`id`),
diff --git a/opensergo-dashboard-ui/package-lock.json b/opensergo-dashboard-ui/package-lock.json
diff --git a/opensergo-dashboard-ui/src/App.tsx b/opensergo-dashboard-ui/src/App.tsx
@@ -29,10 +29,16 @@ function App() {
             nav={<Nav />}
         >
             <Switch>
-                <Route path="/application/:appName">
+                <Route path="/application/detail">
                     <AppDetail  />
                 </Route>
-                <Route path="/application">
+                <Route path="/application/service">
+                    <AppDetail  />
+                </Route>
+                <Route exact path="/application">
+                    <AppList />
+                </Route>
+                <Route exact path="/application">
                     <AppList />
                 </Route>
                 <Route path="/">
diff --git a/opensergo-dashboard-ui/src/AppList.tsx b/opensergo-dashboard-ui/src/AppList.tsx
diff --git a/opensergo-dashboard-ui/src/component/RpcServiceList.tsx b/opensergo-dashboard-ui/src/component/RpcServiceList.tsx
diff --git a/opensergo-dashboard-ui/src/component/RpcServiceMethodList.tsx b/opensergo-dashboard-ui/src/component/RpcServiceMethodList.tsx
diff --git a/opensergo-dashboard-ui/src/page/AppDetail.tsx b/opensergo-dashboard-ui/src/page/AppDetail.tsx

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ public Result<ApplicationItem> describeApplication(`
`50`	`50`	`if (appEntity.isPresent()) {`
`51`	`51`	`ApplicationItem appItem = new ApplicationItem();`
`52`	`52`	`appItem.setAppName(appEntity.get().getName());`
	`53`	`+ appItem.setSha256(appEntity.get().getSha256());`
`53`	`54`	`return Result.ofSuccess(appItem);`
`54`	`55`	`}`
`55`	`56`	`return Result.ofSuccess(null);`
Original file line number	Diff line number	Diff line change
`@@ -17,4 +17,6 @@ public class ApplicationEntity {`
`17`	`17`	`private Long id;`
`18`	`18`
`19`	`19`	`private String name;`
	`20`	`+`
	`21`	`+ private String sha256;`
`20`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,4 +9,6 @@ public interface MetadataRepository extends Repository<MetadataEntity, String> {`
`9`	`9`	`MetadataEntity save(MetadataEntity entity);`
`10`	`10`
`11`	`11`	`Optional<MetadataEntity> findByAppName(String appName);`
	`12`	`+`
	`13`	`+ Optional<MetadataEntity> findBySha256(String sha256);`
`12`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,4 +7,6 @@`
`7`	`7`	`@NoArgsConstructor`
`8`	`8`	`public class ApplicationItem {`
`9`	`9`	`String appName;`
	`10`	`+`
	`11`	`+ String sha256;`
`10`	`12`	`}`