fix bug

recommend-feature-client/src/main/java/com/tzld/piaoquan/recommend/feature/client/FeatureClient.java

@@ -105,10 +105,10 @@ public class FeatureClient {
         return response.getAdItemFeature();
     }
 
-    public List<AdItemFeatureProto> getALLAdItemFeature(List<String> adIdList) {
+    public List<AdItemFeatureProto> getAllAdItemFeature(List<String> adIdList) {
         GetAllAdItemFeatureRequest.Builder buildr = GetAllAdItemFeatureRequest.newBuilder();
         buildr.addAllAdId(adIdList);
-        GetAllAdItemFeatureResponse response = client.gETAllAdItemFeature(buildr.build());
+        GetAllAdItemFeatureResponse response = client.getAllAdItemFeature(buildr.build());
         if (response == null || !response.hasResult()) {
             log.info("getALLAdItemFeature grpc error");
             return null;

recommend-feature-client/src/main/java/com/tzld/piaoquan/recommend/feature/model/feature/Feature.java

@@ -200,7 +200,7 @@ public final class Feature {
       "e\022\030.GetUserAdFeatureRequest\032\031.GetUserAdF" +
       "eatureResponse\022G\n\020GetAdItemFeature\022\030.Get" +
       "AdItemFeatureRequest\032\031.GetAdItemFeatureR" +
-      "esponse\022P\n\023GETAllAdItemFeature\022\033.GetAllA" +
+      "esponse\022P\n\023GetAllAdItemFeature\022\033.GetAllA" +
       "dItemFeatureRequest\032\034.GetAllAdItemFeatur" +
       "eResponse\022A\n\016GetUserFeature\022\026.GetUserFea" +
       "tureRequest\032\027.GetUserFeatureResponse\022D\n\017" +

recommend-feature-client/src/main/java/com/tzld/piaoquan/recommend/feature/model/feature/FeatureService.java

@@ -28,9 +28,9 @@ public  abstract class FeatureService
         com.google.protobuf.RpcCallback<com.tzld.piaoquan.recommend.feature.model.feature.GetAdItemFeatureResponse> done);
 
     /**
-     * <code>rpc GETAllAdItemFeature(.GetAllAdItemFeatureRequest) returns (.GetAllAdItemFeatureResponse);</code>
+     * <code>rpc GetAllAdItemFeature(.GetAllAdItemFeatureRequest) returns (.GetAllAdItemFeatureResponse);</code>
      */
-    public abstract void gETAllAdItemFeature(
+    public abstract void getAllAdItemFeature(
         com.google.protobuf.RpcController controller,
         com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureRequest request,
         com.google.protobuf.RpcCallback<com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureResponse> done);
@@ -81,11 +81,11 @@ public  abstract class FeatureService
       }
 
       @java.lang.Override
-      public  void gETAllAdItemFeature(
+      public  void getAllAdItemFeature(
           com.google.protobuf.RpcController controller,
           com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureRequest request,
           com.google.protobuf.RpcCallback<com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureResponse> done) {
-        impl.gETAllAdItemFeature(controller, request, done);
+        impl.getAllAdItemFeature(controller, request, done);
       }
 
       @java.lang.Override
@@ -139,7 +139,7 @@ public  abstract class FeatureService
           case 1:
             return impl.getAdItemFeature(controller, (com.tzld.piaoquan.recommend.feature.model.feature.GetAdItemFeatureRequest)request);
           case 2:
-            return impl.gETAllAdItemFeature(controller, (com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureRequest)request);
+            return impl.getAllAdItemFeature(controller, (com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureRequest)request);
           case 3:
             return impl.getUserFeature(controller, (com.tzld.piaoquan.recommend.feature.model.feature.GetUserFeatureRequest)request);
           case 4:
@@ -223,9 +223,9 @@ public  abstract class FeatureService
       com.google.protobuf.RpcCallback<com.tzld.piaoquan.recommend.feature.model.feature.GetAdItemFeatureResponse> done);
 
   /**
-   * <code>rpc GETAllAdItemFeature(.GetAllAdItemFeatureRequest) returns (.GetAllAdItemFeatureResponse);</code>
+   * <code>rpc GetAllAdItemFeature(.GetAllAdItemFeatureRequest) returns (.GetAllAdItemFeatureResponse);</code>
    */
-  public abstract void gETAllAdItemFeature(
+  public abstract void getAllAdItemFeature(
       com.google.protobuf.RpcController controller,
       com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureRequest request,
       com.google.protobuf.RpcCallback<com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureResponse> done);
@@ -287,7 +287,7 @@ public  abstract class FeatureService
             done));
         return;
       case 2:
-        this.gETAllAdItemFeature(controller, (com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureRequest)request,
+        this.getAllAdItemFeature(controller, (com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureRequest)request,
           com.google.protobuf.RpcUtil.<com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureResponse>specializeCallback(
             done));
         return;
@@ -409,7 +409,7 @@ public  abstract class FeatureService
           com.tzld.piaoquan.recommend.feature.model.feature.GetAdItemFeatureResponse.getDefaultInstance()));
     }
 
-    public  void gETAllAdItemFeature(
+    public  void getAllAdItemFeature(
         com.google.protobuf.RpcController controller,
         com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureRequest request,
         com.google.protobuf.RpcCallback<com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureResponse> done) {
@@ -486,7 +486,7 @@ public  abstract class FeatureService
         com.tzld.piaoquan.recommend.feature.model.feature.GetAdItemFeatureRequest request)
         throws com.google.protobuf.ServiceException;
 
-    public com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureResponse gETAllAdItemFeature(
+    public com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureResponse getAllAdItemFeature(
         com.google.protobuf.RpcController controller,
         com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureRequest request)
         throws com.google.protobuf.ServiceException;
@@ -538,7 +538,7 @@ public  abstract class FeatureService
     }
 
 
-    public com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureResponse gETAllAdItemFeature(
+    public com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureResponse getAllAdItemFeature(
         com.google.protobuf.RpcController controller,
         com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureRequest request)
         throws com.google.protobuf.ServiceException {

recommend-feature-client/src/main/java/com/tzld/piaoquan/recommend/feature/model/feature/FeatureServiceGrpc.java

@@ -90,34 +90,34 @@ public final class FeatureServiceGrpc {
   }
 
   private static volatile io.grpc.MethodDescriptor<com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureRequest,
-      com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureResponse> getGETAllAdItemFeatureMethod;
+      com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureResponse> getGetAllAdItemFeatureMethod;
 
   @io.grpc.stub.annotations.RpcMethod(
-      fullMethodName = SERVICE_NAME + '/' + "GETAllAdItemFeature",
+      fullMethodName = SERVICE_NAME + '/' + "GetAllAdItemFeature",
       requestType = com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureRequest.class,
       responseType = com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
   public static io.grpc.MethodDescriptor<com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureRequest,
-      com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureResponse> getGETAllAdItemFeatureMethod() {
-    io.grpc.MethodDescriptor<com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureRequest, com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureResponse> getGETAllAdItemFeatureMethod;
-    if ((getGETAllAdItemFeatureMethod = FeatureServiceGrpc.getGETAllAdItemFeatureMethod) == null) {
+      com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureResponse> getGetAllAdItemFeatureMethod() {
+    io.grpc.MethodDescriptor<com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureRequest, com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureResponse> getGetAllAdItemFeatureMethod;
+    if ((getGetAllAdItemFeatureMethod = FeatureServiceGrpc.getGetAllAdItemFeatureMethod) == null) {
       synchronized (FeatureServiceGrpc.class) {
-        if ((getGETAllAdItemFeatureMethod = FeatureServiceGrpc.getGETAllAdItemFeatureMethod) == null) {
-          FeatureServiceGrpc.getGETAllAdItemFeatureMethod = getGETAllAdItemFeatureMethod =
+        if ((getGetAllAdItemFeatureMethod = FeatureServiceGrpc.getGetAllAdItemFeatureMethod) == null) {
+          FeatureServiceGrpc.getGetAllAdItemFeatureMethod = getGetAllAdItemFeatureMethod =
               io.grpc.MethodDescriptor.<com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureRequest, com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureResponse>newBuilder()
               .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
-              .setFullMethodName(generateFullMethodName(SERVICE_NAME, "GETAllAdItemFeature"))
+              .setFullMethodName(generateFullMethodName(SERVICE_NAME, "GetAllAdItemFeature"))
               .setSampledToLocalTracing(true)
               .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
                   com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureRequest.getDefaultInstance()))
               .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
                   com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureResponse.getDefaultInstance()))
-              .setSchemaDescriptor(new FeatureServiceMethodDescriptorSupplier("GETAllAdItemFeature"))
+              .setSchemaDescriptor(new FeatureServiceMethodDescriptorSupplier("GetAllAdItemFeature"))
               .build();
         }
       }
     }
-    return getGETAllAdItemFeatureMethod;
+    return getGetAllAdItemFeatureMethod;
   }
 
   private static volatile io.grpc.MethodDescriptor<com.tzld.piaoquan.recommend.feature.model.feature.GetUserFeatureRequest,
@@ -277,9 +277,9 @@ public final class FeatureServiceGrpc {
 
     /**
      */
-    public void gETAllAdItemFeature(com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureRequest request,
+    public void getAllAdItemFeature(com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureRequest request,
         io.grpc.stub.StreamObserver<com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureResponse> responseObserver) {
-      asyncUnimplementedUnaryCall(getGETAllAdItemFeatureMethod(), responseObserver);
+      asyncUnimplementedUnaryCall(getGetAllAdItemFeatureMethod(), responseObserver);
     }
 
     /**
@@ -320,12 +320,12 @@ public final class FeatureServiceGrpc {
                 com.tzld.piaoquan.recommend.feature.model.feature.GetAdItemFeatureResponse>(
                   this, METHODID_GET_AD_ITEM_FEATURE)))
           .addMethod(
-            getGETAllAdItemFeatureMethod(),
+            getGetAllAdItemFeatureMethod(),
             asyncUnaryCall(
               new MethodHandlers<
                 com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureRequest,
                 com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureResponse>(
-                  this, METHODID_GETALL_AD_ITEM_FEATURE)))
+                  this, METHODID_GET_ALL_AD_ITEM_FEATURE)))
           .addMethod(
             getGetUserFeatureMethod(),
             asyncUnaryCall(
@@ -383,10 +383,10 @@ public final class FeatureServiceGrpc {
 
     /**
      */
-    public void gETAllAdItemFeature(com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureRequest request,
+    public void getAllAdItemFeature(com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureRequest request,
         io.grpc.stub.StreamObserver<com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureResponse> responseObserver) {
       asyncUnaryCall(
-          getChannel().newCall(getGETAllAdItemFeatureMethod(), getCallOptions()), request, responseObserver);
+          getChannel().newCall(getGetAllAdItemFeatureMethod(), getCallOptions()), request, responseObserver);
     }
 
     /**
@@ -444,9 +444,9 @@ public final class FeatureServiceGrpc {
 
     /**
      */
-    public com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureResponse gETAllAdItemFeature(com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureRequest request) {
+    public com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureResponse getAllAdItemFeature(com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureRequest request) {
       return blockingUnaryCall(
-          getChannel(), getGETAllAdItemFeatureMethod(), getCallOptions(), request);
+          getChannel(), getGetAllAdItemFeatureMethod(), getCallOptions(), request);
     }
 
     /**
@@ -503,10 +503,10 @@ public final class FeatureServiceGrpc {
 
     /**
      */
-    public com.google.common.util.concurrent.ListenableFuture<com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureResponse> gETAllAdItemFeature(
+    public com.google.common.util.concurrent.ListenableFuture<com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureResponse> getAllAdItemFeature(
         com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureRequest request) {
       return futureUnaryCall(
-          getChannel().newCall(getGETAllAdItemFeatureMethod(), getCallOptions()), request);
+          getChannel().newCall(getGetAllAdItemFeatureMethod(), getCallOptions()), request);
     }
 
     /**
@@ -536,7 +536,7 @@ public final class FeatureServiceGrpc {
 
   private static final int METHODID_GET_USER_AD_FEATURE = 0;
   private static final int METHODID_GET_AD_ITEM_FEATURE = 1;
-  private static final int METHODID_GETALL_AD_ITEM_FEATURE = 2;
+  private static final int METHODID_GET_ALL_AD_ITEM_FEATURE = 2;
   private static final int METHODID_GET_USER_FEATURE = 3;
   private static final int METHODID_GET_VIDEO_FEATURE = 4;
   private static final int METHODID_GET_ALL_VIDEO_FEATURE = 5;
@@ -566,8 +566,8 @@ public final class FeatureServiceGrpc {
           serviceImpl.getAdItemFeature((com.tzld.piaoquan.recommend.feature.model.feature.GetAdItemFeatureRequest) request,
               (io.grpc.stub.StreamObserver<com.tzld.piaoquan.recommend.feature.model.feature.GetAdItemFeatureResponse>) responseObserver);
           break;
-        case METHODID_GETALL_AD_ITEM_FEATURE:
-          serviceImpl.gETAllAdItemFeature((com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureRequest) request,
+        case METHODID_GET_ALL_AD_ITEM_FEATURE:
+          serviceImpl.getAllAdItemFeature((com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureRequest) request,
               (io.grpc.stub.StreamObserver<com.tzld.piaoquan.recommend.feature.model.feature.GetAllAdItemFeatureResponse>) responseObserver);
           break;
         case METHODID_GET_USER_FEATURE:
@@ -645,7 +645,7 @@ public final class FeatureServiceGrpc {
               .setSchemaDescriptor(new FeatureServiceFileDescriptorSupplier())
               .addMethod(getGetUserAdFeatureMethod())
               .addMethod(getGetAdItemFeatureMethod())
-              .addMethod(getGETAllAdItemFeatureMethod())
+              .addMethod(getGetAllAdItemFeatureMethod())
               .addMethod(getGetUserFeatureMethod())
               .addMethod(getGetVideoFeatureMethod())
               .addMethod(getGetAllVideoFeatureMethod())

recommend-feature-client/src/main/proto/com/tzld/piaoquan/recommend/feature/feature.proto

@@ -172,7 +172,7 @@ message GetAllAdItemFeatureResponse {
 service FeatureService {
   rpc GetUserAdFeature (GetUserAdFeatureRequest) returns (GetUserAdFeatureResponse);
   rpc GetAdItemFeature (GetAdItemFeatureRequest) returns (GetAdItemFeatureResponse);
-  rpc GETAllAdItemFeature (GetAllAdItemFeatureRequest) returns (GetAllAdItemFeatureResponse);
+  rpc GetAllAdItemFeature (GetAllAdItemFeatureRequest) returns (GetAllAdItemFeatureResponse);
   rpc GetUserFeature (GetUserFeatureRequest) returns (GetUserFeatureResponse);
   rpc GetVideoFeature (GetVideoFeatureRequest) returns (GetVideoFeatureResponse);
   rpc GetAllVideoFeature (GetAllVideoFeatureRequest) returns (GetAllVideoFeatureResponse);

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

@@ -2,6 +2,8 @@ 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.AdItemFeatureService;
+import com.tzld.piaoquan.recommend.feature.service.UserAdFeatureService;
 import com.tzld.piaoquan.recommend.feature.service.UserFeatureService;
 import com.tzld.piaoquan.recommend.feature.service.VideoFeatureService;
 import io.grpc.stub.StreamObserver;
@@ -20,6 +22,13 @@ public class FeatureGrpcService extends FeatureServiceGrpc.FeatureServiceImplBas
     @Autowired
     private VideoFeatureService videoFeatureService;
 
+    @Autowired
+    private AdItemFeatureService adItemFeatureService;
+
+    @Autowired
+    private UserAdFeatureService userAdFeatureService;
+
+
     @Override
     public void getUserFeature(GetUserFeatureRequest request, StreamObserver<GetUserFeatureResponse> responseObserver) {
         log.info("FeatureGrpcService getUserFeature request={}", ProtobufUtils.toJson(request));
@@ -48,4 +57,34 @@ public class FeatureGrpcService extends FeatureServiceGrpc.FeatureServiceImplBas
         responseObserver.onNext(response);
         responseObserver.onCompleted();
     }
+
+    @Override
+    public void getUserAdFeature(GetUserAdFeatureRequest request,
+                                   StreamObserver<GetUserAdFeatureResponse> responseObserver) {
+        log.info("FeatureGrpcService getUserAdFeature request={}", ProtobufUtils.toJson(request));
+        GetUserAdFeatureResponse response = userAdFeatureService.getUserFeature(request);
+        log.info("FeatureGrpcService getUserAdFeature response={}", ProtobufUtils.toJson(response));
+        responseObserver.onNext(response);
+        responseObserver.onCompleted();
+    }
+
+    @Override
+    public void getAdItemFeature(GetAdItemFeatureRequest request,
+                                 StreamObserver<GetAdItemFeatureResponse> responseObserver) {
+        log.info("FeatureGrpcService getAdItemFeatureRequest request={}", ProtobufUtils.toJson(request));
+        GetAdItemFeatureResponse response = adItemFeatureService.getAdItemFeature(request);
+        log.info("FeatureGrpcService getAdItemFeatureRequest response={}", ProtobufUtils.toJson(response));
+        responseObserver.onNext(response);
+        responseObserver.onCompleted();
+    }
+
+    @Override
+    public void getAllAdItemFeature(GetAllAdItemFeatureRequest request,
+                                 StreamObserver<GetAllAdItemFeatureResponse> responseObserver) {
+        log.info("FeatureGrpcService getAllAdItemFeature request={}", ProtobufUtils.toJson(request));
+        GetAllAdItemFeatureResponse response = adItemFeatureService.getAllAdItemFeature(request);
+        log.info("FeatureGrpcService getAllAdItemFeature response={}", ProtobufUtils.toJson(response));
+        responseObserver.onNext(response);
+        responseObserver.onCompleted();
+    }
 }

recommend-feature-service/src/main/java/com/tzld/piaoquan/recommend/feature/service/AdItemFeatureService.java

@@ -32,7 +32,7 @@ public class AdItemFeatureService  extends AbstractFeatureService<String, AdItem
         initLocalCache(maximumSize, refreshAfterWrite, expireAfterWrite, expireAfterAccess);
     }
 
-    public GetAdItemFeatureResponse getVideoFeature(GetAdItemFeatureRequest request) {
+    public GetAdItemFeatureResponse getAdItemFeature(GetAdItemFeatureRequest request) {
         String adId = request.getAdId();
         if (StringUtils.isBlank(adId)) {
             return GetAdItemFeatureResponse.newBuilder()
@@ -48,7 +48,7 @@ public class AdItemFeatureService  extends AbstractFeatureService<String, AdItem
         return builder.build();
     }
 
-    public GetAllAdItemFeatureResponse getAllVideoFeature(GetAllAdItemFeatureRequest request) {
+    public GetAllAdItemFeatureResponse getAllAdItemFeature(GetAllAdItemFeatureRequest request) {
         if (request.getAdIdCount() == 0) {
             return GetAllAdItemFeatureResponse.newBuilder()
                     .setResult(Result.newBuilder().setCode(1))