feat:添加versionCode参数

recommend-server-client/pom.xml

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

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

@@ -56,7 +56,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\"\256\004\n\020RecommendRequest\022\022\n\nrequest" +
+      "on.proto\"\304\004\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_" +
@@ -69,25 +69,25 @@ public final class Recommend {
       "ion_id\030\021 \001(\t\022\026\n\016sub_session_id\030\022 \001(\t\022\023\n\013" +
       "page_source\030\023 \001(\t\022\023\n\013category_id\030\024 \001(\t\022\026" +
       "\n\016hot_scene_type\030\025 \001(\003\022\021\n\tclient_ip\030\026 \001(" +
-      "\t\032.\n\014EventIdEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030" +
-      "\002 \001(\t:\0028\001\"\177\n\020MachineInfoProto\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\016we" +
-      "chat_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_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\017" +
-      "push_from_index\030\n \003(\0132\016.PushFromIndex\"1\n" +
-      "\rPushFromIndex\022\021\n\tpush_from\030\001 \001(\t\022\r\n\005ind" +
-      "ex\030\002 \003(\t2\212\001\n\020RecommendService\022:\n\021Homepag" +
-      "eRecommend\022\021.RecommendRequest\032\022.Recommen" +
-      "dResponse\022:\n\021RelevantRecommend\022\021.Recomme" +
-      "ndRequest\032\022.RecommendResponseB7\n0com.tzl" +
-      "d.piaoquan.recommend.server.gen.recommen" +
-      "dP\001\210\001\001b\006proto3"
+      "\t\022\024\n\014version_code\030\027 \001(\005\032.\n\014EventIdEntry\022" +
+      "\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\177\n\020Machi" +
+      "neInfoProto\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\nV" +
+      "ideoProto\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\t" +
+      "push_from\030\001 \001(\t\022\r\n\005index\030\002 \003(\t2\212\001\n\020Recom" +
+      "mendService\022:\n\021HomepageRecommend\022\021.Recom" +
+      "mendRequest\032\022.RecommendResponse\022:\n\021Relev" +
+      "antRecommend\022\021.RecommendRequest\032\022.Recomm" +
+      "endResponseB7\n0com.tzld.piaoquan.recomme" +
+      "nd.server.gen.recommendP\001\210\001\001b\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -100,7 +100,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", });
+        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", });
     internal_static_RecommendRequest_EventIdEntry_descriptor =
       internal_static_RecommendRequest_descriptor.getNestedTypes().get(0);
     internal_static_RecommendRequest_EventIdEntry_fieldAccessorTable = new

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

@@ -208,6 +208,11 @@ private static final long serialVersionUID = 0L;
             clientIp_ = s;
             break;
           }
+          case 184: {
+
+            versionCode_ = input.readInt32();
+            break;
+          }
           default: {
             if (!parseUnknownField(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -996,6 +1001,17 @@ private static final long serialVersionUID = 0L;
     }
   }
 
+  public static final int VERSION_CODE_FIELD_NUMBER = 23;
+  private int versionCode_;
+  /**
+   * <code>int32 version_code = 23;</code>
+   * @return The versionCode.
+   */
+  @java.lang.Override
+  public int getVersionCode() {
+    return versionCode_;
+  }
+
   private byte memoizedIsInitialized = -1;
   @java.lang.Override
   public final boolean isInitialized() {
@@ -1079,6 +1095,9 @@ private static final long serialVersionUID = 0L;
     if (!getClientIpBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 22, clientIp_);
     }
+    if (versionCode_ != 0) {
+      output.writeInt32(23, versionCode_);
+    }
     unknownFields.writeTo(output);
   }
 
@@ -1172,6 +1191,10 @@ private static final long serialVersionUID = 0L;
     if (!getClientIpBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(22, clientIp_);
     }
+    if (versionCode_ != 0) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt32Size(23, versionCode_);
+    }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
@@ -1234,6 +1257,8 @@ private static final long serialVersionUID = 0L;
         != other.getHotSceneType()) return false;
     if (!getClientIp()
         .equals(other.getClientIp())) return false;
+    if (getVersionCode()
+        != other.getVersionCode()) return false;
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
@@ -1297,6 +1322,8 @@ private static final long serialVersionUID = 0L;
         getHotSceneType());
     hash = (37 * hash) + CLIENT_IP_FIELD_NUMBER;
     hash = (53 * hash) + getClientIp().hashCode();
+    hash = (37 * hash) + VERSION_CODE_FIELD_NUMBER;
+    hash = (53 * hash) + getVersionCode();
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -1499,6 +1526,8 @@ private static final long serialVersionUID = 0L;
 
       clientIp_ = "";
 
+      versionCode_ = 0;
+
       return this;
     }
 
@@ -1557,6 +1586,7 @@ private static final long serialVersionUID = 0L;
       result.categoryId_ = categoryId_;
       result.hotSceneType_ = hotSceneType_;
       result.clientIp_ = clientIp_;
+      result.versionCode_ = versionCode_;
       onBuilt();
       return result;
     }
@@ -1691,6 +1721,9 @@ private static final long serialVersionUID = 0L;
         clientIp_ = other.clientIp_;
         onChanged();
       }
+      if (other.getVersionCode() != 0) {
+        setVersionCode(other.getVersionCode());
+      }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
@@ -3332,6 +3365,37 @@ private static final long serialVersionUID = 0L;
       onChanged();
       return this;
     }
+
+    private int versionCode_ ;
+    /**
+     * <code>int32 version_code = 23;</code>
+     * @return The versionCode.
+     */
+    @java.lang.Override
+    public int getVersionCode() {
+      return versionCode_;
+    }
+    /**
+     * <code>int32 version_code = 23;</code>
+     * @param value The versionCode to set.
+     * @return This builder for chaining.
+     */
+    public Builder setVersionCode(int value) {
+      
+      versionCode_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>int32 version_code = 23;</code>
+     * @return This builder for chaining.
+     */
+    public Builder clearVersionCode() {
+      
+      versionCode_ = 0;
+      onChanged();
+      return this;
+    }
     @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {

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

@@ -290,4 +290,10 @@ public interface RecommendRequestOrBuilder extends
    */
   com.google.protobuf.ByteString
       getClientIpBytes();
+
+  /**
+   * <code>int32 version_code = 23;</code>
+   * @return The versionCode.
+   */
+  int getVersionCode();
 }

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

@@ -31,6 +31,7 @@ message RecommendRequest {
   string category_id = 20;
   int64 hot_scene_type = 21;
   string client_ip = 22;
+  int32 version_code = 23;
 }
 
 message MachineInfoProto {

recommend-server-service/pom.xml

@@ -175,7 +175,7 @@
         <dependency>
             <groupId>com.tzld.piaoquan</groupId>
             <artifactId>recommend-server-client</artifactId>
-            <version>1.1.4</version>
+            <version>1.1.5</version>
         </dependency>
         <dependency>
             <groupId>com.tzld.piaoquan</groupId>

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/model/RecommendParam.java

@@ -1,12 +1,9 @@
 package com.tzld.piaoquan.recommend.server.model;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 /**
@@ -44,5 +41,6 @@ public class RecommendParam {
 
     private String clientIp;
 
+    private Integer versionCode;
 }
 

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

@@ -351,6 +351,7 @@ public class RecommendService {
 
         param.setHotSceneType(request.getHotSceneType());
         param.setClientIp(request.getClientIp());
+        param.setVersionCode(request.getVersionCode());
 
         return param;
     }