丁云鹏 1 год назад
Родитель
Сommit
9a68a3f7b7

+ 9 - 2
recommend-feature-client/src/main/java/com/tzld/piaoquan/recommend/feature/client/ProtobufUtils.java

@@ -4,16 +4,23 @@ import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.Message;
 import com.google.protobuf.MessageOrBuilder;
 import com.google.protobuf.util.JsonFormat;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * @author dyp
  */
+@Slf4j
 public class ProtobufUtils {
-    public static String toJson(MessageOrBuilder message) throws InvalidProtocolBufferException {
+    public static String toJson(MessageOrBuilder message) {
         if (message == null) {
             return "";
         }
-        return JsonFormat.printer().includingDefaultValueFields().print(message);
+        try {
+            return JsonFormat.printer().includingDefaultValueFields().print(message);
+        } catch (InvalidProtocolBufferException e) {
+            log.error("ProtobufUtils toJson error", e);
+        }
+        return "";
     }
 
     public static void fromJson(String json, Message.Builder builder) throws InvalidProtocolBufferException {

+ 9 - 0
recommend-feature-service/src/main/java/com/tzld/piaoquan/recommend/feature/grpcservice/FeatureGrpcService.java

@@ -1,9 +1,11 @@
 package com.tzld.piaoquan.recommend.feature.grpcservice;
 
+import com.tzld.piaoquan.recommend.feature.client.ProtobufUtils;
 import com.tzld.piaoquan.recommend.feature.model.feature.*;
 import com.tzld.piaoquan.recommend.feature.service.UserFeatureService;
 import com.tzld.piaoquan.recommend.feature.service.VideoFeatureService;
 import io.grpc.stub.StreamObserver;
+import lombok.extern.slf4j.Slf4j;
 import net.devh.boot.grpc.server.service.GrpcService;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -11,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  * @author dyp
  */
 @GrpcService
+@Slf4j
 public class FeatureGrpcService extends FeatureServiceGrpc.FeatureServiceImplBase {
     @Autowired
     private UserFeatureService userFeatureService;
@@ -19,7 +22,9 @@ public class FeatureGrpcService extends FeatureServiceGrpc.FeatureServiceImplBas
 
     @Override
     public void getUserFeature(GetUserFeatureRequest request, StreamObserver<GetUserFeatureResponse> responseObserver) {
+        log.info("FeatureGrpcService getUserFeature request={}", ProtobufUtils.toJson(request));
         GetUserFeatureResponse response = userFeatureService.getUserFeature(request);
+        log.info("FeatureGrpcService getUserFeature response={}", ProtobufUtils.toJson(response));
         responseObserver.onNext(response);
         responseObserver.onCompleted();
     }
@@ -27,7 +32,9 @@ public class FeatureGrpcService extends FeatureServiceGrpc.FeatureServiceImplBas
     @Override
     public void getVideoFeature(GetVideoFeatureRequest request,
                                 StreamObserver<GetVideoFeatureResponse> responseObserver) {
+        log.info("FeatureGrpcService getVideoFeature request={}", ProtobufUtils.toJson(request));
         GetVideoFeatureResponse response = videoFeatureService.getVideoFeature(request);
+        log.info("FeatureGrpcService getVideoFeature response={}", ProtobufUtils.toJson(response));
         responseObserver.onNext(response);
         responseObserver.onCompleted();
     }
@@ -35,7 +42,9 @@ public class FeatureGrpcService extends FeatureServiceGrpc.FeatureServiceImplBas
     @Override
     public void getAllVideoFeature(GetAllVideoFeatureRequest request,
                                    StreamObserver<GetAllVideoFeatureResponse> responseObserver) {
+        log.info("FeatureGrpcService getAllVideoFeature request={}", ProtobufUtils.toJson(request));
         GetAllVideoFeatureResponse response = videoFeatureService.getAllVideoFeature(request);
+        log.info("FeatureGrpcService getAllVideoFeature response={}", ProtobufUtils.toJson(response));
         responseObserver.onNext(response);
         responseObserver.onCompleted();
     }

+ 0 - 1
recommend-feature-service/src/main/java/com/tzld/piaoquan/recommend/feature/service/VideoFeatureService.java

@@ -64,7 +64,6 @@ public class VideoFeatureService extends AbstractFeatureService<String, VideoFea
 //    }
 
     public GetAllVideoFeatureResponse getAllVideoFeature(GetAllVideoFeatureRequest request) {
-        // TODO
         if (request.getVideoIdCount() == 0) {
             return GetAllVideoFeatureResponse.newBuilder()
                     .setResult(Result.newBuilder().setCode(1))