Ver Fonte

feat:添加获取首页tab的接口

zhaohaipeng há 2 semanas atrás
pai
commit
eb316cdba5
17 ficheiros alterados com 432 adições e 214 exclusões
  1. 4 0
      recommend-server-client/pom.xml
  2. 15 2
      recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/common/Common.java
  3. 50 42
      recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/common/TabProto.java
  4. 2 2
      recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/common/TabProtoOrBuilder.java
  5. 23 22
      recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/recommend/Recommend.java
  6. 188 0
      recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/recommend/RecommendRequest.java
  7. 15 0
      recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/recommend/RecommendRequestOrBuilder.java
  8. 3 16
      recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/tab/Tab.java
  9. 41 41
      recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/tab/TabRequest.java
  10. 1 1
      recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/tab/TabRequestOrBuilder.java
  11. 70 70
      recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/tab/TabResponse.java
  12. 5 5
      recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/tab/TabResponseOrBuilder.java
  13. 8 0
      recommend-server-client/src/main/proto/com/tzld/piaoquan/recommend/server/common.proto
  14. 1 0
      recommend-server-client/src/main/proto/com/tzld/piaoquan/recommend/server/recommend.proto
  15. 1 8
      recommend-server-client/src/main/proto/com/tzld/piaoquan/recommend/server/tab.proto
  16. 3 3
      recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/tab/TabService.java
  17. 2 2
      recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/web/TabController.java

+ 4 - 0
recommend-server-client/pom.xml

@@ -12,6 +12,10 @@
     <artifactId>recommend-server-client</artifactId>
     <version>1.1.14</version>
 
+    <!-- <properties> -->
+    <!--     <os.detected.classifier>osx-x86_64</os.detected.classifier> -->
+    <!-- </properties> -->
+
     <dependencies>
         <dependency>
             <groupId>net.devh</groupId>

+ 15 - 2
recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/common/Common.java

@@ -19,6 +19,11 @@ public final class Common {
   static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_Result_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_TabProto_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_TabProto_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -30,8 +35,10 @@ public final class Common {
     java.lang.String[] descriptorData = {
       "\n/com/tzld/piaoquan/recommend/server/com" +
       "mon.proto\"\'\n\006Result\022\014\n\004code\030\001 \001(\005\022\017\n\007mes" +
-      "sage\030\002 \001(\tB1\n-com.tzld.piaoquan.recommen" +
-      "d.server.gen.commonP\001b\006proto3"
+      "sage\030\002 \001(\t\"D\n\010TabProto\022\013\n\003key\030\001 \001(\t\022\r\n\005t" +
+      "itle\030\002 \001(\t\022\014\n\004type\030\003 \001(\t\022\016\n\006source\030\004 \001(\t" +
+      "B1\n-com.tzld.piaoquan.recommend.server.g" +
+      "en.commonP\001b\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -43,6 +50,12 @@ public final class Common {
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_Result_descriptor,
         new java.lang.String[] { "Code", "Message", });
+    internal_static_TabProto_descriptor =
+      getDescriptor().getMessageTypes().get(1);
+    internal_static_TabProto_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_TabProto_descriptor,
+        new java.lang.String[] { "Key", "Title", "Type", "Source", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

+ 50 - 42
recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/recommend/TabProto.java → recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/common/TabProto.java

@@ -1,9 +1,13 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: com/tzld/piaoquan/recommend/server/tab.proto
+// source: com/tzld/piaoquan/recommend/server/common.proto
 
-package com.tzld.piaoquan.recommend.server.gen.recommend;
+package com.tzld.piaoquan.recommend.server.gen.common;
 
 /**
+ * <pre>
+ * Tab标签信息
+ * </pre>
+ *
  * Protobuf type {@code TabProto}
  */
 public final class TabProto extends
@@ -97,15 +101,15 @@ private static final long serialVersionUID = 0L;
   }
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return com.tzld.piaoquan.recommend.server.gen.recommend.Tab.internal_static_TabProto_descriptor;
+    return com.tzld.piaoquan.recommend.server.gen.common.Common.internal_static_TabProto_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.tzld.piaoquan.recommend.server.gen.recommend.Tab.internal_static_TabProto_fieldAccessorTable
+    return com.tzld.piaoquan.recommend.server.gen.common.Common.internal_static_TabProto_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.tzld.piaoquan.recommend.server.gen.recommend.TabProto.class, com.tzld.piaoquan.recommend.server.gen.recommend.TabProto.Builder.class);
+            com.tzld.piaoquan.recommend.server.gen.common.TabProto.class, com.tzld.piaoquan.recommend.server.gen.common.TabProto.Builder.class);
   }
 
   public static final int KEY_FIELD_NUMBER = 1;
@@ -317,10 +321,10 @@ private static final long serialVersionUID = 0L;
     if (obj == this) {
      return true;
     }
-    if (!(obj instanceof com.tzld.piaoquan.recommend.server.gen.recommend.TabProto)) {
+    if (!(obj instanceof com.tzld.piaoquan.recommend.server.gen.common.TabProto)) {
       return super.equals(obj);
     }
-    com.tzld.piaoquan.recommend.server.gen.recommend.TabProto other = (com.tzld.piaoquan.recommend.server.gen.recommend.TabProto) obj;
+    com.tzld.piaoquan.recommend.server.gen.common.TabProto other = (com.tzld.piaoquan.recommend.server.gen.common.TabProto) obj;
 
     if (!getKey()
         .equals(other.getKey())) return false;
@@ -354,69 +358,69 @@ private static final long serialVersionUID = 0L;
     return hash;
   }
 
-  public static com.tzld.piaoquan.recommend.server.gen.recommend.TabProto parseFrom(
+  public static com.tzld.piaoquan.recommend.server.gen.common.TabProto parseFrom(
       java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.tzld.piaoquan.recommend.server.gen.recommend.TabProto parseFrom(
+  public static com.tzld.piaoquan.recommend.server.gen.common.TabProto 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.TabProto parseFrom(
+  public static com.tzld.piaoquan.recommend.server.gen.common.TabProto parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.tzld.piaoquan.recommend.server.gen.recommend.TabProto parseFrom(
+  public static com.tzld.piaoquan.recommend.server.gen.common.TabProto 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.TabProto parseFrom(byte[] data)
+  public static com.tzld.piaoquan.recommend.server.gen.common.TabProto parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.tzld.piaoquan.recommend.server.gen.recommend.TabProto parseFrom(
+  public static com.tzld.piaoquan.recommend.server.gen.common.TabProto 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.TabProto parseFrom(java.io.InputStream input)
+  public static com.tzld.piaoquan.recommend.server.gen.common.TabProto 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.TabProto parseFrom(
+  public static com.tzld.piaoquan.recommend.server.gen.common.TabProto 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.TabProto parseDelimitedFrom(java.io.InputStream input)
+  public static com.tzld.piaoquan.recommend.server.gen.common.TabProto 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.TabProto parseDelimitedFrom(
+  public static com.tzld.piaoquan.recommend.server.gen.common.TabProto 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.TabProto parseFrom(
+  public static com.tzld.piaoquan.recommend.server.gen.common.TabProto 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.TabProto parseFrom(
+  public static com.tzld.piaoquan.recommend.server.gen.common.TabProto parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -429,7 +433,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.TabProto prototype) {
+  public static Builder newBuilder(com.tzld.piaoquan.recommend.server.gen.common.TabProto prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
   @java.lang.Override
@@ -445,26 +449,30 @@ private static final long serialVersionUID = 0L;
     return builder;
   }
   /**
+   * <pre>
+   * Tab标签信息
+   * </pre>
+   *
    * Protobuf type {@code TabProto}
    */
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
       // @@protoc_insertion_point(builder_implements:TabProto)
-      com.tzld.piaoquan.recommend.server.gen.recommend.TabProtoOrBuilder {
+      com.tzld.piaoquan.recommend.server.gen.common.TabProtoOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.tzld.piaoquan.recommend.server.gen.recommend.Tab.internal_static_TabProto_descriptor;
+      return com.tzld.piaoquan.recommend.server.gen.common.Common.internal_static_TabProto_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.tzld.piaoquan.recommend.server.gen.recommend.Tab.internal_static_TabProto_fieldAccessorTable
+      return com.tzld.piaoquan.recommend.server.gen.common.Common.internal_static_TabProto_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.tzld.piaoquan.recommend.server.gen.recommend.TabProto.class, com.tzld.piaoquan.recommend.server.gen.recommend.TabProto.Builder.class);
+              com.tzld.piaoquan.recommend.server.gen.common.TabProto.class, com.tzld.piaoquan.recommend.server.gen.common.TabProto.Builder.class);
     }
 
-    // Construct using com.tzld.piaoquan.recommend.server.gen.recommend.TabProto.newBuilder()
+    // Construct using com.tzld.piaoquan.recommend.server.gen.common.TabProto.newBuilder()
     private Builder() {
       maybeForceBuilderInitialization();
     }
@@ -496,17 +504,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.Tab.internal_static_TabProto_descriptor;
+      return com.tzld.piaoquan.recommend.server.gen.common.Common.internal_static_TabProto_descriptor;
     }
 
     @java.lang.Override
-    public com.tzld.piaoquan.recommend.server.gen.recommend.TabProto getDefaultInstanceForType() {
-      return com.tzld.piaoquan.recommend.server.gen.recommend.TabProto.getDefaultInstance();
+    public com.tzld.piaoquan.recommend.server.gen.common.TabProto getDefaultInstanceForType() {
+      return com.tzld.piaoquan.recommend.server.gen.common.TabProto.getDefaultInstance();
     }
 
     @java.lang.Override
-    public com.tzld.piaoquan.recommend.server.gen.recommend.TabProto build() {
-      com.tzld.piaoquan.recommend.server.gen.recommend.TabProto result = buildPartial();
+    public com.tzld.piaoquan.recommend.server.gen.common.TabProto build() {
+      com.tzld.piaoquan.recommend.server.gen.common.TabProto result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
@@ -514,8 +522,8 @@ private static final long serialVersionUID = 0L;
     }
 
     @java.lang.Override
-    public com.tzld.piaoquan.recommend.server.gen.recommend.TabProto buildPartial() {
-      com.tzld.piaoquan.recommend.server.gen.recommend.TabProto result = new com.tzld.piaoquan.recommend.server.gen.recommend.TabProto(this);
+    public com.tzld.piaoquan.recommend.server.gen.common.TabProto buildPartial() {
+      com.tzld.piaoquan.recommend.server.gen.common.TabProto result = new com.tzld.piaoquan.recommend.server.gen.common.TabProto(this);
       result.key_ = key_;
       result.title_ = title_;
       result.type_ = type_;
@@ -558,16 +566,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.TabProto) {
-        return mergeFrom((com.tzld.piaoquan.recommend.server.gen.recommend.TabProto)other);
+      if (other instanceof com.tzld.piaoquan.recommend.server.gen.common.TabProto) {
+        return mergeFrom((com.tzld.piaoquan.recommend.server.gen.common.TabProto)other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(com.tzld.piaoquan.recommend.server.gen.recommend.TabProto other) {
-      if (other == com.tzld.piaoquan.recommend.server.gen.recommend.TabProto.getDefaultInstance()) return this;
+    public Builder mergeFrom(com.tzld.piaoquan.recommend.server.gen.common.TabProto other) {
+      if (other == com.tzld.piaoquan.recommend.server.gen.common.TabProto.getDefaultInstance()) return this;
       if (!other.getKey().isEmpty()) {
         key_ = other.key_;
         onChanged();
@@ -599,11 +607,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.TabProto parsedMessage = null;
+      com.tzld.piaoquan.recommend.server.gen.common.TabProto parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.tzld.piaoquan.recommend.server.gen.recommend.TabProto) e.getUnfinishedMessage();
+        parsedMessage = (com.tzld.piaoquan.recommend.server.gen.common.TabProto) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -933,12 +941,12 @@ private static final long serialVersionUID = 0L;
   }
 
   // @@protoc_insertion_point(class_scope:TabProto)
-  private static final com.tzld.piaoquan.recommend.server.gen.recommend.TabProto DEFAULT_INSTANCE;
+  private static final com.tzld.piaoquan.recommend.server.gen.common.TabProto DEFAULT_INSTANCE;
   static {
-    DEFAULT_INSTANCE = new com.tzld.piaoquan.recommend.server.gen.recommend.TabProto();
+    DEFAULT_INSTANCE = new com.tzld.piaoquan.recommend.server.gen.common.TabProto();
   }
 
-  public static com.tzld.piaoquan.recommend.server.gen.recommend.TabProto getDefaultInstance() {
+  public static com.tzld.piaoquan.recommend.server.gen.common.TabProto getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
@@ -963,7 +971,7 @@ private static final long serialVersionUID = 0L;
   }
 
   @java.lang.Override
-  public com.tzld.piaoquan.recommend.server.gen.recommend.TabProto getDefaultInstanceForType() {
+  public com.tzld.piaoquan.recommend.server.gen.common.TabProto getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 

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

@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: com/tzld/piaoquan/recommend/server/tab.proto
+// source: com/tzld/piaoquan/recommend/server/common.proto
 
-package com.tzld.piaoquan.recommend.server.gen.recommend;
+package com.tzld.piaoquan.recommend.server.gen.common;
 
 public interface TabProtoOrBuilder extends
     // @@protoc_insertion_point(interface_extends:TabProto)

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

@@ -61,7 +61,7 @@ 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\"\241\006\n\020RecommendRequest\022\022\n\nrequest" +
+      "on.proto\"\271\006\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\021\n\tcity_code" +
       "\030\006 \001(\t\022\025\n\rprovince_code\030\007 \001(\t\022\023\n\013ab_exp_" +
@@ -80,26 +80,27 @@ public final class Recommend {
       "_list\030\034 \003(\0132\025.VideoActionInfoProto\022\030\n\020re" +
       "quest_video_id\030\035 \001(\003\022\033\n\023current_page_sou" +
       "rce\030\036 \001(\t\022\017\n\007openGId\030\037 \001(\t\022\020\n\010union_id\030 " +
-      " \001(\t\032.\n\014EventIdEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005val" +
-      "ue\030\002 \001(\t:\0028\001\"\177\n\020MachineInfoProto\022\r\n\005bran" +
-      "d\030\001 \001(\t\022\r\n\005model\030\002 \001(\t\022\020\n\010platform\030\003 \001(\t" +
-      "\022\023\n\013sdk_version\030\004 \001(\t\022\016\n\006system\030\005 \001(\t\022\026\n" +
-      "\016wechat_version\030\006 \001(\t\"H\n\021RecommendRespon" +
-      "se\022\027\n\006result\030\001 \001(\0132\007.Result\022\032\n\005video\030\002 \003" +
-      "(\0132\013.VideoProto\"\336\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(\001\022" +
-      "\'\n\017push_from_index\030\n \003(\0132\016.PushFromIndex" +
-      "\"1\n\rPushFromIndex\022\021\n\tpush_from\030\001 \001(\t\022\r\n\005" +
-      "index\030\002 \003(\t\"4\n\024VideoActionInfoProto\022\020\n\010v" +
-      "ideo_id\030\001 \001(\003\022\n\n\002ts\030\002 \001(\0032\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"
+      " \001(\t\022\026\n\003tab\030! \001(\0132\t.TabProto\032.\n\014EventIdE" +
+      "ntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\177\n\020" +
+      "MachineInfoProto\022\r\n\005brand\030\001 \001(\t\022\r\n\005model" +
+      "\030\002 \001(\t\022\020\n\010platform\030\003 \001(\t\022\023\n\013sdk_version\030" +
+      "\004 \001(\t\022\016\n\006system\030\005 \001(\t\022\026\n\016wechat_version\030" +
+      "\006 \001(\t\"H\n\021RecommendResponse\022\027\n\006result\030\001 \001" +
+      "(\0132\007.Result\022\032\n\005video\030\002 \003(\0132\013.VideoProto\"" +
+      "\336\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_cod" +
+      "e\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_p" +
+      "ool\030\010 \001(\005\022\014\n\004rand\030\t \001(\001\022\'\n\017push_from_ind" +
+      "ex\030\n \003(\0132\016.PushFromIndex\"1\n\rPushFromInde" +
+      "x\022\021\n\tpush_from\030\001 \001(\t\022\r\n\005index\030\002 \003(\t\"4\n\024V" +
+      "ideoActionInfoProto\022\020\n\010video_id\030\001 \001(\003\022\n\n" +
+      "\002ts\030\002 \001(\0032\212\001\n\020RecommendService\022:\n\021Homepa" +
+      "geRecommend\022\021.RecommendRequest\032\022.Recomme" +
+      "ndResponse\022:\n\021RelevantRecommend\022\021.Recomm" +
+      "endRequest\032\022.RecommendResponseB7\n0com.tz" +
+      "ld.piaoquan.recommend.server.gen.recomme" +
+      "ndP\001\210\001\001b\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -112,7 +113,7 @@ public final class Recommend {
     internal_static_RecommendRequest_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_RecommendRequest_descriptor,
-        new java.lang.String[] { "RequestId", "Mid", "Uid", "Size", "AppType", "CityCode", "ProvinceCode", "AbExpCode", "EventId", "VersionAuditStatus", "RecommendTraceId", "VideoId", "City", "Province", "MachineInfo", "NewExpGroup", "SessionId", "SubSessionId", "PageSource", "CategoryId", "HotSceneType", "ClientIp", "VersionCode", "RootSourceId", "UserShareDepth", "PageNum", "RootSessionId", "ShareList", "RequestVideoId", "CurrentPageSource", "OpenGId", "UnionId", });
+        new java.lang.String[] { "RequestId", "Mid", "Uid", "Size", "AppType", "CityCode", "ProvinceCode", "AbExpCode", "EventId", "VersionAuditStatus", "RecommendTraceId", "VideoId", "City", "Province", "MachineInfo", "NewExpGroup", "SessionId", "SubSessionId", "PageSource", "CategoryId", "HotSceneType", "ClientIp", "VersionCode", "RootSourceId", "UserShareDepth", "PageNum", "RootSessionId", "ShareList", "RequestVideoId", "CurrentPageSource", "OpenGId", "UnionId", "Tab", });
     internal_static_RecommendRequest_EventIdEntry_descriptor =
       internal_static_RecommendRequest_descriptor.getNestedTypes().get(0);
     internal_static_RecommendRequest_EventIdEntry_fieldAccessorTable = new

+ 188 - 0
recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/recommend/RecommendRequest.java

@@ -273,6 +273,19 @@ private static final long serialVersionUID = 0L;
             unionId_ = s;
             break;
           }
+          case 266: {
+            com.tzld.piaoquan.recommend.server.gen.common.TabProto.Builder subBuilder = null;
+            if (tab_ != null) {
+              subBuilder = tab_.toBuilder();
+            }
+            tab_ = input.readMessage(com.tzld.piaoquan.recommend.server.gen.common.TabProto.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(tab_);
+              tab_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
           default: {
             if (!parseUnknownField(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -1342,6 +1355,32 @@ private static final long serialVersionUID = 0L;
     }
   }
 
+  public static final int TAB_FIELD_NUMBER = 33;
+  private com.tzld.piaoquan.recommend.server.gen.common.TabProto tab_;
+  /**
+   * <code>.TabProto tab = 33;</code>
+   * @return Whether the tab field is set.
+   */
+  @java.lang.Override
+  public boolean hasTab() {
+    return tab_ != null;
+  }
+  /**
+   * <code>.TabProto tab = 33;</code>
+   * @return The tab.
+   */
+  @java.lang.Override
+  public com.tzld.piaoquan.recommend.server.gen.common.TabProto getTab() {
+    return tab_ == null ? com.tzld.piaoquan.recommend.server.gen.common.TabProto.getDefaultInstance() : tab_;
+  }
+  /**
+   * <code>.TabProto tab = 33;</code>
+   */
+  @java.lang.Override
+  public com.tzld.piaoquan.recommend.server.gen.common.TabProtoOrBuilder getTabOrBuilder() {
+    return getTab();
+  }
+
   private byte memoizedIsInitialized = -1;
   @java.lang.Override
   public final boolean isInitialized() {
@@ -1455,6 +1494,9 @@ private static final long serialVersionUID = 0L;
     if (!getUnionIdBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 32, unionId_);
     }
+    if (tab_ != null) {
+      output.writeMessage(33, getTab());
+    }
     unknownFields.writeTo(output);
   }
 
@@ -1583,6 +1625,10 @@ private static final long serialVersionUID = 0L;
     if (!getUnionIdBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(32, unionId_);
     }
+    if (tab_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(33, getTab());
+    }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
@@ -1665,6 +1711,11 @@ private static final long serialVersionUID = 0L;
         .equals(other.getOpenGId())) return false;
     if (!getUnionId()
         .equals(other.getUnionId())) return false;
+    if (hasTab() != other.hasTab()) return false;
+    if (hasTab()) {
+      if (!getTab()
+          .equals(other.getTab())) return false;
+    }
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
@@ -1751,6 +1802,10 @@ private static final long serialVersionUID = 0L;
     hash = (53 * hash) + getOpenGId().hashCode();
     hash = (37 * hash) + UNION_ID_FIELD_NUMBER;
     hash = (53 * hash) + getUnionId().hashCode();
+    if (hasTab()) {
+      hash = (37 * hash) + TAB_FIELD_NUMBER;
+      hash = (53 * hash) + getTab().hashCode();
+    }
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -1978,6 +2033,12 @@ private static final long serialVersionUID = 0L;
 
       unionId_ = "";
 
+      if (tabBuilder_ == null) {
+        tab_ = null;
+      } else {
+        tab_ = null;
+        tabBuilder_ = null;
+      }
       return this;
     }
 
@@ -2054,6 +2115,11 @@ private static final long serialVersionUID = 0L;
       result.currentPageSource_ = currentPageSource_;
       result.openGId_ = openGId_;
       result.unionId_ = unionId_;
+      if (tabBuilder_ == null) {
+        result.tab_ = tab_;
+      } else {
+        result.tab_ = tabBuilder_.build();
+      }
       onBuilt();
       return result;
     }
@@ -2246,6 +2312,9 @@ private static final long serialVersionUID = 0L;
         unionId_ = other.unionId_;
         onChanged();
       }
+      if (other.hasTab()) {
+        mergeTab(other.getTab());
+      }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
@@ -4643,6 +4712,125 @@ private static final long serialVersionUID = 0L;
       onChanged();
       return this;
     }
+
+    private com.tzld.piaoquan.recommend.server.gen.common.TabProto tab_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.tzld.piaoquan.recommend.server.gen.common.TabProto, com.tzld.piaoquan.recommend.server.gen.common.TabProto.Builder, com.tzld.piaoquan.recommend.server.gen.common.TabProtoOrBuilder> tabBuilder_;
+    /**
+     * <code>.TabProto tab = 33;</code>
+     * @return Whether the tab field is set.
+     */
+    public boolean hasTab() {
+      return tabBuilder_ != null || tab_ != null;
+    }
+    /**
+     * <code>.TabProto tab = 33;</code>
+     * @return The tab.
+     */
+    public com.tzld.piaoquan.recommend.server.gen.common.TabProto getTab() {
+      if (tabBuilder_ == null) {
+        return tab_ == null ? com.tzld.piaoquan.recommend.server.gen.common.TabProto.getDefaultInstance() : tab_;
+      } else {
+        return tabBuilder_.getMessage();
+      }
+    }
+    /**
+     * <code>.TabProto tab = 33;</code>
+     */
+    public Builder setTab(com.tzld.piaoquan.recommend.server.gen.common.TabProto value) {
+      if (tabBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        tab_ = value;
+        onChanged();
+      } else {
+        tabBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * <code>.TabProto tab = 33;</code>
+     */
+    public Builder setTab(
+        com.tzld.piaoquan.recommend.server.gen.common.TabProto.Builder builderForValue) {
+      if (tabBuilder_ == null) {
+        tab_ = builderForValue.build();
+        onChanged();
+      } else {
+        tabBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * <code>.TabProto tab = 33;</code>
+     */
+    public Builder mergeTab(com.tzld.piaoquan.recommend.server.gen.common.TabProto value) {
+      if (tabBuilder_ == null) {
+        if (tab_ != null) {
+          tab_ =
+            com.tzld.piaoquan.recommend.server.gen.common.TabProto.newBuilder(tab_).mergeFrom(value).buildPartial();
+        } else {
+          tab_ = value;
+        }
+        onChanged();
+      } else {
+        tabBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * <code>.TabProto tab = 33;</code>
+     */
+    public Builder clearTab() {
+      if (tabBuilder_ == null) {
+        tab_ = null;
+        onChanged();
+      } else {
+        tab_ = null;
+        tabBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * <code>.TabProto tab = 33;</code>
+     */
+    public com.tzld.piaoquan.recommend.server.gen.common.TabProto.Builder getTabBuilder() {
+      
+      onChanged();
+      return getTabFieldBuilder().getBuilder();
+    }
+    /**
+     * <code>.TabProto tab = 33;</code>
+     */
+    public com.tzld.piaoquan.recommend.server.gen.common.TabProtoOrBuilder getTabOrBuilder() {
+      if (tabBuilder_ != null) {
+        return tabBuilder_.getMessageOrBuilder();
+      } else {
+        return tab_ == null ?
+            com.tzld.piaoquan.recommend.server.gen.common.TabProto.getDefaultInstance() : tab_;
+      }
+    }
+    /**
+     * <code>.TabProto tab = 33;</code>
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.tzld.piaoquan.recommend.server.gen.common.TabProto, com.tzld.piaoquan.recommend.server.gen.common.TabProto.Builder, com.tzld.piaoquan.recommend.server.gen.common.TabProtoOrBuilder> 
+        getTabFieldBuilder() {
+      if (tabBuilder_ == null) {
+        tabBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.tzld.piaoquan.recommend.server.gen.common.TabProto, com.tzld.piaoquan.recommend.server.gen.common.TabProto.Builder, com.tzld.piaoquan.recommend.server.gen.common.TabProtoOrBuilder>(
+                getTab(),
+                getParentForChildren(),
+                isClean());
+        tab_ = null;
+      }
+      return tabBuilder_;
+    }
     @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {

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

@@ -402,4 +402,19 @@ public interface RecommendRequestOrBuilder extends
    */
   com.google.protobuf.ByteString
       getUnionIdBytes();
+
+  /**
+   * <code>.TabProto tab = 33;</code>
+   * @return Whether the tab field is set.
+   */
+  boolean hasTab();
+  /**
+   * <code>.TabProto tab = 33;</code>
+   * @return The tab.
+   */
+  com.tzld.piaoquan.recommend.server.gen.common.TabProto getTab();
+  /**
+   * <code>.TabProto tab = 33;</code>
+   */
+  com.tzld.piaoquan.recommend.server.gen.common.TabProtoOrBuilder getTabOrBuilder();
 }

+ 3 - 16
recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/recommend/Tab.java → recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/tab/Tab.java

@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: com/tzld/piaoquan/recommend/server/tab.proto
 
-package com.tzld.piaoquan.recommend.server.gen.recommend;
+package com.tzld.piaoquan.recommend.server.gen.tab;
 
 public final class Tab {
   private Tab() {}
@@ -24,11 +24,6 @@ public final class Tab {
   static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_TabResponse_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_TabProto_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_TabProto_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -48,10 +43,8 @@ public final class Tab {
       "rovince\030\t \001(\t\022\023\n\013ab_exp_code\030\n \003(\t\022\027\n\017ro" +
       "ot_session_id\030\013 \001(\t\">\n\013TabResponse\022\027\n\006re" +
       "sult\030\001 \001(\0132\007.Result\022\026\n\003tab\030\002 \003(\0132\t.TabPr" +
-      "oto\"D\n\010TabProto\022\013\n\003key\030\001 \001(\t\022\r\n\005title\030\002 " +
-      "\001(\t\022\014\n\004type\030\003 \001(\t\022\016\n\006source\030\004 \001(\tB7\n0com" +
-      ".tzld.piaoquan.recommend.server.gen.reco" +
-      "mmendP\001\210\001\001b\006proto3"
+      "otoB1\n*com.tzld.piaoquan.recommend.serve" +
+      "r.gen.tabP\001\210\001\001b\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -71,12 +64,6 @@ public final class Tab {
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_TabResponse_descriptor,
         new java.lang.String[] { "Result", "Tab", });
-    internal_static_TabProto_descriptor =
-      getDescriptor().getMessageTypes().get(2);
-    internal_static_TabProto_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_TabProto_descriptor,
-        new java.lang.String[] { "Key", "Title", "Type", "Source", });
     com.google.protobuf.AnyProto.getDescriptor();
     com.tzld.piaoquan.recommend.server.gen.common.Common.getDescriptor();
   }

+ 41 - 41
recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/recommend/TabRequest.java → recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/tab/TabRequest.java

@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: com/tzld/piaoquan/recommend/server/tab.proto
 
-package com.tzld.piaoquan.recommend.server.gen.recommend;
+package com.tzld.piaoquan.recommend.server.gen.tab;
 
 /**
  * Protobuf type {@code TabRequest}
@@ -151,15 +151,15 @@ private static final long serialVersionUID = 0L;
   }
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return com.tzld.piaoquan.recommend.server.gen.recommend.Tab.internal_static_TabRequest_descriptor;
+    return com.tzld.piaoquan.recommend.server.gen.tab.Tab.internal_static_TabRequest_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.tzld.piaoquan.recommend.server.gen.recommend.Tab.internal_static_TabRequest_fieldAccessorTable
+    return com.tzld.piaoquan.recommend.server.gen.tab.Tab.internal_static_TabRequest_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.tzld.piaoquan.recommend.server.gen.recommend.TabRequest.class, com.tzld.piaoquan.recommend.server.gen.recommend.TabRequest.Builder.class);
+            com.tzld.piaoquan.recommend.server.gen.tab.TabRequest.class, com.tzld.piaoquan.recommend.server.gen.tab.TabRequest.Builder.class);
   }
 
   public static final int REQUEST_ID_FIELD_NUMBER = 1;
@@ -659,10 +659,10 @@ private static final long serialVersionUID = 0L;
     if (obj == this) {
      return true;
     }
-    if (!(obj instanceof com.tzld.piaoquan.recommend.server.gen.recommend.TabRequest)) {
+    if (!(obj instanceof com.tzld.piaoquan.recommend.server.gen.tab.TabRequest)) {
       return super.equals(obj);
     }
-    com.tzld.piaoquan.recommend.server.gen.recommend.TabRequest other = (com.tzld.piaoquan.recommend.server.gen.recommend.TabRequest) obj;
+    com.tzld.piaoquan.recommend.server.gen.tab.TabRequest other = (com.tzld.piaoquan.recommend.server.gen.tab.TabRequest) obj;
 
     if (!getRequestId()
         .equals(other.getRequestId())) return false;
@@ -726,69 +726,69 @@ private static final long serialVersionUID = 0L;
     return hash;
   }
 
-  public static com.tzld.piaoquan.recommend.server.gen.recommend.TabRequest parseFrom(
+  public static com.tzld.piaoquan.recommend.server.gen.tab.TabRequest parseFrom(
       java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.tzld.piaoquan.recommend.server.gen.recommend.TabRequest parseFrom(
+  public static com.tzld.piaoquan.recommend.server.gen.tab.TabRequest 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.TabRequest parseFrom(
+  public static com.tzld.piaoquan.recommend.server.gen.tab.TabRequest parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.tzld.piaoquan.recommend.server.gen.recommend.TabRequest parseFrom(
+  public static com.tzld.piaoquan.recommend.server.gen.tab.TabRequest 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.TabRequest parseFrom(byte[] data)
+  public static com.tzld.piaoquan.recommend.server.gen.tab.TabRequest parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.tzld.piaoquan.recommend.server.gen.recommend.TabRequest parseFrom(
+  public static com.tzld.piaoquan.recommend.server.gen.tab.TabRequest 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.TabRequest parseFrom(java.io.InputStream input)
+  public static com.tzld.piaoquan.recommend.server.gen.tab.TabRequest 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.TabRequest parseFrom(
+  public static com.tzld.piaoquan.recommend.server.gen.tab.TabRequest 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.TabRequest parseDelimitedFrom(java.io.InputStream input)
+  public static com.tzld.piaoquan.recommend.server.gen.tab.TabRequest 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.TabRequest parseDelimitedFrom(
+  public static com.tzld.piaoquan.recommend.server.gen.tab.TabRequest 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.TabRequest parseFrom(
+  public static com.tzld.piaoquan.recommend.server.gen.tab.TabRequest 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.TabRequest parseFrom(
+  public static com.tzld.piaoquan.recommend.server.gen.tab.TabRequest parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -801,7 +801,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.TabRequest prototype) {
+  public static Builder newBuilder(com.tzld.piaoquan.recommend.server.gen.tab.TabRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
   @java.lang.Override
@@ -822,21 +822,21 @@ private static final long serialVersionUID = 0L;
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
       // @@protoc_insertion_point(builder_implements:TabRequest)
-      com.tzld.piaoquan.recommend.server.gen.recommend.TabRequestOrBuilder {
+      com.tzld.piaoquan.recommend.server.gen.tab.TabRequestOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.tzld.piaoquan.recommend.server.gen.recommend.Tab.internal_static_TabRequest_descriptor;
+      return com.tzld.piaoquan.recommend.server.gen.tab.Tab.internal_static_TabRequest_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.tzld.piaoquan.recommend.server.gen.recommend.Tab.internal_static_TabRequest_fieldAccessorTable
+      return com.tzld.piaoquan.recommend.server.gen.tab.Tab.internal_static_TabRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.tzld.piaoquan.recommend.server.gen.recommend.TabRequest.class, com.tzld.piaoquan.recommend.server.gen.recommend.TabRequest.Builder.class);
+              com.tzld.piaoquan.recommend.server.gen.tab.TabRequest.class, com.tzld.piaoquan.recommend.server.gen.tab.TabRequest.Builder.class);
     }
 
-    // Construct using com.tzld.piaoquan.recommend.server.gen.recommend.TabRequest.newBuilder()
+    // Construct using com.tzld.piaoquan.recommend.server.gen.tab.TabRequest.newBuilder()
     private Builder() {
       maybeForceBuilderInitialization();
     }
@@ -882,17 +882,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.Tab.internal_static_TabRequest_descriptor;
+      return com.tzld.piaoquan.recommend.server.gen.tab.Tab.internal_static_TabRequest_descriptor;
     }
 
     @java.lang.Override
-    public com.tzld.piaoquan.recommend.server.gen.recommend.TabRequest getDefaultInstanceForType() {
-      return com.tzld.piaoquan.recommend.server.gen.recommend.TabRequest.getDefaultInstance();
+    public com.tzld.piaoquan.recommend.server.gen.tab.TabRequest getDefaultInstanceForType() {
+      return com.tzld.piaoquan.recommend.server.gen.tab.TabRequest.getDefaultInstance();
     }
 
     @java.lang.Override
-    public com.tzld.piaoquan.recommend.server.gen.recommend.TabRequest build() {
-      com.tzld.piaoquan.recommend.server.gen.recommend.TabRequest result = buildPartial();
+    public com.tzld.piaoquan.recommend.server.gen.tab.TabRequest build() {
+      com.tzld.piaoquan.recommend.server.gen.tab.TabRequest result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
@@ -900,8 +900,8 @@ private static final long serialVersionUID = 0L;
     }
 
     @java.lang.Override
-    public com.tzld.piaoquan.recommend.server.gen.recommend.TabRequest buildPartial() {
-      com.tzld.piaoquan.recommend.server.gen.recommend.TabRequest result = new com.tzld.piaoquan.recommend.server.gen.recommend.TabRequest(this);
+    public com.tzld.piaoquan.recommend.server.gen.tab.TabRequest buildPartial() {
+      com.tzld.piaoquan.recommend.server.gen.tab.TabRequest result = new com.tzld.piaoquan.recommend.server.gen.tab.TabRequest(this);
       int from_bitField0_ = bitField0_;
       result.requestId_ = requestId_;
       result.mid_ = mid_;
@@ -956,16 +956,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.TabRequest) {
-        return mergeFrom((com.tzld.piaoquan.recommend.server.gen.recommend.TabRequest)other);
+      if (other instanceof com.tzld.piaoquan.recommend.server.gen.tab.TabRequest) {
+        return mergeFrom((com.tzld.piaoquan.recommend.server.gen.tab.TabRequest)other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(com.tzld.piaoquan.recommend.server.gen.recommend.TabRequest other) {
-      if (other == com.tzld.piaoquan.recommend.server.gen.recommend.TabRequest.getDefaultInstance()) return this;
+    public Builder mergeFrom(com.tzld.piaoquan.recommend.server.gen.tab.TabRequest other) {
+      if (other == com.tzld.piaoquan.recommend.server.gen.tab.TabRequest.getDefaultInstance()) return this;
       if (!other.getRequestId().isEmpty()) {
         requestId_ = other.requestId_;
         onChanged();
@@ -1030,11 +1030,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.TabRequest parsedMessage = null;
+      com.tzld.piaoquan.recommend.server.gen.tab.TabRequest parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.tzld.piaoquan.recommend.server.gen.recommend.TabRequest) e.getUnfinishedMessage();
+        parsedMessage = (com.tzld.piaoquan.recommend.server.gen.tab.TabRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -1898,12 +1898,12 @@ private static final long serialVersionUID = 0L;
   }
 
   // @@protoc_insertion_point(class_scope:TabRequest)
-  private static final com.tzld.piaoquan.recommend.server.gen.recommend.TabRequest DEFAULT_INSTANCE;
+  private static final com.tzld.piaoquan.recommend.server.gen.tab.TabRequest DEFAULT_INSTANCE;
   static {
-    DEFAULT_INSTANCE = new com.tzld.piaoquan.recommend.server.gen.recommend.TabRequest();
+    DEFAULT_INSTANCE = new com.tzld.piaoquan.recommend.server.gen.tab.TabRequest();
   }
 
-  public static com.tzld.piaoquan.recommend.server.gen.recommend.TabRequest getDefaultInstance() {
+  public static com.tzld.piaoquan.recommend.server.gen.tab.TabRequest getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
@@ -1928,7 +1928,7 @@ private static final long serialVersionUID = 0L;
   }
 
   @java.lang.Override
-  public com.tzld.piaoquan.recommend.server.gen.recommend.TabRequest getDefaultInstanceForType() {
+  public com.tzld.piaoquan.recommend.server.gen.tab.TabRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 

+ 1 - 1
recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/recommend/TabRequestOrBuilder.java → recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/tab/TabRequestOrBuilder.java

@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: com/tzld/piaoquan/recommend/server/tab.proto
 
-package com.tzld.piaoquan.recommend.server.gen.recommend;
+package com.tzld.piaoquan.recommend.server.gen.tab;
 
 public interface TabRequestOrBuilder extends
     // @@protoc_insertion_point(interface_extends:TabRequest)

+ 70 - 70
recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/recommend/TabResponse.java → recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/tab/TabResponse.java

@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: com/tzld/piaoquan/recommend/server/tab.proto
 
-package com.tzld.piaoquan.recommend.server.gen.recommend;
+package com.tzld.piaoquan.recommend.server.gen.tab;
 
 /**
  * Protobuf type {@code TabResponse}
@@ -65,11 +65,11 @@ private static final long serialVersionUID = 0L;
           }
           case 18: {
             if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-              tab_ = new java.util.ArrayList<com.tzld.piaoquan.recommend.server.gen.recommend.TabProto>();
+              tab_ = new java.util.ArrayList<com.tzld.piaoquan.recommend.server.gen.common.TabProto>();
               mutable_bitField0_ |= 0x00000001;
             }
             tab_.add(
-                input.readMessage(com.tzld.piaoquan.recommend.server.gen.recommend.TabProto.parser(), extensionRegistry));
+                input.readMessage(com.tzld.piaoquan.recommend.server.gen.common.TabProto.parser(), extensionRegistry));
             break;
           }
           default: {
@@ -96,15 +96,15 @@ private static final long serialVersionUID = 0L;
   }
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return com.tzld.piaoquan.recommend.server.gen.recommend.Tab.internal_static_TabResponse_descriptor;
+    return com.tzld.piaoquan.recommend.server.gen.tab.Tab.internal_static_TabResponse_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.tzld.piaoquan.recommend.server.gen.recommend.Tab.internal_static_TabResponse_fieldAccessorTable
+    return com.tzld.piaoquan.recommend.server.gen.tab.Tab.internal_static_TabResponse_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.tzld.piaoquan.recommend.server.gen.recommend.TabResponse.class, com.tzld.piaoquan.recommend.server.gen.recommend.TabResponse.Builder.class);
+            com.tzld.piaoquan.recommend.server.gen.tab.TabResponse.class, com.tzld.piaoquan.recommend.server.gen.tab.TabResponse.Builder.class);
   }
 
   public static final int RESULT_FIELD_NUMBER = 1;
@@ -134,19 +134,19 @@ private static final long serialVersionUID = 0L;
   }
 
   public static final int TAB_FIELD_NUMBER = 2;
-  private java.util.List<com.tzld.piaoquan.recommend.server.gen.recommend.TabProto> tab_;
+  private java.util.List<com.tzld.piaoquan.recommend.server.gen.common.TabProto> tab_;
   /**
    * <code>repeated .TabProto tab = 2;</code>
    */
   @java.lang.Override
-  public java.util.List<com.tzld.piaoquan.recommend.server.gen.recommend.TabProto> getTabList() {
+  public java.util.List<com.tzld.piaoquan.recommend.server.gen.common.TabProto> getTabList() {
     return tab_;
   }
   /**
    * <code>repeated .TabProto tab = 2;</code>
    */
   @java.lang.Override
-  public java.util.List<? extends com.tzld.piaoquan.recommend.server.gen.recommend.TabProtoOrBuilder> 
+  public java.util.List<? extends com.tzld.piaoquan.recommend.server.gen.common.TabProtoOrBuilder> 
       getTabOrBuilderList() {
     return tab_;
   }
@@ -161,14 +161,14 @@ private static final long serialVersionUID = 0L;
    * <code>repeated .TabProto tab = 2;</code>
    */
   @java.lang.Override
-  public com.tzld.piaoquan.recommend.server.gen.recommend.TabProto getTab(int index) {
+  public com.tzld.piaoquan.recommend.server.gen.common.TabProto getTab(int index) {
     return tab_.get(index);
   }
   /**
    * <code>repeated .TabProto tab = 2;</code>
    */
   @java.lang.Override
-  public com.tzld.piaoquan.recommend.server.gen.recommend.TabProtoOrBuilder getTabOrBuilder(
+  public com.tzld.piaoquan.recommend.server.gen.common.TabProtoOrBuilder getTabOrBuilder(
       int index) {
     return tab_.get(index);
   }
@@ -220,10 +220,10 @@ private static final long serialVersionUID = 0L;
     if (obj == this) {
      return true;
     }
-    if (!(obj instanceof com.tzld.piaoquan.recommend.server.gen.recommend.TabResponse)) {
+    if (!(obj instanceof com.tzld.piaoquan.recommend.server.gen.tab.TabResponse)) {
       return super.equals(obj);
     }
-    com.tzld.piaoquan.recommend.server.gen.recommend.TabResponse other = (com.tzld.piaoquan.recommend.server.gen.recommend.TabResponse) obj;
+    com.tzld.piaoquan.recommend.server.gen.tab.TabResponse other = (com.tzld.piaoquan.recommend.server.gen.tab.TabResponse) obj;
 
     if (hasResult() != other.hasResult()) return false;
     if (hasResult()) {
@@ -256,69 +256,69 @@ private static final long serialVersionUID = 0L;
     return hash;
   }
 
-  public static com.tzld.piaoquan.recommend.server.gen.recommend.TabResponse parseFrom(
+  public static com.tzld.piaoquan.recommend.server.gen.tab.TabResponse parseFrom(
       java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.tzld.piaoquan.recommend.server.gen.recommend.TabResponse parseFrom(
+  public static com.tzld.piaoquan.recommend.server.gen.tab.TabResponse 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.TabResponse parseFrom(
+  public static com.tzld.piaoquan.recommend.server.gen.tab.TabResponse parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.tzld.piaoquan.recommend.server.gen.recommend.TabResponse parseFrom(
+  public static com.tzld.piaoquan.recommend.server.gen.tab.TabResponse 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.TabResponse parseFrom(byte[] data)
+  public static com.tzld.piaoquan.recommend.server.gen.tab.TabResponse parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.tzld.piaoquan.recommend.server.gen.recommend.TabResponse parseFrom(
+  public static com.tzld.piaoquan.recommend.server.gen.tab.TabResponse 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.TabResponse parseFrom(java.io.InputStream input)
+  public static com.tzld.piaoquan.recommend.server.gen.tab.TabResponse 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.TabResponse parseFrom(
+  public static com.tzld.piaoquan.recommend.server.gen.tab.TabResponse 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.TabResponse parseDelimitedFrom(java.io.InputStream input)
+  public static com.tzld.piaoquan.recommend.server.gen.tab.TabResponse 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.TabResponse parseDelimitedFrom(
+  public static com.tzld.piaoquan.recommend.server.gen.tab.TabResponse 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.TabResponse parseFrom(
+  public static com.tzld.piaoquan.recommend.server.gen.tab.TabResponse 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.TabResponse parseFrom(
+  public static com.tzld.piaoquan.recommend.server.gen.tab.TabResponse parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -331,7 +331,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.TabResponse prototype) {
+  public static Builder newBuilder(com.tzld.piaoquan.recommend.server.gen.tab.TabResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
   @java.lang.Override
@@ -352,21 +352,21 @@ private static final long serialVersionUID = 0L;
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
       // @@protoc_insertion_point(builder_implements:TabResponse)
-      com.tzld.piaoquan.recommend.server.gen.recommend.TabResponseOrBuilder {
+      com.tzld.piaoquan.recommend.server.gen.tab.TabResponseOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.tzld.piaoquan.recommend.server.gen.recommend.Tab.internal_static_TabResponse_descriptor;
+      return com.tzld.piaoquan.recommend.server.gen.tab.Tab.internal_static_TabResponse_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.tzld.piaoquan.recommend.server.gen.recommend.Tab.internal_static_TabResponse_fieldAccessorTable
+      return com.tzld.piaoquan.recommend.server.gen.tab.Tab.internal_static_TabResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.tzld.piaoquan.recommend.server.gen.recommend.TabResponse.class, com.tzld.piaoquan.recommend.server.gen.recommend.TabResponse.Builder.class);
+              com.tzld.piaoquan.recommend.server.gen.tab.TabResponse.class, com.tzld.piaoquan.recommend.server.gen.tab.TabResponse.Builder.class);
     }
 
-    // Construct using com.tzld.piaoquan.recommend.server.gen.recommend.TabResponse.newBuilder()
+    // Construct using com.tzld.piaoquan.recommend.server.gen.tab.TabResponse.newBuilder()
     private Builder() {
       maybeForceBuilderInitialization();
     }
@@ -403,17 +403,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.Tab.internal_static_TabResponse_descriptor;
+      return com.tzld.piaoquan.recommend.server.gen.tab.Tab.internal_static_TabResponse_descriptor;
     }
 
     @java.lang.Override
-    public com.tzld.piaoquan.recommend.server.gen.recommend.TabResponse getDefaultInstanceForType() {
-      return com.tzld.piaoquan.recommend.server.gen.recommend.TabResponse.getDefaultInstance();
+    public com.tzld.piaoquan.recommend.server.gen.tab.TabResponse getDefaultInstanceForType() {
+      return com.tzld.piaoquan.recommend.server.gen.tab.TabResponse.getDefaultInstance();
     }
 
     @java.lang.Override
-    public com.tzld.piaoquan.recommend.server.gen.recommend.TabResponse build() {
-      com.tzld.piaoquan.recommend.server.gen.recommend.TabResponse result = buildPartial();
+    public com.tzld.piaoquan.recommend.server.gen.tab.TabResponse build() {
+      com.tzld.piaoquan.recommend.server.gen.tab.TabResponse result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
@@ -421,8 +421,8 @@ private static final long serialVersionUID = 0L;
     }
 
     @java.lang.Override
-    public com.tzld.piaoquan.recommend.server.gen.recommend.TabResponse buildPartial() {
-      com.tzld.piaoquan.recommend.server.gen.recommend.TabResponse result = new com.tzld.piaoquan.recommend.server.gen.recommend.TabResponse(this);
+    public com.tzld.piaoquan.recommend.server.gen.tab.TabResponse buildPartial() {
+      com.tzld.piaoquan.recommend.server.gen.tab.TabResponse result = new com.tzld.piaoquan.recommend.server.gen.tab.TabResponse(this);
       int from_bitField0_ = bitField0_;
       if (resultBuilder_ == null) {
         result.result_ = result_;
@@ -476,16 +476,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.TabResponse) {
-        return mergeFrom((com.tzld.piaoquan.recommend.server.gen.recommend.TabResponse)other);
+      if (other instanceof com.tzld.piaoquan.recommend.server.gen.tab.TabResponse) {
+        return mergeFrom((com.tzld.piaoquan.recommend.server.gen.tab.TabResponse)other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(com.tzld.piaoquan.recommend.server.gen.recommend.TabResponse other) {
-      if (other == com.tzld.piaoquan.recommend.server.gen.recommend.TabResponse.getDefaultInstance()) return this;
+    public Builder mergeFrom(com.tzld.piaoquan.recommend.server.gen.tab.TabResponse other) {
+      if (other == com.tzld.piaoquan.recommend.server.gen.tab.TabResponse.getDefaultInstance()) return this;
       if (other.hasResult()) {
         mergeResult(other.getResult());
       }
@@ -530,11 +530,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.TabResponse parsedMessage = null;
+      com.tzld.piaoquan.recommend.server.gen.tab.TabResponse parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.tzld.piaoquan.recommend.server.gen.recommend.TabResponse) e.getUnfinishedMessage();
+        parsedMessage = (com.tzld.piaoquan.recommend.server.gen.tab.TabResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -664,22 +664,22 @@ private static final long serialVersionUID = 0L;
       return resultBuilder_;
     }
 
-    private java.util.List<com.tzld.piaoquan.recommend.server.gen.recommend.TabProto> tab_ =
+    private java.util.List<com.tzld.piaoquan.recommend.server.gen.common.TabProto> tab_ =
       java.util.Collections.emptyList();
     private void ensureTabIsMutable() {
       if (!((bitField0_ & 0x00000001) != 0)) {
-        tab_ = new java.util.ArrayList<com.tzld.piaoquan.recommend.server.gen.recommend.TabProto>(tab_);
+        tab_ = new java.util.ArrayList<com.tzld.piaoquan.recommend.server.gen.common.TabProto>(tab_);
         bitField0_ |= 0x00000001;
        }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.tzld.piaoquan.recommend.server.gen.recommend.TabProto, com.tzld.piaoquan.recommend.server.gen.recommend.TabProto.Builder, com.tzld.piaoquan.recommend.server.gen.recommend.TabProtoOrBuilder> tabBuilder_;
+        com.tzld.piaoquan.recommend.server.gen.common.TabProto, com.tzld.piaoquan.recommend.server.gen.common.TabProto.Builder, com.tzld.piaoquan.recommend.server.gen.common.TabProtoOrBuilder> tabBuilder_;
 
     /**
      * <code>repeated .TabProto tab = 2;</code>
      */
-    public java.util.List<com.tzld.piaoquan.recommend.server.gen.recommend.TabProto> getTabList() {
+    public java.util.List<com.tzld.piaoquan.recommend.server.gen.common.TabProto> getTabList() {
       if (tabBuilder_ == null) {
         return java.util.Collections.unmodifiableList(tab_);
       } else {
@@ -699,7 +699,7 @@ private static final long serialVersionUID = 0L;
     /**
      * <code>repeated .TabProto tab = 2;</code>
      */
-    public com.tzld.piaoquan.recommend.server.gen.recommend.TabProto getTab(int index) {
+    public com.tzld.piaoquan.recommend.server.gen.common.TabProto getTab(int index) {
       if (tabBuilder_ == null) {
         return tab_.get(index);
       } else {
@@ -710,7 +710,7 @@ private static final long serialVersionUID = 0L;
      * <code>repeated .TabProto tab = 2;</code>
      */
     public Builder setTab(
-        int index, com.tzld.piaoquan.recommend.server.gen.recommend.TabProto value) {
+        int index, com.tzld.piaoquan.recommend.server.gen.common.TabProto value) {
       if (tabBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -727,7 +727,7 @@ private static final long serialVersionUID = 0L;
      * <code>repeated .TabProto tab = 2;</code>
      */
     public Builder setTab(
-        int index, com.tzld.piaoquan.recommend.server.gen.recommend.TabProto.Builder builderForValue) {
+        int index, com.tzld.piaoquan.recommend.server.gen.common.TabProto.Builder builderForValue) {
       if (tabBuilder_ == null) {
         ensureTabIsMutable();
         tab_.set(index, builderForValue.build());
@@ -740,7 +740,7 @@ private static final long serialVersionUID = 0L;
     /**
      * <code>repeated .TabProto tab = 2;</code>
      */
-    public Builder addTab(com.tzld.piaoquan.recommend.server.gen.recommend.TabProto value) {
+    public Builder addTab(com.tzld.piaoquan.recommend.server.gen.common.TabProto value) {
       if (tabBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -757,7 +757,7 @@ private static final long serialVersionUID = 0L;
      * <code>repeated .TabProto tab = 2;</code>
      */
     public Builder addTab(
-        int index, com.tzld.piaoquan.recommend.server.gen.recommend.TabProto value) {
+        int index, com.tzld.piaoquan.recommend.server.gen.common.TabProto value) {
       if (tabBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -774,7 +774,7 @@ private static final long serialVersionUID = 0L;
      * <code>repeated .TabProto tab = 2;</code>
      */
     public Builder addTab(
-        com.tzld.piaoquan.recommend.server.gen.recommend.TabProto.Builder builderForValue) {
+        com.tzld.piaoquan.recommend.server.gen.common.TabProto.Builder builderForValue) {
       if (tabBuilder_ == null) {
         ensureTabIsMutable();
         tab_.add(builderForValue.build());
@@ -788,7 +788,7 @@ private static final long serialVersionUID = 0L;
      * <code>repeated .TabProto tab = 2;</code>
      */
     public Builder addTab(
-        int index, com.tzld.piaoquan.recommend.server.gen.recommend.TabProto.Builder builderForValue) {
+        int index, com.tzld.piaoquan.recommend.server.gen.common.TabProto.Builder builderForValue) {
       if (tabBuilder_ == null) {
         ensureTabIsMutable();
         tab_.add(index, builderForValue.build());
@@ -802,7 +802,7 @@ private static final long serialVersionUID = 0L;
      * <code>repeated .TabProto tab = 2;</code>
      */
     public Builder addAllTab(
-        java.lang.Iterable<? extends com.tzld.piaoquan.recommend.server.gen.recommend.TabProto> values) {
+        java.lang.Iterable<? extends com.tzld.piaoquan.recommend.server.gen.common.TabProto> values) {
       if (tabBuilder_ == null) {
         ensureTabIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
@@ -842,14 +842,14 @@ private static final long serialVersionUID = 0L;
     /**
      * <code>repeated .TabProto tab = 2;</code>
      */
-    public com.tzld.piaoquan.recommend.server.gen.recommend.TabProto.Builder getTabBuilder(
+    public com.tzld.piaoquan.recommend.server.gen.common.TabProto.Builder getTabBuilder(
         int index) {
       return getTabFieldBuilder().getBuilder(index);
     }
     /**
      * <code>repeated .TabProto tab = 2;</code>
      */
-    public com.tzld.piaoquan.recommend.server.gen.recommend.TabProtoOrBuilder getTabOrBuilder(
+    public com.tzld.piaoquan.recommend.server.gen.common.TabProtoOrBuilder getTabOrBuilder(
         int index) {
       if (tabBuilder_ == null) {
         return tab_.get(index);  } else {
@@ -859,7 +859,7 @@ private static final long serialVersionUID = 0L;
     /**
      * <code>repeated .TabProto tab = 2;</code>
      */
-    public java.util.List<? extends com.tzld.piaoquan.recommend.server.gen.recommend.TabProtoOrBuilder> 
+    public java.util.List<? extends com.tzld.piaoquan.recommend.server.gen.common.TabProtoOrBuilder> 
          getTabOrBuilderList() {
       if (tabBuilder_ != null) {
         return tabBuilder_.getMessageOrBuilderList();
@@ -870,31 +870,31 @@ private static final long serialVersionUID = 0L;
     /**
      * <code>repeated .TabProto tab = 2;</code>
      */
-    public com.tzld.piaoquan.recommend.server.gen.recommend.TabProto.Builder addTabBuilder() {
+    public com.tzld.piaoquan.recommend.server.gen.common.TabProto.Builder addTabBuilder() {
       return getTabFieldBuilder().addBuilder(
-          com.tzld.piaoquan.recommend.server.gen.recommend.TabProto.getDefaultInstance());
+          com.tzld.piaoquan.recommend.server.gen.common.TabProto.getDefaultInstance());
     }
     /**
      * <code>repeated .TabProto tab = 2;</code>
      */
-    public com.tzld.piaoquan.recommend.server.gen.recommend.TabProto.Builder addTabBuilder(
+    public com.tzld.piaoquan.recommend.server.gen.common.TabProto.Builder addTabBuilder(
         int index) {
       return getTabFieldBuilder().addBuilder(
-          index, com.tzld.piaoquan.recommend.server.gen.recommend.TabProto.getDefaultInstance());
+          index, com.tzld.piaoquan.recommend.server.gen.common.TabProto.getDefaultInstance());
     }
     /**
      * <code>repeated .TabProto tab = 2;</code>
      */
-    public java.util.List<com.tzld.piaoquan.recommend.server.gen.recommend.TabProto.Builder> 
+    public java.util.List<com.tzld.piaoquan.recommend.server.gen.common.TabProto.Builder> 
          getTabBuilderList() {
       return getTabFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.tzld.piaoquan.recommend.server.gen.recommend.TabProto, com.tzld.piaoquan.recommend.server.gen.recommend.TabProto.Builder, com.tzld.piaoquan.recommend.server.gen.recommend.TabProtoOrBuilder> 
+        com.tzld.piaoquan.recommend.server.gen.common.TabProto, com.tzld.piaoquan.recommend.server.gen.common.TabProto.Builder, com.tzld.piaoquan.recommend.server.gen.common.TabProtoOrBuilder> 
         getTabFieldBuilder() {
       if (tabBuilder_ == null) {
         tabBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.tzld.piaoquan.recommend.server.gen.recommend.TabProto, com.tzld.piaoquan.recommend.server.gen.recommend.TabProto.Builder, com.tzld.piaoquan.recommend.server.gen.recommend.TabProtoOrBuilder>(
+            com.tzld.piaoquan.recommend.server.gen.common.TabProto, com.tzld.piaoquan.recommend.server.gen.common.TabProto.Builder, com.tzld.piaoquan.recommend.server.gen.common.TabProtoOrBuilder>(
                 tab_,
                 ((bitField0_ & 0x00000001) != 0),
                 getParentForChildren(),
@@ -920,12 +920,12 @@ private static final long serialVersionUID = 0L;
   }
 
   // @@protoc_insertion_point(class_scope:TabResponse)
-  private static final com.tzld.piaoquan.recommend.server.gen.recommend.TabResponse DEFAULT_INSTANCE;
+  private static final com.tzld.piaoquan.recommend.server.gen.tab.TabResponse DEFAULT_INSTANCE;
   static {
-    DEFAULT_INSTANCE = new com.tzld.piaoquan.recommend.server.gen.recommend.TabResponse();
+    DEFAULT_INSTANCE = new com.tzld.piaoquan.recommend.server.gen.tab.TabResponse();
   }
 
-  public static com.tzld.piaoquan.recommend.server.gen.recommend.TabResponse getDefaultInstance() {
+  public static com.tzld.piaoquan.recommend.server.gen.tab.TabResponse getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
@@ -950,7 +950,7 @@ private static final long serialVersionUID = 0L;
   }
 
   @java.lang.Override
-  public com.tzld.piaoquan.recommend.server.gen.recommend.TabResponse getDefaultInstanceForType() {
+  public com.tzld.piaoquan.recommend.server.gen.tab.TabResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 

+ 5 - 5
recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/recommend/TabResponseOrBuilder.java → recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/gen/tab/TabResponseOrBuilder.java

@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: com/tzld/piaoquan/recommend/server/tab.proto
 
-package com.tzld.piaoquan.recommend.server.gen.recommend;
+package com.tzld.piaoquan.recommend.server.gen.tab;
 
 public interface TabResponseOrBuilder extends
     // @@protoc_insertion_point(interface_extends:TabResponse)
@@ -25,12 +25,12 @@ public interface TabResponseOrBuilder extends
   /**
    * <code>repeated .TabProto tab = 2;</code>
    */
-  java.util.List<com.tzld.piaoquan.recommend.server.gen.recommend.TabProto> 
+  java.util.List<com.tzld.piaoquan.recommend.server.gen.common.TabProto> 
       getTabList();
   /**
    * <code>repeated .TabProto tab = 2;</code>
    */
-  com.tzld.piaoquan.recommend.server.gen.recommend.TabProto getTab(int index);
+  com.tzld.piaoquan.recommend.server.gen.common.TabProto getTab(int index);
   /**
    * <code>repeated .TabProto tab = 2;</code>
    */
@@ -38,11 +38,11 @@ public interface TabResponseOrBuilder extends
   /**
    * <code>repeated .TabProto tab = 2;</code>
    */
-  java.util.List<? extends com.tzld.piaoquan.recommend.server.gen.recommend.TabProtoOrBuilder> 
+  java.util.List<? extends com.tzld.piaoquan.recommend.server.gen.common.TabProtoOrBuilder> 
       getTabOrBuilderList();
   /**
    * <code>repeated .TabProto tab = 2;</code>
    */
-  com.tzld.piaoquan.recommend.server.gen.recommend.TabProtoOrBuilder getTabOrBuilder(
+  com.tzld.piaoquan.recommend.server.gen.common.TabProtoOrBuilder getTabOrBuilder(
       int index);
 }

+ 8 - 0
recommend-server-client/src/main/proto/com/tzld/piaoquan/recommend/server/common.proto

@@ -6,4 +6,12 @@ option java_package = "com.tzld.piaoquan.recommend.server.gen.common";
 message Result {
   int32 code = 1; // 1 成功
   string message = 2;
+}
+
+// Tab标签信息
+message TabProto{
+  string key = 1;
+  string title = 2;
+  string type = 3;
+  string source = 4;
 }

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

@@ -41,6 +41,7 @@ message RecommendRequest {
   string current_page_source = 30;
   string openGId = 31;
   string union_id = 32;
+  TabProto tab = 33;
 }
 
 message MachineInfoProto {

+ 1 - 8
recommend-server-client/src/main/proto/com/tzld/piaoquan/recommend/server/tab.proto

@@ -4,7 +4,7 @@ import "google/protobuf/any.proto";
 import "com/tzld/piaoquan/recommend/server/common.proto";
 
 option java_multiple_files = true;
-option java_package = "com.tzld.piaoquan.recommend.server.gen.recommend";
+option java_package = "com.tzld.piaoquan.recommend.server.gen.tab";
 option java_generic_services = true;
 
 message TabRequest{
@@ -25,10 +25,3 @@ message TabResponse{
   Result result = 1;
   repeated TabProto tab = 2;
 }
-
-message TabProto{
-  string key = 1;
-  string title = 2;
-  string type = 3;
-  string source = 4;
-}

+ 3 - 3
recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/tab/TabService.java

@@ -1,9 +1,9 @@
 package com.tzld.piaoquan.recommend.server.service.tab;
 
 import com.tzld.piaoquan.recommend.server.gen.common.Result;
-import com.tzld.piaoquan.recommend.server.gen.recommend.TabProto;
-import com.tzld.piaoquan.recommend.server.gen.recommend.TabRequest;
-import com.tzld.piaoquan.recommend.server.gen.recommend.TabResponse;
+import com.tzld.piaoquan.recommend.server.gen.common.TabProto;
+import com.tzld.piaoquan.recommend.server.gen.tab.TabRequest;
+import com.tzld.piaoquan.recommend.server.gen.tab.TabResponse;
 import com.tzld.piaoquan.recommend.server.model.TabParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

+ 2 - 2
recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/web/TabController.java

@@ -1,8 +1,8 @@
 package com.tzld.piaoquan.recommend.server.web;
 
 import com.tzld.piaoquan.recommend.server.client.ProtobufUtils;
-import com.tzld.piaoquan.recommend.server.gen.recommend.TabRequest;
-import com.tzld.piaoquan.recommend.server.gen.recommend.TabResponse;
+import com.tzld.piaoquan.recommend.server.gen.tab.TabRequest;
+import com.tzld.piaoquan.recommend.server.gen.tab.TabResponse;
 import com.tzld.piaoquan.recommend.server.service.tab.TabService;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.MDC;