Browse Source

PushFromIndex package

gufengshou1 1 year ago
parent
commit
8eec6ed936

+ 1 - 1
recommend-server-client/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>recommend-server-client</artifactId>
-    <version>1.1.2</version>
+    <version>1.1.3</version>
 
     <dependencies>
         <dependency>

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

@@ -79,9 +79,9 @@ public final class Recommend {
       "\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(\001\022\'\n\017push_from_index\030\n \001" +
+      "\001(\005\022\014\n\004rand\030\t \001(\001\022\'\n\017push_from_index\030\n \003" +
       "(\0132\016.PushFromIndex\"1\n\rPushFromIndex\022\021\n\tp" +
-      "ush_from\030\001 \001(\t\022\r\n\005index\030\002 \001(\t2\212\001\n\020Recomm" +
+      "ush_from\030\001 \001(\t\022\r\n\005index\030\002 \003(\t2\212\001\n\020Recomm" +
       "endService\022:\n\021HomepageRecommend\022\021.Recomm" +
       "endRequest\032\022.RecommendResponse\022:\n\021Releva" +
       "ntRecommend\022\021.RecommendRequest\032\022.Recomme" +

+ 249 - 86
recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/recommend/VideoProto.java

@@ -23,6 +23,7 @@ private static final long serialVersionUID = 0L;
     pushFrom_ = "";
     abCode_ = "";
     flowPool_ = "";
+    pushFromIndex_ = java.util.Collections.emptyList();
   }
 
   @java.lang.Override
@@ -45,6 +46,7 @@ private static final long serialVersionUID = 0L;
     if (extensionRegistry == null) {
       throw new java.lang.NullPointerException();
     }
+    int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
@@ -104,16 +106,12 @@ private static final long serialVersionUID = 0L;
             break;
           }
           case 82: {
-            com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex.Builder subBuilder = null;
-            if (pushFromIndex_ != null) {
-              subBuilder = pushFromIndex_.toBuilder();
+            if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+              pushFromIndex_ = new java.util.ArrayList<com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex>();
+              mutable_bitField0_ |= 0x00000001;
             }
-            pushFromIndex_ = input.readMessage(com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(pushFromIndex_);
-              pushFromIndex_ = subBuilder.buildPartial();
-            }
-
+            pushFromIndex_.add(
+                input.readMessage(com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex.parser(), extensionRegistry));
             break;
           }
           default: {
@@ -131,6 +129,9 @@ private static final long serialVersionUID = 0L;
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        pushFromIndex_ = java.util.Collections.unmodifiableList(pushFromIndex_);
+      }
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
@@ -329,29 +330,43 @@ private static final long serialVersionUID = 0L;
   }
 
   public static final int PUSH_FROM_INDEX_FIELD_NUMBER = 10;
-  private com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex pushFromIndex_;
+  private java.util.List<com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex> pushFromIndex_;
+  /**
+   * <code>repeated .PushFromIndex push_from_index = 10;</code>
+   */
+  @java.lang.Override
+  public java.util.List<com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex> getPushFromIndexList() {
+    return pushFromIndex_;
+  }
   /**
-   * <code>.PushFromIndex push_from_index = 10;</code>
-   * @return Whether the pushFromIndex field is set.
+   * <code>repeated .PushFromIndex push_from_index = 10;</code>
    */
   @java.lang.Override
-  public boolean hasPushFromIndex() {
-    return pushFromIndex_ != null;
+  public java.util.List<? extends com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndexOrBuilder> 
+      getPushFromIndexOrBuilderList() {
+    return pushFromIndex_;
   }
   /**
-   * <code>.PushFromIndex push_from_index = 10;</code>
-   * @return The pushFromIndex.
+   * <code>repeated .PushFromIndex push_from_index = 10;</code>
    */
   @java.lang.Override
-  public com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex getPushFromIndex() {
-    return pushFromIndex_ == null ? com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex.getDefaultInstance() : pushFromIndex_;
+  public int getPushFromIndexCount() {
+    return pushFromIndex_.size();
   }
   /**
-   * <code>.PushFromIndex push_from_index = 10;</code>
+   * <code>repeated .PushFromIndex push_from_index = 10;</code>
    */
   @java.lang.Override
-  public com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndexOrBuilder getPushFromIndexOrBuilder() {
-    return getPushFromIndex();
+  public com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex getPushFromIndex(int index) {
+    return pushFromIndex_.get(index);
+  }
+  /**
+   * <code>repeated .PushFromIndex push_from_index = 10;</code>
+   */
+  @java.lang.Override
+  public com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndexOrBuilder getPushFromIndexOrBuilder(
+      int index) {
+    return pushFromIndex_.get(index);
   }
 
   private byte memoizedIsInitialized = -1;
@@ -395,8 +410,8 @@ private static final long serialVersionUID = 0L;
     if (rand_ != 0D) {
       output.writeDouble(9, rand_);
     }
-    if (pushFromIndex_ != null) {
-      output.writeMessage(10, getPushFromIndex());
+    for (int i = 0; i < pushFromIndex_.size(); i++) {
+      output.writeMessage(10, pushFromIndex_.get(i));
     }
     unknownFields.writeTo(output);
   }
@@ -440,9 +455,9 @@ private static final long serialVersionUID = 0L;
       size += com.google.protobuf.CodedOutputStream
         .computeDoubleSize(9, rand_);
     }
-    if (pushFromIndex_ != null) {
+    for (int i = 0; i < pushFromIndex_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(10, getPushFromIndex());
+        .computeMessageSize(10, pushFromIndex_.get(i));
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -480,11 +495,8 @@ private static final long serialVersionUID = 0L;
     if (java.lang.Double.doubleToLongBits(getRand())
         != java.lang.Double.doubleToLongBits(
             other.getRand())) return false;
-    if (hasPushFromIndex() != other.hasPushFromIndex()) return false;
-    if (hasPushFromIndex()) {
-      if (!getPushFromIndex()
-          .equals(other.getPushFromIndex())) return false;
-    }
+    if (!getPushFromIndexList()
+        .equals(other.getPushFromIndexList())) return false;
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
@@ -518,9 +530,9 @@ private static final long serialVersionUID = 0L;
     hash = (37 * hash) + RAND_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
         java.lang.Double.doubleToLongBits(getRand()));
-    if (hasPushFromIndex()) {
+    if (getPushFromIndexCount() > 0) {
       hash = (37 * hash) + PUSH_FROM_INDEX_FIELD_NUMBER;
-      hash = (53 * hash) + getPushFromIndex().hashCode();
+      hash = (53 * hash) + getPushFromIndexList().hashCode();
     }
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
@@ -654,6 +666,7 @@ private static final long serialVersionUID = 0L;
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3
               .alwaysUseFieldBuilders) {
+        getPushFromIndexFieldBuilder();
       }
     }
     @java.lang.Override
@@ -678,10 +691,10 @@ private static final long serialVersionUID = 0L;
       rand_ = 0D;
 
       if (pushFromIndexBuilder_ == null) {
-        pushFromIndex_ = null;
+        pushFromIndex_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        pushFromIndex_ = null;
-        pushFromIndexBuilder_ = null;
+        pushFromIndexBuilder_.clear();
       }
       return this;
     }
@@ -709,6 +722,7 @@ private static final long serialVersionUID = 0L;
     @java.lang.Override
     public com.tzld.piaoquan.recommend.server.gen.recommend.VideoProto buildPartial() {
       com.tzld.piaoquan.recommend.server.gen.recommend.VideoProto result = new com.tzld.piaoquan.recommend.server.gen.recommend.VideoProto(this);
+      int from_bitField0_ = bitField0_;
       result.videoId_ = videoId_;
       result.rovScore_ = rovScore_;
       result.pushFrom_ = pushFrom_;
@@ -719,6 +733,10 @@ private static final long serialVersionUID = 0L;
       result.isInFlowPool_ = isInFlowPool_;
       result.rand_ = rand_;
       if (pushFromIndexBuilder_ == null) {
+        if (((bitField0_ & 0x00000001) != 0)) {
+          pushFromIndex_ = java.util.Collections.unmodifiableList(pushFromIndex_);
+          bitField0_ = (bitField0_ & ~0x00000001);
+        }
         result.pushFromIndex_ = pushFromIndex_;
       } else {
         result.pushFromIndex_ = pushFromIndexBuilder_.build();
@@ -801,8 +819,31 @@ private static final long serialVersionUID = 0L;
       if (other.getRand() != 0D) {
         setRand(other.getRand());
       }
-      if (other.hasPushFromIndex()) {
-        mergePushFromIndex(other.getPushFromIndex());
+      if (pushFromIndexBuilder_ == null) {
+        if (!other.pushFromIndex_.isEmpty()) {
+          if (pushFromIndex_.isEmpty()) {
+            pushFromIndex_ = other.pushFromIndex_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensurePushFromIndexIsMutable();
+            pushFromIndex_.addAll(other.pushFromIndex_);
+          }
+          onChanged();
+        }
+      } else {
+        if (!other.pushFromIndex_.isEmpty()) {
+          if (pushFromIndexBuilder_.isEmpty()) {
+            pushFromIndexBuilder_.dispose();
+            pushFromIndexBuilder_ = null;
+            pushFromIndex_ = other.pushFromIndex_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+            pushFromIndexBuilder_ = 
+              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                 getPushFromIndexFieldBuilder() : null;
+          } else {
+            pushFromIndexBuilder_.addAllMessages(other.pushFromIndex_);
+          }
+        }
       }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
@@ -832,6 +873,7 @@ private static final long serialVersionUID = 0L;
       }
       return this;
     }
+    private int bitField0_;
 
     private long videoId_ ;
     /**
@@ -1247,118 +1289,239 @@ private static final long serialVersionUID = 0L;
       return this;
     }
 
-    private com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex pushFromIndex_;
-    private com.google.protobuf.SingleFieldBuilderV3<
+    private java.util.List<com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex> pushFromIndex_ =
+      java.util.Collections.emptyList();
+    private void ensurePushFromIndexIsMutable() {
+      if (!((bitField0_ & 0x00000001) != 0)) {
+        pushFromIndex_ = new java.util.ArrayList<com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex>(pushFromIndex_);
+        bitField0_ |= 0x00000001;
+       }
+    }
+
+    private com.google.protobuf.RepeatedFieldBuilderV3<
         com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex, com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex.Builder, com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndexOrBuilder> pushFromIndexBuilder_;
+
     /**
-     * <code>.PushFromIndex push_from_index = 10;</code>
-     * @return Whether the pushFromIndex field is set.
+     * <code>repeated .PushFromIndex push_from_index = 10;</code>
      */
-    public boolean hasPushFromIndex() {
-      return pushFromIndexBuilder_ != null || pushFromIndex_ != null;
+    public java.util.List<com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex> getPushFromIndexList() {
+      if (pushFromIndexBuilder_ == null) {
+        return java.util.Collections.unmodifiableList(pushFromIndex_);
+      } else {
+        return pushFromIndexBuilder_.getMessageList();
+      }
     }
     /**
-     * <code>.PushFromIndex push_from_index = 10;</code>
-     * @return The pushFromIndex.
+     * <code>repeated .PushFromIndex push_from_index = 10;</code>
      */
-    public com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex getPushFromIndex() {
+    public int getPushFromIndexCount() {
       if (pushFromIndexBuilder_ == null) {
-        return pushFromIndex_ == null ? com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex.getDefaultInstance() : pushFromIndex_;
+        return pushFromIndex_.size();
       } else {
-        return pushFromIndexBuilder_.getMessage();
+        return pushFromIndexBuilder_.getCount();
       }
     }
     /**
-     * <code>.PushFromIndex push_from_index = 10;</code>
+     * <code>repeated .PushFromIndex push_from_index = 10;</code>
      */
-    public Builder setPushFromIndex(com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex value) {
+    public com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex getPushFromIndex(int index) {
+      if (pushFromIndexBuilder_ == null) {
+        return pushFromIndex_.get(index);
+      } else {
+        return pushFromIndexBuilder_.getMessage(index);
+      }
+    }
+    /**
+     * <code>repeated .PushFromIndex push_from_index = 10;</code>
+     */
+    public Builder setPushFromIndex(
+        int index, com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex value) {
       if (pushFromIndexBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
         }
-        pushFromIndex_ = value;
+        ensurePushFromIndexIsMutable();
+        pushFromIndex_.set(index, value);
         onChanged();
       } else {
-        pushFromIndexBuilder_.setMessage(value);
+        pushFromIndexBuilder_.setMessage(index, value);
       }
-
       return this;
     }
     /**
-     * <code>.PushFromIndex push_from_index = 10;</code>
+     * <code>repeated .PushFromIndex push_from_index = 10;</code>
      */
     public Builder setPushFromIndex(
-        com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex.Builder builderForValue) {
+        int index, com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex.Builder builderForValue) {
       if (pushFromIndexBuilder_ == null) {
-        pushFromIndex_ = builderForValue.build();
+        ensurePushFromIndexIsMutable();
+        pushFromIndex_.set(index, builderForValue.build());
         onChanged();
       } else {
-        pushFromIndexBuilder_.setMessage(builderForValue.build());
+        pushFromIndexBuilder_.setMessage(index, builderForValue.build());
       }
-
       return this;
     }
     /**
-     * <code>.PushFromIndex push_from_index = 10;</code>
+     * <code>repeated .PushFromIndex push_from_index = 10;</code>
      */
-    public Builder mergePushFromIndex(com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex value) {
+    public Builder addPushFromIndex(com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex value) {
       if (pushFromIndexBuilder_ == null) {
-        if (pushFromIndex_ != null) {
-          pushFromIndex_ =
-            com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex.newBuilder(pushFromIndex_).mergeFrom(value).buildPartial();
-        } else {
-          pushFromIndex_ = value;
+        if (value == null) {
+          throw new NullPointerException();
         }
+        ensurePushFromIndexIsMutable();
+        pushFromIndex_.add(value);
         onChanged();
       } else {
-        pushFromIndexBuilder_.mergeFrom(value);
+        pushFromIndexBuilder_.addMessage(value);
+      }
+      return this;
+    }
+    /**
+     * <code>repeated .PushFromIndex push_from_index = 10;</code>
+     */
+    public Builder addPushFromIndex(
+        int index, com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex value) {
+      if (pushFromIndexBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensurePushFromIndexIsMutable();
+        pushFromIndex_.add(index, value);
+        onChanged();
+      } else {
+        pushFromIndexBuilder_.addMessage(index, value);
       }
-
       return this;
     }
     /**
-     * <code>.PushFromIndex push_from_index = 10;</code>
+     * <code>repeated .PushFromIndex push_from_index = 10;</code>
+     */
+    public Builder addPushFromIndex(
+        com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex.Builder builderForValue) {
+      if (pushFromIndexBuilder_ == null) {
+        ensurePushFromIndexIsMutable();
+        pushFromIndex_.add(builderForValue.build());
+        onChanged();
+      } else {
+        pushFromIndexBuilder_.addMessage(builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * <code>repeated .PushFromIndex push_from_index = 10;</code>
+     */
+    public Builder addPushFromIndex(
+        int index, com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex.Builder builderForValue) {
+      if (pushFromIndexBuilder_ == null) {
+        ensurePushFromIndexIsMutable();
+        pushFromIndex_.add(index, builderForValue.build());
+        onChanged();
+      } else {
+        pushFromIndexBuilder_.addMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * <code>repeated .PushFromIndex push_from_index = 10;</code>
+     */
+    public Builder addAllPushFromIndex(
+        java.lang.Iterable<? extends com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex> values) {
+      if (pushFromIndexBuilder_ == null) {
+        ensurePushFromIndexIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, pushFromIndex_);
+        onChanged();
+      } else {
+        pushFromIndexBuilder_.addAllMessages(values);
+      }
+      return this;
+    }
+    /**
+     * <code>repeated .PushFromIndex push_from_index = 10;</code>
      */
     public Builder clearPushFromIndex() {
       if (pushFromIndexBuilder_ == null) {
-        pushFromIndex_ = null;
+        pushFromIndex_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
       } else {
-        pushFromIndex_ = null;
-        pushFromIndexBuilder_ = null;
+        pushFromIndexBuilder_.clear();
       }
-
       return this;
     }
     /**
-     * <code>.PushFromIndex push_from_index = 10;</code>
+     * <code>repeated .PushFromIndex push_from_index = 10;</code>
      */
-    public com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex.Builder getPushFromIndexBuilder() {
-      
-      onChanged();
-      return getPushFromIndexFieldBuilder().getBuilder();
+    public Builder removePushFromIndex(int index) {
+      if (pushFromIndexBuilder_ == null) {
+        ensurePushFromIndexIsMutable();
+        pushFromIndex_.remove(index);
+        onChanged();
+      } else {
+        pushFromIndexBuilder_.remove(index);
+      }
+      return this;
+    }
+    /**
+     * <code>repeated .PushFromIndex push_from_index = 10;</code>
+     */
+    public com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex.Builder getPushFromIndexBuilder(
+        int index) {
+      return getPushFromIndexFieldBuilder().getBuilder(index);
     }
     /**
-     * <code>.PushFromIndex push_from_index = 10;</code>
+     * <code>repeated .PushFromIndex push_from_index = 10;</code>
      */
-    public com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndexOrBuilder getPushFromIndexOrBuilder() {
+    public com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndexOrBuilder getPushFromIndexOrBuilder(
+        int index) {
+      if (pushFromIndexBuilder_ == null) {
+        return pushFromIndex_.get(index);  } else {
+        return pushFromIndexBuilder_.getMessageOrBuilder(index);
+      }
+    }
+    /**
+     * <code>repeated .PushFromIndex push_from_index = 10;</code>
+     */
+    public java.util.List<? extends com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndexOrBuilder> 
+         getPushFromIndexOrBuilderList() {
       if (pushFromIndexBuilder_ != null) {
-        return pushFromIndexBuilder_.getMessageOrBuilder();
+        return pushFromIndexBuilder_.getMessageOrBuilderList();
       } else {
-        return pushFromIndex_ == null ?
-            com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex.getDefaultInstance() : pushFromIndex_;
+        return java.util.Collections.unmodifiableList(pushFromIndex_);
       }
     }
     /**
-     * <code>.PushFromIndex push_from_index = 10;</code>
+     * <code>repeated .PushFromIndex push_from_index = 10;</code>
+     */
+    public com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex.Builder addPushFromIndexBuilder() {
+      return getPushFromIndexFieldBuilder().addBuilder(
+          com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex.getDefaultInstance());
+    }
+    /**
+     * <code>repeated .PushFromIndex push_from_index = 10;</code>
+     */
+    public com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex.Builder addPushFromIndexBuilder(
+        int index) {
+      return getPushFromIndexFieldBuilder().addBuilder(
+          index, com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex.getDefaultInstance());
+    }
+    /**
+     * <code>repeated .PushFromIndex push_from_index = 10;</code>
      */
-    private com.google.protobuf.SingleFieldBuilderV3<
+    public java.util.List<com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex.Builder> 
+         getPushFromIndexBuilderList() {
+      return getPushFromIndexFieldBuilder().getBuilderList();
+    }
+    private com.google.protobuf.RepeatedFieldBuilderV3<
         com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex, com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex.Builder, com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndexOrBuilder> 
         getPushFromIndexFieldBuilder() {
       if (pushFromIndexBuilder_ == null) {
-        pushFromIndexBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+        pushFromIndexBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
             com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex, com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex.Builder, com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndexOrBuilder>(
-                getPushFromIndex(),
+                pushFromIndex_,
+                ((bitField0_ & 0x00000001) != 0),
                 getParentForChildren(),
                 isClean());
         pushFromIndex_ = null;

+ 17 - 8
recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/recommend/VideoProtoOrBuilder.java

@@ -80,17 +80,26 @@ public interface VideoProtoOrBuilder extends
   double getRand();
 
   /**
-   * <code>.PushFromIndex push_from_index = 10;</code>
-   * @return Whether the pushFromIndex field is set.
+   * <code>repeated .PushFromIndex push_from_index = 10;</code>
    */
-  boolean hasPushFromIndex();
+  java.util.List<com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex> 
+      getPushFromIndexList();
   /**
-   * <code>.PushFromIndex push_from_index = 10;</code>
-   * @return The pushFromIndex.
+   * <code>repeated .PushFromIndex push_from_index = 10;</code>
    */
-  com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex getPushFromIndex();
+  com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndex getPushFromIndex(int index);
   /**
-   * <code>.PushFromIndex push_from_index = 10;</code>
+   * <code>repeated .PushFromIndex push_from_index = 10;</code>
    */
-  com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndexOrBuilder getPushFromIndexOrBuilder();
+  int getPushFromIndexCount();
+  /**
+   * <code>repeated .PushFromIndex push_from_index = 10;</code>
+   */
+  java.util.List<? extends com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndexOrBuilder> 
+      getPushFromIndexOrBuilderList();
+  /**
+   * <code>repeated .PushFromIndex push_from_index = 10;</code>
+   */
+  com.tzld.piaoquan.recommend.server.gen.recommend.PushFromIndexOrBuilder getPushFromIndexOrBuilder(
+      int index);
 }

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

@@ -63,12 +63,12 @@ message VideoProto{
   string flow_pool = 7;
   int32 is_in_flow_pool = 8;
   double rand = 9;
-  PushFromIndex push_from_index = 10;
+  repeated PushFromIndex push_from_index = 10;
 }
 
 message PushFromIndex {
   string push_from = 1;
-  string index = 2;
+  repeated string index = 2;
 }
 
 service RecommendService {

+ 1 - 1
recommend-server-service/pom.xml

@@ -153,7 +153,7 @@
         <dependency>
             <groupId>com.tzld.piaoquan</groupId>
             <artifactId>recommend-server-client</artifactId>
-            <version>1.1.2</version>
+            <version>1.1.3</version>
         </dependency>
         <dependency>
             <groupId>com.tzld.piaoquan</groupId>