瀏覽代碼

homepage recommend

丁云鹏 1 年之前
父節點
當前提交
6545a4a260
共有 14 個文件被更改,包括 573 次插入1008 次删除
  1. 0 235
      recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/recommend/HomepageRecommendRequestOrBuilder.java
  2. 29 33
      recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/recommend/Recommend.java
  3. 98 529
      recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/recommend/RecommendRequest.java
  4. 129 0
      recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/recommend/RecommendRequestOrBuilder.java
  5. 59 59
      recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/recommend/RecommendResponse.java
  6. 2 2
      recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/recommend/RecommendResponseOrBuilder.java
  7. 97 26
      recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/recommend/RecommendService.java
  8. 95 21
      recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/recommend/RecommendServiceGrpc.java
  9. 0 57
      recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/recommend/VideoOrBuilder.java
  10. 8 0
      recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/recommend/VideoProto.java
  11. 12 19
      recommend-server-client/src/main/proto/com/tzld/piaoquan/recommend/server/recommend.proto
  12. 17 7
      recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/grpcservice/RecommendService.java
  13. 1 1
      recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/model/RecommendParam.java
  14. 26 19
      recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/RecommendService.java

+ 0 - 235
recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/recommend/HomepageRecommendRequestOrBuilder.java

@@ -1,235 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: com/tzld/piaoquan/recommend/server/recommend.proto
-
-package com.tzld.piaoquan.recommend.server.gen.recommend;
-
-public interface HomepageRecommendRequestOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:HomepageRecommendRequest)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * <code>string request_id = 1;</code>
-   * @return The requestId.
-   */
-  java.lang.String getRequestId();
-  /**
-   * <code>string request_id = 1;</code>
-   * @return The bytes for requestId.
-   */
-  com.google.protobuf.ByteString
-      getRequestIdBytes();
-
-  /**
-   * <code>string mid = 2;</code>
-   * @return The mid.
-   */
-  java.lang.String getMid();
-  /**
-   * <code>string mid = 2;</code>
-   * @return The bytes for mid.
-   */
-  com.google.protobuf.ByteString
-      getMidBytes();
-
-  /**
-   * <code>string uid = 3;</code>
-   * @return The uid.
-   */
-  java.lang.String getUid();
-  /**
-   * <code>string uid = 3;</code>
-   * @return The bytes for uid.
-   */
-  com.google.protobuf.ByteString
-      getUidBytes();
-
-  /**
-   * <code>string category_id = 4;</code>
-   * @return The categoryId.
-   */
-  java.lang.String getCategoryId();
-  /**
-   * <code>string category_id = 4;</code>
-   * @return The bytes for categoryId.
-   */
-  com.google.protobuf.ByteString
-      getCategoryIdBytes();
-
-  /**
-   * <pre>
-   * default 4
-   * </pre>
-   *
-   * <code>int32 size = 5;</code>
-   * @return The size.
-   */
-  int getSize();
-
-  /**
-   * <pre>
-   * default 4
-   * </pre>
-   *
-   * <code>int32 app_type = 6;</code>
-   * @return The appType.
-   */
-  int getAppType();
-
-  /**
-   * <code>string algo_type = 7;</code>
-   * @return The algoType.
-   */
-  java.lang.String getAlgoType();
-  /**
-   * <code>string algo_type = 7;</code>
-   * @return The bytes for algoType.
-   */
-  com.google.protobuf.ByteString
-      getAlgoTypeBytes();
-
-  /**
-   * <code>string client_info = 8;</code>
-   * @return The clientInfo.
-   */
-  java.lang.String getClientInfo();
-  /**
-   * <code>string client_info = 8;</code>
-   * @return The bytes for clientInfo.
-   */
-  com.google.protobuf.ByteString
-      getClientInfoBytes();
-
-  /**
-   * <code>string ab_exp_info = 9;</code>
-   * @return The abExpInfo.
-   */
-  java.lang.String getAbExpInfo();
-  /**
-   * <code>string ab_exp_info = 9;</code>
-   * @return The bytes for abExpInfo.
-   */
-  com.google.protobuf.ByteString
-      getAbExpInfoBytes();
-
-  /**
-   * <code>string ab_info_data = 10;</code>
-   * @return The abInfoData.
-   */
-  java.lang.String getAbInfoData();
-  /**
-   * <code>string ab_info_data = 10;</code>
-   * @return The bytes for abInfoData.
-   */
-  com.google.protobuf.ByteString
-      getAbInfoDataBytes();
-
-  /**
-   * <pre>
-   * default 2
-   * </pre>
-   *
-   * <code>int32 version_audit_status = 11;</code>
-   * @return The versionAuditStatus.
-   */
-  int getVersionAuditStatus();
-
-  /**
-   * <code>string machine_info_brand = 12;</code>
-   * @return The machineInfoBrand.
-   */
-  java.lang.String getMachineInfoBrand();
-  /**
-   * <code>string machine_info_brand = 12;</code>
-   * @return The bytes for machineInfoBrand.
-   */
-  com.google.protobuf.ByteString
-      getMachineInfoBrandBytes();
-
-  /**
-   * <code>string machine_info_model = 13;</code>
-   * @return The machineInfoModel.
-   */
-  java.lang.String getMachineInfoModel();
-  /**
-   * <code>string machine_info_model = 13;</code>
-   * @return The bytes for machineInfoModel.
-   */
-  com.google.protobuf.ByteString
-      getMachineInfoModelBytes();
-
-  /**
-   * <code>string machine_info_platform = 14;</code>
-   * @return The machineInfoPlatform.
-   */
-  java.lang.String getMachineInfoPlatform();
-  /**
-   * <code>string machine_info_platform = 14;</code>
-   * @return The bytes for machineInfoPlatform.
-   */
-  com.google.protobuf.ByteString
-      getMachineInfoPlatformBytes();
-
-  /**
-   * <code>string page_source = 15;</code>
-   * @return The pageSource.
-   */
-  java.lang.String getPageSource();
-  /**
-   * <code>string page_source = 15;</code>
-   * @return The bytes for pageSource.
-   */
-  com.google.protobuf.ByteString
-      getPageSourceBytes();
-
-  /**
-   * <pre>
-   * default 0
-   * </pre>
-   *
-   * <code>int32 version_code = 16;</code>
-   * @return The versionCode.
-   */
-  int getVersionCode();
-
-  /**
-   * <pre>
-   * default 0
-   * </pre>
-   *
-   * <code>string recommend_source = 17;</code>
-   * @return The recommendSource.
-   */
-  java.lang.String getRecommendSource();
-  /**
-   * <pre>
-   * default 0
-   * </pre>
-   *
-   * <code>string recommend_source = 17;</code>
-   * @return The bytes for recommendSource.
-   */
-  com.google.protobuf.ByteString
-      getRecommendSourceBytes();
-
-  /**
-   * <pre>
-   * default 0
-   * </pre>
-   *
-   * <code>int32 scene_type = 18;</code>
-   * @return The sceneType.
-   */
-  int getSceneType();
-
-  /**
-   * <code>string recommend_trace_id = 19;</code>
-   * @return The recommendTraceId.
-   */
-  java.lang.String getRecommendTraceId();
-  /**
-   * <code>string recommend_trace_id = 19;</code>
-   * @return The bytes for recommendTraceId.
-   */
-  com.google.protobuf.ByteString
-      getRecommendTraceIdBytes();
-}

+ 29 - 33
recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/recommend/Recommend.java

@@ -15,15 +15,15 @@ public final class Recommend {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_HomepageRecommendRequest_descriptor;
+    internal_static_RecommendRequest_descriptor;
   static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_HomepageRecommendRequest_fieldAccessorTable;
+      internal_static_RecommendRequest_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_HomepageRecommendResponse_descriptor;
+    internal_static_RecommendResponse_descriptor;
   static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_HomepageRecommendResponse_fieldAccessorTable;
+      internal_static_RecommendResponse_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
     internal_static_VideoProto_descriptor;
   static final 
@@ -41,28 +41,24 @@ public final class Recommend {
       "\n2com/tzld/piaoquan/recommend/server/rec" +
       "ommend.proto\032\031google/protobuf/any.proto\032" +
       "/com/tzld/piaoquan/recommend/server/comm" +
-      "on.proto\"\272\003\n\030HomepageRecommendRequest\022\022\n" +
-      "\nrequest_id\030\001 \001(\t\022\013\n\003mid\030\002 \001(\t\022\013\n\003uid\030\003 " +
-      "\001(\t\022\023\n\013category_id\030\004 \001(\t\022\014\n\004size\030\005 \001(\005\022\020" +
-      "\n\010app_type\030\006 \001(\005\022\021\n\talgo_type\030\007 \001(\t\022\023\n\013c" +
-      "lient_info\030\010 \001(\t\022\023\n\013ab_exp_info\030\t \001(\t\022\024\n" +
-      "\014ab_info_data\030\n \001(\t\022\034\n\024version_audit_sta" +
-      "tus\030\013 \001(\005\022\032\n\022machine_info_brand\030\014 \001(\t\022\032\n" +
-      "\022machine_info_model\030\r \001(\t\022\035\n\025machine_inf" +
-      "o_platform\030\016 \001(\t\022\023\n\013page_source\030\017 \001(\t\022\024\n" +
-      "\014version_code\030\020 \001(\005\022\030\n\020recommend_source\030" +
-      "\021 \001(\t\022\022\n\nscene_type\030\022 \001(\005\022\032\n\022recommend_t" +
-      "race_id\030\023 \001(\t\"P\n\031HomepageRecommendRespon" +
-      "se\022\027\n\006result\030\001 \001(\0132\007.Result\022\032\n\005video\030\002 \003" +
-      "(\0132\013.VideoProto\"\265\001\n\nVideoProto\022\020\n\010video_" +
-      "id\030\001 \001(\003\022\021\n\trov_score\030\002 \001(\001\022\021\n\tpush_from" +
-      "\030\003 \001(\t\022\017\n\007ab_code\030\004 \001(\t\022\022\n\nsort_score\030\005 " +
-      "\001(\001\022\020\n\010position\030\006 \001(\005\022\021\n\tflow_pool\030\007 \001(\t" +
-      "\022\027\n\017is_in_flow_pool\030\010 \001(\005\022\014\n\004rand\030\t \001(\0012" +
-      "^\n\020RecommendService\022J\n\021HomepageRecommend" +
-      "\022\031.HomepageRecommendRequest\032\032.HomepageRe" +
-      "commendResponseB7\n0com.tzld.piaoquan.rec" +
-      "ommend.server.gen.recommendP\001\210\001\001b\006proto3"
+      "on.proto\"\354\001\n\020RecommendRequest\022\022\n\nrequest" +
+      "_id\030\001 \001(\t\022\013\n\003mid\030\002 \001(\t\022\013\n\003uid\030\003 \001(\t\022\014\n\004s" +
+      "ize\030\004 \001(\005\022\020\n\010app_type\030\005 \001(\005\022\023\n\013client_in" +
+      "fo\030\006 \001(\t\022\023\n\013ab_exp_info\030\007 \001(\t\022\024\n\014ab_info" +
+      "_data\030\010 \001(\t\022\034\n\024version_audit_status\030\t \001(" +
+      "\005\022\032\n\022recommend_trace_id\030\n \001(\t\022\020\n\010video_i" +
+      "d\030\013 \001(\003\"H\n\021RecommendResponse\022\027\n\006result\030\001" +
+      " \001(\0132\007.Result\022\032\n\005video\030\002 \003(\0132\013.VideoProt" +
+      "o\"\265\001\n\nVideoProto\022\020\n\010video_id\030\001 \001(\003\022\021\n\tro" +
+      "v_score\030\002 \001(\001\022\021\n\tpush_from\030\003 \001(\t\022\017\n\007ab_c" +
+      "ode\030\004 \001(\t\022\022\n\nsort_score\030\005 \001(\001\022\020\n\010positio" +
+      "n\030\006 \001(\005\022\021\n\tflow_pool\030\007 \001(\t\022\027\n\017is_in_flow" +
+      "_pool\030\010 \001(\005\022\014\n\004rand\030\t \001(\0012\212\001\n\020RecommendS" +
+      "ervice\022:\n\021HomepageRecommend\022\021.RecommendR" +
+      "equest\032\022.RecommendResponse\022:\n\021RelevantRe" +
+      "commend\022\021.RecommendRequest\032\022.RecommendRe" +
+      "sponseB7\n0com.tzld.piaoquan.recommend.se" +
+      "rver.gen.recommendP\001\210\001\001b\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -70,17 +66,17 @@ public final class Recommend {
           com.google.protobuf.AnyProto.getDescriptor(),
           com.tzld.piaoquan.recommend.server.gen.common.Common.getDescriptor(),
         });
-    internal_static_HomepageRecommendRequest_descriptor =
+    internal_static_RecommendRequest_descriptor =
       getDescriptor().getMessageTypes().get(0);
-    internal_static_HomepageRecommendRequest_fieldAccessorTable = new
+    internal_static_RecommendRequest_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_HomepageRecommendRequest_descriptor,
-        new java.lang.String[] { "RequestId", "Mid", "Uid", "CategoryId", "Size", "AppType", "AlgoType", "ClientInfo", "AbExpInfo", "AbInfoData", "VersionAuditStatus", "MachineInfoBrand", "MachineInfoModel", "MachineInfoPlatform", "PageSource", "VersionCode", "RecommendSource", "SceneType", "RecommendTraceId", });
-    internal_static_HomepageRecommendResponse_descriptor =
+        internal_static_RecommendRequest_descriptor,
+        new java.lang.String[] { "RequestId", "Mid", "Uid", "Size", "AppType", "ClientInfo", "AbExpInfo", "AbInfoData", "VersionAuditStatus", "RecommendTraceId", "VideoId", });
+    internal_static_RecommendResponse_descriptor =
       getDescriptor().getMessageTypes().get(1);
-    internal_static_HomepageRecommendResponse_fieldAccessorTable = new
+    internal_static_RecommendResponse_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_HomepageRecommendResponse_descriptor,
+        internal_static_RecommendResponse_descriptor,
         new java.lang.String[] { "Result", "Video", });
     internal_static_VideoProto_descriptor =
       getDescriptor().getMessageTypes().get(2);

文件差異過大導致無法顯示
+ 98 - 529
recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/recommend/RecommendRequest.java


+ 129 - 0
recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/recommend/RecommendRequestOrBuilder.java

@@ -0,0 +1,129 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: com/tzld/piaoquan/recommend/server/recommend.proto
+
+package com.tzld.piaoquan.recommend.server.gen.recommend;
+
+public interface RecommendRequestOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:RecommendRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * <code>string request_id = 1;</code>
+   * @return The requestId.
+   */
+  java.lang.String getRequestId();
+  /**
+   * <code>string request_id = 1;</code>
+   * @return The bytes for requestId.
+   */
+  com.google.protobuf.ByteString
+      getRequestIdBytes();
+
+  /**
+   * <code>string mid = 2;</code>
+   * @return The mid.
+   */
+  java.lang.String getMid();
+  /**
+   * <code>string mid = 2;</code>
+   * @return The bytes for mid.
+   */
+  com.google.protobuf.ByteString
+      getMidBytes();
+
+  /**
+   * <code>string uid = 3;</code>
+   * @return The uid.
+   */
+  java.lang.String getUid();
+  /**
+   * <code>string uid = 3;</code>
+   * @return The bytes for uid.
+   */
+  com.google.protobuf.ByteString
+      getUidBytes();
+
+  /**
+   * <pre>
+   * default 4
+   * </pre>
+   *
+   * <code>int32 size = 4;</code>
+   * @return The size.
+   */
+  int getSize();
+
+  /**
+   * <pre>
+   * default 4
+   * </pre>
+   *
+   * <code>int32 app_type = 5;</code>
+   * @return The appType.
+   */
+  int getAppType();
+
+  /**
+   * <code>string client_info = 6;</code>
+   * @return The clientInfo.
+   */
+  java.lang.String getClientInfo();
+  /**
+   * <code>string client_info = 6;</code>
+   * @return The bytes for clientInfo.
+   */
+  com.google.protobuf.ByteString
+      getClientInfoBytes();
+
+  /**
+   * <code>string ab_exp_info = 7;</code>
+   * @return The abExpInfo.
+   */
+  java.lang.String getAbExpInfo();
+  /**
+   * <code>string ab_exp_info = 7;</code>
+   * @return The bytes for abExpInfo.
+   */
+  com.google.protobuf.ByteString
+      getAbExpInfoBytes();
+
+  /**
+   * <code>string ab_info_data = 8;</code>
+   * @return The abInfoData.
+   */
+  java.lang.String getAbInfoData();
+  /**
+   * <code>string ab_info_data = 8;</code>
+   * @return The bytes for abInfoData.
+   */
+  com.google.protobuf.ByteString
+      getAbInfoDataBytes();
+
+  /**
+   * <pre>
+   * default 2
+   * </pre>
+   *
+   * <code>int32 version_audit_status = 9;</code>
+   * @return The versionAuditStatus.
+   */
+  int getVersionAuditStatus();
+
+  /**
+   * <code>string recommend_trace_id = 10;</code>
+   * @return The recommendTraceId.
+   */
+  java.lang.String getRecommendTraceId();
+  /**
+   * <code>string recommend_trace_id = 10;</code>
+   * @return The bytes for recommendTraceId.
+   */
+  com.google.protobuf.ByteString
+      getRecommendTraceIdBytes();
+
+  /**
+   * <code>int64 video_id = 11;</code>
+   * @return The videoId.
+   */
+  long getVideoId();
+}

+ 59 - 59
recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/recommend/HomepageRecommendResponse.java → recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/recommend/RecommendResponse.java

@@ -8,18 +8,18 @@ package com.tzld.piaoquan.recommend.server.gen.recommend;
  * https://sls.console.aliyun.com/lognext/project/rov-server/logsearch/info
  * </pre>
  *
- * Protobuf type {@code HomepageRecommendResponse}
+ * Protobuf type {@code RecommendResponse}
  */
-public final class HomepageRecommendResponse extends
+public final class RecommendResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:HomepageRecommendResponse)
-    HomepageRecommendResponseOrBuilder {
+    // @@protoc_insertion_point(message_implements:RecommendResponse)
+    RecommendResponseOrBuilder {
 private static final long serialVersionUID = 0L;
-  // Use HomepageRecommendResponse.newBuilder() to construct.
-  private HomepageRecommendResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+  // Use RecommendResponse.newBuilder() to construct.
+  private RecommendResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
   }
-  private HomepageRecommendResponse() {
+  private RecommendResponse() {
     video_ = java.util.Collections.emptyList();
   }
 
@@ -27,7 +27,7 @@ private static final long serialVersionUID = 0L;
   @SuppressWarnings({"unused"})
   protected java.lang.Object newInstance(
       UnusedPrivateParameter unused) {
-    return new HomepageRecommendResponse();
+    return new RecommendResponse();
   }
 
   @java.lang.Override
@@ -35,7 +35,7 @@ private static final long serialVersionUID = 0L;
   getUnknownFields() {
     return this.unknownFields;
   }
-  private HomepageRecommendResponse(
+  private RecommendResponse(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
@@ -100,15 +100,15 @@ private static final long serialVersionUID = 0L;
   }
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return com.tzld.piaoquan.recommend.server.gen.recommend.Recommend.internal_static_HomepageRecommendResponse_descriptor;
+    return com.tzld.piaoquan.recommend.server.gen.recommend.Recommend.internal_static_RecommendResponse_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.tzld.piaoquan.recommend.server.gen.recommend.Recommend.internal_static_HomepageRecommendResponse_fieldAccessorTable
+    return com.tzld.piaoquan.recommend.server.gen.recommend.Recommend.internal_static_RecommendResponse_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse.class, com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse.Builder.class);
+            com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse.class, com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse.Builder.class);
   }
 
   public static final int RESULT_FIELD_NUMBER = 1;
@@ -224,10 +224,10 @@ private static final long serialVersionUID = 0L;
     if (obj == this) {
      return true;
     }
-    if (!(obj instanceof com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse)) {
+    if (!(obj instanceof com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse)) {
       return super.equals(obj);
     }
-    com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse other = (com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse) obj;
+    com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse other = (com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse) obj;
 
     if (hasResult() != other.hasResult()) return false;
     if (hasResult()) {
@@ -260,69 +260,69 @@ private static final long serialVersionUID = 0L;
     return hash;
   }
 
-  public static com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse parseFrom(
+  public static com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse parseFrom(
       java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse parseFrom(
+  public static com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse parseFrom(
       java.nio.ByteBuffer data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse parseFrom(
+  public static com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse parseFrom(
+  public static com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse parseFrom(byte[] data)
+  public static com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse parseFrom(
+  public static com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse parseFrom(
       byte[] data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse parseFrom(java.io.InputStream input)
+  public static com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse parseFrom(
+  public static com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse parseFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
-  public static com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse parseDelimitedFrom(java.io.InputStream input)
+  public static com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input);
   }
-  public static com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse parseDelimitedFrom(
+  public static com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse parseDelimitedFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-  public static com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse parseFrom(
+  public static com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse parseFrom(
       com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse parseFrom(
+  public static com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -335,7 +335,7 @@ private static final long serialVersionUID = 0L;
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-  public static Builder newBuilder(com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse prototype) {
+  public static Builder newBuilder(com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
   @java.lang.Override
@@ -355,26 +355,26 @@ private static final long serialVersionUID = 0L;
    * https://sls.console.aliyun.com/lognext/project/rov-server/logsearch/info
    * </pre>
    *
-   * Protobuf type {@code HomepageRecommendResponse}
+   * Protobuf type {@code RecommendResponse}
    */
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:HomepageRecommendResponse)
-      com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponseOrBuilder {
+      // @@protoc_insertion_point(builder_implements:RecommendResponse)
+      com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponseOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.tzld.piaoquan.recommend.server.gen.recommend.Recommend.internal_static_HomepageRecommendResponse_descriptor;
+      return com.tzld.piaoquan.recommend.server.gen.recommend.Recommend.internal_static_RecommendResponse_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.tzld.piaoquan.recommend.server.gen.recommend.Recommend.internal_static_HomepageRecommendResponse_fieldAccessorTable
+      return com.tzld.piaoquan.recommend.server.gen.recommend.Recommend.internal_static_RecommendResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse.class, com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse.Builder.class);
+              com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse.class, com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse.Builder.class);
     }
 
-    // Construct using com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse.newBuilder()
+    // Construct using com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse.newBuilder()
     private Builder() {
       maybeForceBuilderInitialization();
     }
@@ -411,17 +411,17 @@ private static final long serialVersionUID = 0L;
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return com.tzld.piaoquan.recommend.server.gen.recommend.Recommend.internal_static_HomepageRecommendResponse_descriptor;
+      return com.tzld.piaoquan.recommend.server.gen.recommend.Recommend.internal_static_RecommendResponse_descriptor;
     }
 
     @java.lang.Override
-    public com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse getDefaultInstanceForType() {
-      return com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse.getDefaultInstance();
+    public com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse getDefaultInstanceForType() {
+      return com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse.getDefaultInstance();
     }
 
     @java.lang.Override
-    public com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse build() {
-      com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse result = buildPartial();
+    public com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse build() {
+      com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
@@ -429,8 +429,8 @@ private static final long serialVersionUID = 0L;
     }
 
     @java.lang.Override
-    public com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse buildPartial() {
-      com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse result = new com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse(this);
+    public com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse buildPartial() {
+      com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse result = new com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse(this);
       int from_bitField0_ = bitField0_;
       if (resultBuilder_ == null) {
         result.result_ = result_;
@@ -484,16 +484,16 @@ private static final long serialVersionUID = 0L;
     }
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse) {
-        return mergeFrom((com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse)other);
+      if (other instanceof com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse) {
+        return mergeFrom((com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse)other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse other) {
-      if (other == com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse.getDefaultInstance()) return this;
+    public Builder mergeFrom(com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse other) {
+      if (other == com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse.getDefaultInstance()) return this;
       if (other.hasResult()) {
         mergeResult(other.getResult());
       }
@@ -538,11 +538,11 @@ private static final long serialVersionUID = 0L;
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse parsedMessage = null;
+      com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse) e.getUnfinishedMessage();
+        parsedMessage = (com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -924,41 +924,41 @@ private static final long serialVersionUID = 0L;
     }
 
 
-    // @@protoc_insertion_point(builder_scope:HomepageRecommendResponse)
+    // @@protoc_insertion_point(builder_scope:RecommendResponse)
   }
 
-  // @@protoc_insertion_point(class_scope:HomepageRecommendResponse)
-  private static final com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse DEFAULT_INSTANCE;
+  // @@protoc_insertion_point(class_scope:RecommendResponse)
+  private static final com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse DEFAULT_INSTANCE;
   static {
-    DEFAULT_INSTANCE = new com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse();
+    DEFAULT_INSTANCE = new com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse();
   }
 
-  public static com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse getDefaultInstance() {
+  public static com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser<HomepageRecommendResponse>
-      PARSER = new com.google.protobuf.AbstractParser<HomepageRecommendResponse>() {
+  private static final com.google.protobuf.Parser<RecommendResponse>
+      PARSER = new com.google.protobuf.AbstractParser<RecommendResponse>() {
     @java.lang.Override
-    public HomepageRecommendResponse parsePartialFrom(
+    public RecommendResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new HomepageRecommendResponse(input, extensionRegistry);
+      return new RecommendResponse(input, extensionRegistry);
     }
   };
 
-  public static com.google.protobuf.Parser<HomepageRecommendResponse> parser() {
+  public static com.google.protobuf.Parser<RecommendResponse> parser() {
     return PARSER;
   }
 
   @java.lang.Override
-  public com.google.protobuf.Parser<HomepageRecommendResponse> getParserForType() {
+  public com.google.protobuf.Parser<RecommendResponse> getParserForType() {
     return PARSER;
   }
 
   @java.lang.Override
-  public com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse getDefaultInstanceForType() {
+  public com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 

+ 2 - 2
recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/recommend/HomepageRecommendResponseOrBuilder.java → recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/recommend/RecommendResponseOrBuilder.java

@@ -3,8 +3,8 @@
 
 package com.tzld.piaoquan.recommend.server.gen.recommend;
 
-public interface HomepageRecommendResponseOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:HomepageRecommendResponse)
+public interface RecommendResponseOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:RecommendResponse)
     com.google.protobuf.MessageOrBuilder {
 
   /**

+ 97 - 26
recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/recommend/RecommendService.java

@@ -16,12 +16,20 @@ public  abstract class RecommendService
      * 首页推荐和tab分类 /applet/video/homepage/recommend
      * </pre>
      *
-     * <code>rpc HomepageRecommend(.HomepageRecommendRequest) returns (.HomepageRecommendResponse);</code>
+     * <code>rpc HomepageRecommend(.RecommendRequest) returns (.RecommendResponse);</code>
      */
     public abstract void homepageRecommend(
         com.google.protobuf.RpcController controller,
-        com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendRequest request,
-        com.google.protobuf.RpcCallback<com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse> done);
+        com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest request,
+        com.google.protobuf.RpcCallback<com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse> done);
+
+    /**
+     * <code>rpc RelevantRecommend(.RecommendRequest) returns (.RecommendResponse);</code>
+     */
+    public abstract void relevantRecommend(
+        com.google.protobuf.RpcController controller,
+        com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest request,
+        com.google.protobuf.RpcCallback<com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse> done);
 
   }
 
@@ -31,11 +39,19 @@ public  abstract class RecommendService
       @java.lang.Override
       public  void homepageRecommend(
           com.google.protobuf.RpcController controller,
-          com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendRequest request,
-          com.google.protobuf.RpcCallback<com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse> done) {
+          com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest request,
+          com.google.protobuf.RpcCallback<com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse> done) {
         impl.homepageRecommend(controller, request, done);
       }
 
+      @java.lang.Override
+      public  void relevantRecommend(
+          com.google.protobuf.RpcController controller,
+          com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest request,
+          com.google.protobuf.RpcCallback<com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse> done) {
+        impl.relevantRecommend(controller, request, done);
+      }
+
     };
   }
 
@@ -59,7 +75,9 @@ public  abstract class RecommendService
         }
         switch(method.getIndex()) {
           case 0:
-            return impl.homepageRecommend(controller, (com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendRequest)request);
+            return impl.homepageRecommend(controller, (com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest)request);
+          case 1:
+            return impl.relevantRecommend(controller, (com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest)request);
           default:
             throw new java.lang.AssertionError("Can't get here.");
         }
@@ -75,7 +93,9 @@ public  abstract class RecommendService
         }
         switch(method.getIndex()) {
           case 0:
-            return com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendRequest.getDefaultInstance();
+            return com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest.getDefaultInstance();
+          case 1:
+            return com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest.getDefaultInstance();
           default:
             throw new java.lang.AssertionError("Can't get here.");
         }
@@ -91,7 +111,9 @@ public  abstract class RecommendService
         }
         switch(method.getIndex()) {
           case 0:
-            return com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse.getDefaultInstance();
+            return com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse.getDefaultInstance();
+          case 1:
+            return com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse.getDefaultInstance();
           default:
             throw new java.lang.AssertionError("Can't get here.");
         }
@@ -105,12 +127,20 @@ public  abstract class RecommendService
    * 首页推荐和tab分类 /applet/video/homepage/recommend
    * </pre>
    *
-   * <code>rpc HomepageRecommend(.HomepageRecommendRequest) returns (.HomepageRecommendResponse);</code>
+   * <code>rpc HomepageRecommend(.RecommendRequest) returns (.RecommendResponse);</code>
    */
   public abstract void homepageRecommend(
       com.google.protobuf.RpcController controller,
-      com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendRequest request,
-      com.google.protobuf.RpcCallback<com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse> done);
+      com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest request,
+      com.google.protobuf.RpcCallback<com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse> done);
+
+  /**
+   * <code>rpc RelevantRecommend(.RecommendRequest) returns (.RecommendResponse);</code>
+   */
+  public abstract void relevantRecommend(
+      com.google.protobuf.RpcController controller,
+      com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest request,
+      com.google.protobuf.RpcCallback<com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse> done);
 
   public static final
       com.google.protobuf.Descriptors.ServiceDescriptor
@@ -135,8 +165,13 @@ public  abstract class RecommendService
     }
     switch(method.getIndex()) {
       case 0:
-        this.homepageRecommend(controller, (com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendRequest)request,
-          com.google.protobuf.RpcUtil.<com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse>specializeCallback(
+        this.homepageRecommend(controller, (com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest)request,
+          com.google.protobuf.RpcUtil.<com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse>specializeCallback(
+            done));
+        return;
+      case 1:
+        this.relevantRecommend(controller, (com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest)request,
+          com.google.protobuf.RpcUtil.<com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse>specializeCallback(
             done));
         return;
       default:
@@ -154,7 +189,9 @@ public  abstract class RecommendService
     }
     switch(method.getIndex()) {
       case 0:
-        return com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendRequest.getDefaultInstance();
+        return com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest.getDefaultInstance();
+      case 1:
+        return com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest.getDefaultInstance();
       default:
         throw new java.lang.AssertionError("Can't get here.");
     }
@@ -170,7 +207,9 @@ public  abstract class RecommendService
     }
     switch(method.getIndex()) {
       case 0:
-        return com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse.getDefaultInstance();
+        return com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse.getDefaultInstance();
+      case 1:
+        return com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse.getDefaultInstance();
       default:
         throw new java.lang.AssertionError("Can't get here.");
     }
@@ -194,17 +233,32 @@ public  abstract class RecommendService
 
     public  void homepageRecommend(
         com.google.protobuf.RpcController controller,
-        com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendRequest request,
-        com.google.protobuf.RpcCallback<com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse> done) {
+        com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest request,
+        com.google.protobuf.RpcCallback<com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse> done) {
       channel.callMethod(
         getDescriptor().getMethods().get(0),
         controller,
         request,
-        com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse.getDefaultInstance(),
+        com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse.getDefaultInstance(),
+        com.google.protobuf.RpcUtil.generalizeCallback(
+          done,
+          com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse.class,
+          com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse.getDefaultInstance()));
+    }
+
+    public  void relevantRecommend(
+        com.google.protobuf.RpcController controller,
+        com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest request,
+        com.google.protobuf.RpcCallback<com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse> done) {
+      channel.callMethod(
+        getDescriptor().getMethods().get(1),
+        controller,
+        request,
+        com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse.getDefaultInstance(),
         com.google.protobuf.RpcUtil.generalizeCallback(
           done,
-          com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse.class,
-          com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse.getDefaultInstance()));
+          com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse.class,
+          com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse.getDefaultInstance()));
     }
   }
 
@@ -214,9 +268,14 @@ public  abstract class RecommendService
   }
 
   public interface BlockingInterface {
-    public com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse homepageRecommend(
+    public com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse homepageRecommend(
+        com.google.protobuf.RpcController controller,
+        com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest request)
+        throws com.google.protobuf.ServiceException;
+
+    public com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse relevantRecommend(
         com.google.protobuf.RpcController controller,
-        com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendRequest request)
+        com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest request)
         throws com.google.protobuf.ServiceException;
   }
 
@@ -227,15 +286,27 @@ public  abstract class RecommendService
 
     private final com.google.protobuf.BlockingRpcChannel channel;
 
-    public com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse homepageRecommend(
+    public com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse homepageRecommend(
         com.google.protobuf.RpcController controller,
-        com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendRequest request)
+        com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest request)
         throws com.google.protobuf.ServiceException {
-      return (com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse) channel.callBlockingMethod(
+      return (com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse) channel.callBlockingMethod(
         getDescriptor().getMethods().get(0),
         controller,
         request,
-        com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse.getDefaultInstance());
+        com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse.getDefaultInstance());
+    }
+
+
+    public com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse relevantRecommend(
+        com.google.protobuf.RpcController controller,
+        com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest request)
+        throws com.google.protobuf.ServiceException {
+      return (com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse) channel.callBlockingMethod(
+        getDescriptor().getMethods().get(1),
+        controller,
+        request,
+        com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse.getDefaultInstance());
     }
 
   }

+ 95 - 21
recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/recommend/RecommendServiceGrpc.java

@@ -27,29 +27,29 @@ public final class RecommendServiceGrpc {
   public static final String SERVICE_NAME = "RecommendService";
 
   // Static method descriptors that strictly reflect the proto.
-  private static volatile io.grpc.MethodDescriptor<com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendRequest,
-      com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse> getHomepageRecommendMethod;
+  private static volatile io.grpc.MethodDescriptor<com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest,
+      com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse> getHomepageRecommendMethod;
 
   @io.grpc.stub.annotations.RpcMethod(
       fullMethodName = SERVICE_NAME + '/' + "HomepageRecommend",
-      requestType = com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendRequest.class,
-      responseType = com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse.class,
+      requestType = com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest.class,
+      responseType = com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
-  public static io.grpc.MethodDescriptor<com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendRequest,
-      com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse> getHomepageRecommendMethod() {
-    io.grpc.MethodDescriptor<com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendRequest, com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse> getHomepageRecommendMethod;
+  public static io.grpc.MethodDescriptor<com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest,
+      com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse> getHomepageRecommendMethod() {
+    io.grpc.MethodDescriptor<com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest, com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse> getHomepageRecommendMethod;
     if ((getHomepageRecommendMethod = RecommendServiceGrpc.getHomepageRecommendMethod) == null) {
       synchronized (RecommendServiceGrpc.class) {
         if ((getHomepageRecommendMethod = RecommendServiceGrpc.getHomepageRecommendMethod) == null) {
           RecommendServiceGrpc.getHomepageRecommendMethod = getHomepageRecommendMethod =
-              io.grpc.MethodDescriptor.<com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendRequest, com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse>newBuilder()
+              io.grpc.MethodDescriptor.<com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest, com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse>newBuilder()
               .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
               .setFullMethodName(generateFullMethodName(SERVICE_NAME, "HomepageRecommend"))
               .setSampledToLocalTracing(true)
               .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendRequest.getDefaultInstance()))
+                  com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest.getDefaultInstance()))
               .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse.getDefaultInstance()))
+                  com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse.getDefaultInstance()))
               .setSchemaDescriptor(new RecommendServiceMethodDescriptorSupplier("HomepageRecommend"))
               .build();
         }
@@ -58,6 +58,37 @@ public final class RecommendServiceGrpc {
     return getHomepageRecommendMethod;
   }
 
+  private static volatile io.grpc.MethodDescriptor<com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest,
+      com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse> getRelevantRecommendMethod;
+
+  @io.grpc.stub.annotations.RpcMethod(
+      fullMethodName = SERVICE_NAME + '/' + "RelevantRecommend",
+      requestType = com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest.class,
+      responseType = com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse.class,
+      methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
+  public static io.grpc.MethodDescriptor<com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest,
+      com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse> getRelevantRecommendMethod() {
+    io.grpc.MethodDescriptor<com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest, com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse> getRelevantRecommendMethod;
+    if ((getRelevantRecommendMethod = RecommendServiceGrpc.getRelevantRecommendMethod) == null) {
+      synchronized (RecommendServiceGrpc.class) {
+        if ((getRelevantRecommendMethod = RecommendServiceGrpc.getRelevantRecommendMethod) == null) {
+          RecommendServiceGrpc.getRelevantRecommendMethod = getRelevantRecommendMethod =
+              io.grpc.MethodDescriptor.<com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest, com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse>newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(generateFullMethodName(SERVICE_NAME, "RelevantRecommend"))
+              .setSampledToLocalTracing(true)
+              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest.getDefaultInstance()))
+              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse.getDefaultInstance()))
+              .setSchemaDescriptor(new RecommendServiceMethodDescriptorSupplier("RelevantRecommend"))
+              .build();
+        }
+      }
+    }
+    return getRelevantRecommendMethod;
+  }
+
   /**
    * Creates a new async stub that supports all call types for the service
    */
@@ -111,20 +142,34 @@ public final class RecommendServiceGrpc {
      * 首页推荐和tab分类 /applet/video/homepage/recommend
      * </pre>
      */
-    public void homepageRecommend(com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendRequest request,
-        io.grpc.stub.StreamObserver<com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse> responseObserver) {
+    public void homepageRecommend(com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest request,
+        io.grpc.stub.StreamObserver<com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse> responseObserver) {
       asyncUnimplementedUnaryCall(getHomepageRecommendMethod(), responseObserver);
     }
 
+    /**
+     */
+    public void relevantRecommend(com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest request,
+        io.grpc.stub.StreamObserver<com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse> responseObserver) {
+      asyncUnimplementedUnaryCall(getRelevantRecommendMethod(), responseObserver);
+    }
+
     @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
       return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
           .addMethod(
             getHomepageRecommendMethod(),
             asyncUnaryCall(
               new MethodHandlers<
-                com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendRequest,
-                com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse>(
+                com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest,
+                com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse>(
                   this, METHODID_HOMEPAGE_RECOMMEND)))
+          .addMethod(
+            getRelevantRecommendMethod(),
+            asyncUnaryCall(
+              new MethodHandlers<
+                com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest,
+                com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse>(
+                  this, METHODID_RELEVANT_RECOMMEND)))
           .build();
     }
   }
@@ -148,11 +193,19 @@ public final class RecommendServiceGrpc {
      * 首页推荐和tab分类 /applet/video/homepage/recommend
      * </pre>
      */
-    public void homepageRecommend(com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendRequest request,
-        io.grpc.stub.StreamObserver<com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse> responseObserver) {
+    public void homepageRecommend(com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest request,
+        io.grpc.stub.StreamObserver<com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse> responseObserver) {
       asyncUnaryCall(
           getChannel().newCall(getHomepageRecommendMethod(), getCallOptions()), request, responseObserver);
     }
+
+    /**
+     */
+    public void relevantRecommend(com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest request,
+        io.grpc.stub.StreamObserver<com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse> responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(getRelevantRecommendMethod(), getCallOptions()), request, responseObserver);
+    }
   }
 
   /**
@@ -174,10 +227,17 @@ public final class RecommendServiceGrpc {
      * 首页推荐和tab分类 /applet/video/homepage/recommend
      * </pre>
      */
-    public com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse homepageRecommend(com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendRequest request) {
+    public com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse homepageRecommend(com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest request) {
       return blockingUnaryCall(
           getChannel(), getHomepageRecommendMethod(), getCallOptions(), request);
     }
+
+    /**
+     */
+    public com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse relevantRecommend(com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest request) {
+      return blockingUnaryCall(
+          getChannel(), getRelevantRecommendMethod(), getCallOptions(), request);
+    }
   }
 
   /**
@@ -199,14 +259,23 @@ public final class RecommendServiceGrpc {
      * 首页推荐和tab分类 /applet/video/homepage/recommend
      * </pre>
      */
-    public com.google.common.util.concurrent.ListenableFuture<com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse> homepageRecommend(
-        com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendRequest request) {
+    public com.google.common.util.concurrent.ListenableFuture<com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse> homepageRecommend(
+        com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest request) {
       return futureUnaryCall(
           getChannel().newCall(getHomepageRecommendMethod(), getCallOptions()), request);
     }
+
+    /**
+     */
+    public com.google.common.util.concurrent.ListenableFuture<com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse> relevantRecommend(
+        com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(getRelevantRecommendMethod(), getCallOptions()), request);
+    }
   }
 
   private static final int METHODID_HOMEPAGE_RECOMMEND = 0;
+  private static final int METHODID_RELEVANT_RECOMMEND = 1;
 
   private static final class MethodHandlers<Req, Resp> implements
       io.grpc.stub.ServerCalls.UnaryMethod<Req, Resp>,
@@ -226,8 +295,12 @@ public final class RecommendServiceGrpc {
     public void invoke(Req request, io.grpc.stub.StreamObserver<Resp> responseObserver) {
       switch (methodId) {
         case METHODID_HOMEPAGE_RECOMMEND:
-          serviceImpl.homepageRecommend((com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendRequest) request,
-              (io.grpc.stub.StreamObserver<com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse>) responseObserver);
+          serviceImpl.homepageRecommend((com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest) request,
+              (io.grpc.stub.StreamObserver<com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse>) responseObserver);
+          break;
+        case METHODID_RELEVANT_RECOMMEND:
+          serviceImpl.relevantRecommend((com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest) request,
+              (io.grpc.stub.StreamObserver<com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse>) responseObserver);
           break;
         default:
           throw new AssertionError();
@@ -291,6 +364,7 @@ public final class RecommendServiceGrpc {
           serviceDescriptor = result = io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME)
               .setSchemaDescriptor(new RecommendServiceFileDescriptorSupplier())
               .addMethod(getHomepageRecommendMethod())
+              .addMethod(getRelevantRecommendMethod())
               .build();
         }
       }

+ 0 - 57
recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/recommend/VideoOrBuilder.java

@@ -1,57 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: com/tzld/piaoquan/recommend/server/recommend.proto
-
-package com.tzld.piaoquan.recommend.server.gen.recommend;
-
-public interface VideoOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:Video)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * <code>int64 video_id = 1;</code>
-   * @return The videoId.
-   */
-  long getVideoId();
-
-  /**
-   * <code>double rov_score = 2;</code>
-   * @return The rovScore.
-   */
-  double getRovScore();
-
-  /**
-   * <code>string push_from = 3;</code>
-   * @return The pushFrom.
-   */
-  java.lang.String getPushFrom();
-  /**
-   * <code>string push_from = 3;</code>
-   * @return The bytes for pushFrom.
-   */
-  com.google.protobuf.ByteString
-      getPushFromBytes();
-
-  /**
-   * <code>string ab_code = 4;</code>
-   * @return The abCode.
-   */
-  java.lang.String getAbCode();
-  /**
-   * <code>string ab_code = 4;</code>
-   * @return The bytes for abCode.
-   */
-  com.google.protobuf.ByteString
-      getAbCodeBytes();
-
-  /**
-   * <code>double sort_score = 5;</code>
-   * @return The sortScore.
-   */
-  double getSortScore();
-
-  /**
-   * <code>int32 position = 6;</code>
-   * @return The position.
-   */
-  int getPosition();
-}

+ 8 - 0
recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/recommend/VideoProto.java

@@ -4,6 +4,10 @@
 package com.tzld.piaoquan.recommend.server.gen.recommend;
 
 /**
+ * <pre>
+ * RecommendRovVideoDTO
+ * </pre>
+ *
  * Protobuf type {@code VideoProto}
  */
 public final class VideoProto extends
@@ -559,6 +563,10 @@ private static final long serialVersionUID = 0L;
     return builder;
   }
   /**
+   * <pre>
+   * RecommendRovVideoDTO
+   * </pre>
+   *
    * Protobuf type {@code VideoProto}
    */
   public static final class Builder extends

+ 12 - 19
recommend-server-client/src/main/proto/com/tzld/piaoquan/recommend/server/recommend.proto

@@ -8,30 +8,22 @@ option java_package = "com.tzld.piaoquan.recommend.server.gen.recommend";
 option java_generic_services = true;
 
 
-message HomepageRecommendRequest {
+message RecommendRequest {
   string request_id = 1;
   string mid = 2;
   string uid = 3;
-  string category_id = 4;
-  int32 size = 5; // default 4
-  int32 app_type = 6; // default 4
-  string algo_type = 7;
-  string client_info = 8;
-  string ab_exp_info = 9;
-  string ab_info_data = 10;
-  int32 version_audit_status = 11; // default 2
-  string machine_info_brand = 12;
-  string machine_info_model = 13;
-  string machine_info_platform = 14;
-  string page_source = 15;
-  int32 version_code = 16; // default 0
-  string recommend_source = 17; // default 0
-  int32 scene_type = 18; // default 0
-  string recommend_trace_id = 19;
+  int32 size = 4; // default 4
+  int32 app_type = 5; // default 4
+  string client_info = 6;
+  string ab_exp_info = 7;
+  string ab_info_data = 8;
+  int32 version_audit_status = 9; // default 2
+  string recommend_trace_id = 10;
+  int64 video_id = 11;
 }
 
 // https://sls.console.aliyun.com/lognext/project/rov-server/logsearch/info
-message HomepageRecommendResponse {
+message RecommendResponse {
   Result result = 1;
   repeated VideoProto video = 2;
 }
@@ -51,6 +43,7 @@ message VideoProto{
 
 service RecommendService {
   // 首页推荐和tab分类 /applet/video/homepage/recommend
-  rpc HomepageRecommend (HomepageRecommendRequest) returns (HomepageRecommendResponse);
+  rpc HomepageRecommend (RecommendRequest) returns (RecommendResponse);
+  rpc RelevantRecommend (RecommendRequest) returns (RecommendResponse);
 
 }

+ 17 - 7
recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/grpcservice/RecommendService.java

@@ -1,22 +1,32 @@
 package com.tzld.piaoquan.recommend.server.grpcservice;
 
-import com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendRequest;
-import com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse;
+import com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest;
+import com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse;
 import com.tzld.piaoquan.recommend.server.gen.recommend.RecommendServiceGrpc;
+import com.tzld.piaoquan.recommend.server.service.RecommendService;
 import io.grpc.stub.StreamObserver;
 import net.devh.boot.grpc.server.service.GrpcService;
+import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * @author dyp
  */
 @GrpcService
-public class RecommendService extends RecommendServiceGrpc.RecommendServiceImplBase {
-    @Override
-    public void homepageRecommend(HomepageRecommendRequest request, StreamObserver<HomepageRecommendResponse> responseObserver) {
-        HomepageRecommendResponse.Builder builder = HomepageRecommendResponse.newBuilder();
+class RecommendGrpcService extends RecommendServiceGrpc.RecommendServiceImplBase {
+    @Autowired
+    private RecommendService recommendService;
 
+    @Override
+    public void homepageRecommend(RecommendRequest request, StreamObserver<RecommendResponse> responseObserver) {
+        RecommendResponse response = recommendService.homepageRecommend(request);
+        responseObserver.onNext(response);
+        responseObserver.onCompleted();
+    }
 
-        responseObserver.onNext(builder.build());
+    @Override
+    public void relevantRecommend(RecommendRequest request, StreamObserver<RecommendResponse> responseObserver) {
+        RecommendResponse response = recommendService.relevantRecommend(request);
+        responseObserver.onNext(response);
         responseObserver.onCompleted();
     }
 }

+ 1 - 1
recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/model/HomepageRecommendParam.java → recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/model/RecommendParam.java

@@ -11,7 +11,7 @@ import lombok.Setter;
 @NoArgsConstructor
 @Getter
 @Setter
-public class HomepageRecommendParam {
+public class RecommendParam {
     private int topK;
     private double flowPoolP;
     private String abCode;

+ 26 - 19
recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/RecommendService.java

@@ -5,10 +5,10 @@ import com.ctrip.framework.apollo.spring.annotation.ApolloJsonValue;
 import com.google.common.base.Strings;
 import com.tzld.piaoquan.recommend.server.common.enums.AppTypeEnum;
 import com.tzld.piaoquan.recommend.server.gen.common.Result;
-import com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendRequest;
-import com.tzld.piaoquan.recommend.server.gen.recommend.HomepageRecommendResponse;
+import com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest;
+import com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse;
 import com.tzld.piaoquan.recommend.server.gen.recommend.VideoProto;
-import com.tzld.piaoquan.recommend.server.model.HomepageRecommendParam;
+import com.tzld.piaoquan.recommend.server.model.RecommendParam;
 import com.tzld.piaoquan.recommend.server.model.Video;
 import com.tzld.piaoquan.recommend.server.service.flowpool.FlowPoolConfigService;
 import com.tzld.piaoquan.recommend.server.service.flowpool.FlowPoolConstants;
@@ -83,8 +83,15 @@ public class RecommendService {
         ab_initial_config_map.put(-1, "095-1");
     }
 
-    public HomepageRecommendResponse homepageRecommend(HomepageRecommendRequest request) {
+    public RecommendResponse homepageRecommend(RecommendRequest request) {
+        return recommend(request, 0);
+    }
+
+    public RecommendResponse relevantRecommend(RecommendRequest request) {
+        return recommend(request, 1);
+    }
 
+    public RecommendResponse recommend(RecommendRequest request, int recommendType) {
         if (request.getVersionAuditStatus() == 1) {
             return specialMidRecommend(request);
         }
@@ -92,8 +99,8 @@ public class RecommendService {
                 && redisTemplate.opsForSet().isMember("special:mid", request.getMid())) {
             return specialMidRecommend(request);
         }
-        HomepageRecommendParam param = genHomepageRecommendParam(request, 0);
-        log.info("genHomepageRecommendParam : {}", JSONUtils.toJson(param));
+        RecommendParam param = genRecommendParam(request, 0);
+        log.info("genRecommendParam : {}", JSONUtils.toJson(param));
 
         List<Video> videos = videoRecommend(param);
 
@@ -115,14 +122,14 @@ public class RecommendService {
                     .build());
         }
 
-        return HomepageRecommendResponse.newBuilder()
+        return RecommendResponse.newBuilder()
                 .setResult(Result.newBuilder().setCode(1).setMessage("success"))
                 .addAllVideo(vps)
                 .build();
 
     }
 
-    private HomepageRecommendResponse specialMidRecommend(HomepageRecommendRequest request) {
+    private RecommendResponse specialMidRecommend(RecommendRequest request) {
         String keyNamePrefix = "special:videos:item:";
         String dateStr = DateUtils.getCurrentDateStr("yyyyMMdd");
         String specialKeyName = keyNamePrefix + dateStr;
@@ -166,18 +173,19 @@ public class RecommendService {
             redisTemplate.opsForValue().set(lastSpecialRecallKey, String.valueOf(results.get(results.size() - 1).getVideoId()), 1, TimeUnit.DAYS);
         }
 
-        return HomepageRecommendResponse.newBuilder()
+        return RecommendResponse.newBuilder()
                 .setResult(Result.newBuilder().setCode(1).setMessage("success"))
                 .addAllVideo(results)
                 .build();
     }
 
-    private HomepageRecommendParam genHomepageRecommendParam(HomepageRecommendRequest request, int recommendType) {
-        HomepageRecommendParam param = new HomepageRecommendParam();
+    private RecommendParam genRecommendParam(RecommendRequest request, int recommendType) {
+        RecommendParam param = new RecommendParam();
         param.setTopK(3);
         param.setFlowPoolP(0.3);
         param.setMid(request.getMid());
         param.setSize(request.getSize());
+        param.setVideoId(request.getVideoId());
 
         // client_info: {"cityCode": "", "provinceCode": "330000"}
         if (StringUtils.isNotBlank(request.getClientInfo())) {
@@ -244,7 +252,6 @@ public class RecommendService {
                     abInfoAppMap.put(entry.getKey(), eventId);
                 }
             }
-
             if (recommendType == 0) {
                 String eventId = abInfoAppMap.get("10003");
                 Map<String, Map<String, String>> appAbCode = appAbCodeMap.get("10003");
@@ -273,7 +280,7 @@ public class RecommendService {
         return param;
     }
 
-    private List<Video> videoRecommend(HomepageRecommendParam param) {
+    private List<Video> videoRecommend(RecommendParam param) {
         RecallResult recallResult = recallService.recall(convertToRecallParam(param));
         RankResult result = rankService.rank(convertToRankParam(param, recallResult));
 
@@ -298,7 +305,7 @@ public class RecommendService {
         return videos;
     }
 
-    private RecallParam convertToRecallParam(HomepageRecommendParam param) {
+    private RecallParam convertToRecallParam(RecommendParam param) {
         RecallParam recallParam = new RecallParam();
         recallParam.setAppType(param.getAppType());
         recallParam.setAbCode(param.getAbCode());
@@ -314,7 +321,7 @@ public class RecommendService {
     }
 
 
-    private RankParam convertToRankParam(HomepageRecommendParam param, RecallResult recallResult) {
+    private RankParam convertToRankParam(RecommendParam param, RecallResult recallResult) {
         RankParam rankParam = new RankParam();
         rankParam.setRecallResult(recallResult);
         rankParam.setAbCode(param.getAbCode());
@@ -326,7 +333,7 @@ public class RecommendService {
         return rankParam;
     }
 
-    private void markFlowPoolVideo(HomepageRecommendParam param, List<Video> videos) {
+    private void markFlowPoolVideo(RecommendParam param, List<Video> videos) {
         for (Video data : videos) {
 
             Long videoId = data.getVideoId();
@@ -350,7 +357,7 @@ public class RecommendService {
         }
     }
 
-    private void updateCache(HomepageRecommendRequest request, HomepageRecommendParam param, List<Video> videos) {
+    private void updateCache(RecommendRequest request, RecommendParam param, List<Video> videos) {
         if (StringUtils.isNotBlank(request.getMid())
                 || CollectionUtils.isEmpty(videos)) {
             return;
@@ -367,7 +374,7 @@ public class RecommendService {
 
     }
 
-    private void updateFlowPoolCache(HomepageRecommendRequest request, HomepageRecommendParam param,
+    private void updateFlowPoolCache(RecommendRequest request, RecommendParam param,
                                      List<Video> videos) {
         if (request.getAppType() == 18
                 || request.getAppType() == 19
@@ -393,7 +400,7 @@ public class RecommendService {
         }
     }
 
-    private void updateLastVideoCache(HomepageRecommendRequest request, HomepageRecommendParam param,
+    private void updateLastVideoCache(RecommendRequest request, RecommendParam param,
                                       List<Video> videos) {
         // 2 地域小时最后一个视频
         for (int i = videos.size() - 1; i >= 0; i--) {

部分文件因文件數量過多而無法顯示