Merge branch 'feature_20251103_zhaohaipeng_add_opengid' of algorithm/recommend-server into master

recommend-server-client/pom.xml

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

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\"\376\005\n\020RecommendRequest\022\022\n\nrequest" +
+      "on.proto\"\217\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_" +
@@ -79,26 +79,27 @@ public final class Recommend {
       "um\030\032 \001(\005\022\025\n\rrootSessionId\030\033 \001(\t\022)\n\nshare" +
       "_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\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\016wechat_version\030\006 \001(\t\"H\n\021RecommendR" +
-      "esponse\022\027\n\006result\030\001 \001(\0132\007.Result\022\032\n\005vide" +
-      "o\030\002 \003(\0132\013.VideoProto\"\336\001\n\nVideoProto\022\020\n\010v" +
-      "ideo_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_sco" +
-      "re\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.PushFrom" +
-      "Index\"1\n\rPushFromIndex\022\021\n\tpush_from\030\001 \001(" +
-      "\t\022\r\n\005index\030\002 \003(\t\"4\n\024VideoActionInfoProto" +
-      "\022\020\n\010video_id\030\001 \001(\003\022\n\n\002ts\030\002 \001(\0032\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"
+      "rce\030\036 \001(\t\022\017\n\007openGId\030\037 \001(\t\032.\n\014EventIdEnt" +
+      "ry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\177\n\020Ma" +
+      "chineInfoProto\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(\013" +
+      "2\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_sc" +
+      "ore\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_poo" +
+      "l\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\005index\030\002 \003(\t\"4\n\024Vid" +
+      "eoActionInfoProto\022\020\n\010video_id\030\001 \001(\003\022\n\n\002t" +
+      "s\030\002 \001(\0032\212\001\n\020RecommendService\022:\n\021Homepage" +
+      "Recommend\022\021.RecommendRequest\032\022.Recommend" +
+      "Response\022:\n\021RelevantRecommend\022\021.Recommen" +
+      "dRequest\032\022.RecommendResponseB7\n0com.tzld" +
+      ".piaoquan.recommend.server.gen.recommend" +
+      "P\001\210\001\001b\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -111,7 +112,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", });
+        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", });
     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

@@ -35,6 +35,7 @@ private static final long serialVersionUID = 0L;
     rootSessionId_ = "";
     shareList_ = java.util.Collections.emptyList();
     currentPageSource_ = "";
+    openGId_ = "";
   }
 
   @java.lang.Override
@@ -259,6 +260,12 @@ private static final long serialVersionUID = 0L;
             currentPageSource_ = s;
             break;
           }
+          case 250: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            openGId_ = s;
+            break;
+          }
           default: {
             if (!parseUnknownField(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -1252,6 +1259,44 @@ private static final long serialVersionUID = 0L;
     }
   }
 
+  public static final int OPENGID_FIELD_NUMBER = 31;
+  private volatile java.lang.Object openGId_;
+  /**
+   * <code>string openGId = 31;</code>
+   * @return The openGId.
+   */
+  @java.lang.Override
+  public java.lang.String getOpenGId() {
+    java.lang.Object ref = openGId_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      openGId_ = s;
+      return s;
+    }
+  }
+  /**
+   * <code>string openGId = 31;</code>
+   * @return The bytes for openGId.
+   */
+  @java.lang.Override
+  public com.google.protobuf.ByteString
+      getOpenGIdBytes() {
+    java.lang.Object ref = openGId_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      openGId_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
   private byte memoizedIsInitialized = -1;
   @java.lang.Override
   public final boolean isInitialized() {
@@ -1359,6 +1404,9 @@ private static final long serialVersionUID = 0L;
     if (!getCurrentPageSourceBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 30, currentPageSource_);
     }
+    if (!getOpenGIdBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 31, openGId_);
+    }
     unknownFields.writeTo(output);
   }
 
@@ -1481,6 +1529,9 @@ private static final long serialVersionUID = 0L;
     if (!getCurrentPageSourceBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(30, currentPageSource_);
     }
+    if (!getOpenGIdBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(31, openGId_);
+    }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
@@ -1559,6 +1610,8 @@ private static final long serialVersionUID = 0L;
         != other.getRequestVideoId()) return false;
     if (!getCurrentPageSource()
         .equals(other.getCurrentPageSource())) return false;
+    if (!getOpenGId()
+        .equals(other.getOpenGId())) return false;
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
@@ -1641,6 +1694,8 @@ private static final long serialVersionUID = 0L;
         getRequestVideoId());
     hash = (37 * hash) + CURRENT_PAGE_SOURCE_FIELD_NUMBER;
     hash = (53 * hash) + getCurrentPageSource().hashCode();
+    hash = (37 * hash) + OPENGID_FIELD_NUMBER;
+    hash = (53 * hash) + getOpenGId().hashCode();
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -1864,6 +1919,8 @@ private static final long serialVersionUID = 0L;
 
       currentPageSource_ = "";
 
+      openGId_ = "";
+
       return this;
     }
 
@@ -1938,6 +1995,7 @@ private static final long serialVersionUID = 0L;
       }
       result.requestVideoId_ = requestVideoId_;
       result.currentPageSource_ = currentPageSource_;
+      result.openGId_ = openGId_;
       onBuilt();
       return result;
     }
@@ -2122,6 +2180,10 @@ private static final long serialVersionUID = 0L;
         currentPageSource_ = other.currentPageSource_;
         onChanged();
       }
+      if (!other.getOpenGId().isEmpty()) {
+        openGId_ = other.openGId_;
+        onChanged();
+      }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
@@ -4367,6 +4429,82 @@ private static final long serialVersionUID = 0L;
       onChanged();
       return this;
     }
+
+    private java.lang.Object openGId_ = "";
+    /**
+     * <code>string openGId = 31;</code>
+     * @return The openGId.
+     */
+    public java.lang.String getOpenGId() {
+      java.lang.Object ref = openGId_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        openGId_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * <code>string openGId = 31;</code>
+     * @return The bytes for openGId.
+     */
+    public com.google.protobuf.ByteString
+        getOpenGIdBytes() {
+      java.lang.Object ref = openGId_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        openGId_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * <code>string openGId = 31;</code>
+     * @param value The openGId to set.
+     * @return This builder for chaining.
+     */
+    public Builder setOpenGId(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      openGId_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>string openGId = 31;</code>
+     * @return This builder for chaining.
+     */
+    public Builder clearOpenGId() {
+      
+      openGId_ = getDefaultInstance().getOpenGId();
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>string openGId = 31;</code>
+     * @param value The bytes for openGId to set.
+     * @return This builder for chaining.
+     */
+    public Builder setOpenGIdBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      openGId_ = value;
+      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

@@ -378,4 +378,16 @@ public interface RecommendRequestOrBuilder extends
    */
   com.google.protobuf.ByteString
       getCurrentPageSourceBytes();
+
+  /**
+   * <code>string openGId = 31;</code>
+   * @return The openGId.
+   */
+  java.lang.String getOpenGId();
+  /**
+   * <code>string openGId = 31;</code>
+   * @return The bytes for openGId.
+   */
+  com.google.protobuf.ByteString
+      getOpenGIdBytes();
 }

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

@@ -39,6 +39,7 @@ message RecommendRequest {
   repeated VideoActionInfoProto share_list = 28;
   int64 request_video_id = 29;
   string current_page_source = 30;
+  string openGId = 31;
 }
 
 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.11</version>
+            <version>1.1.12</version>
         </dependency>
         <dependency>
             <groupId>com.tzld.piaoquan</groupId>

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

@@ -60,5 +60,6 @@ public class RecommendParam {
     private String currentPageSource;
 
     private Map<String, String> creativeInfoFeature;
+    private String openGId;
 }
 

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

@@ -46,7 +46,6 @@ import org.springframework.stereotype.Service;
 import javax.annotation.PostConstruct;
 import java.time.Duration;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
@@ -428,6 +427,7 @@ public class RecommendService {
         param.setRecommendType(recommendType);
         param.setRequestVideoId(request.getRequestVideoId());
         param.setCurrentPageSource(request.getCurrentPageSource());
+        param.setOpenGId(request.getOpenGId());
 
         Map<String, String> creativeInfoFeature = this.getCreativeInfoFeature(request.getRootSourceId(), channelName, request.getUserShareDepth());
         param.setCreativeInfoFeature(creativeInfoFeature);
@@ -580,6 +580,7 @@ public class RecommendService {
         recallParam.setRequestVideoId(param.getRequestVideoId());
         recallParam.setCurrentPageSource(param.getCurrentPageSource());
         recallParam.setCreativeInfoFeature(param.getCreativeInfoFeature());
+        recallParam.setOpenGId(param.getOpenGId());
         return recallParam;
     }
 
@@ -612,6 +613,7 @@ public class RecommendService {
         rankParam.setRequestVideoId(param.getRequestVideoId());
         rankParam.setCurrentPageSource(param.getCurrentPageSource());
         rankParam.setCreativeInfoFeature(param.getCreativeInfoFeature());
+        rankParam.setOpenGId(param.getOpenGId());
         return rankParam;
     }
 

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

@@ -28,8 +28,8 @@ public class RankParam {
     private String city;
     private MachineInfo machineInfo;
     private Set<String> abExpCodes;
-    private Long headVid=0L;
-    private Long hotSceneType=0L;
+    private Long headVid = 0L;
+    private Long hotSceneType = 0L;
 
     private Integer categoryId;
     private Integer versionCode;
@@ -48,4 +48,5 @@ public class RankParam {
     private String currentPageSource;
     private Map<String, String> creativeInfoFeature;
     private Map<String, Map<String, String>> behaviorVideos;
+    private String openGId;
 }

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/strategy/RankStrategy4RegionMergeModelBasic.java

@@ -394,19 +394,23 @@ public abstract class RankStrategy4RegionMergeModelBasic extends RankService {
         return map;
     }
 
-    protected Map<String, String> getUserRegion(RankParam param) {
-        Map<String, String> regionMap = new HashMap<>();
+    protected Map<String, String> getContextInfo(RankParam param) {
+        Map<String, String> contextInfo = new HashMap<>();
         if (null != param) {
             String province = param.getProvince();
             if (null != province && !province.isEmpty()) {
-                regionMap.put("province", province.replaceAll("省$", ""));
+                contextInfo.put("province", province.replaceAll("省$", ""));
             }
             String city = param.getCity();
             if (null != city && !city.isEmpty()) {
-                regionMap.put("city", city.replaceAll("市$", ""));
+                contextInfo.put("city", city.replaceAll("市$", ""));
+            }
+            String openGId = param.getOpenGId();
+            if (null != openGId && !openGId.isEmpty()) {
+                contextInfo.put("openGId", openGId);
             }
         }
-        return regionMap;
+        return contextInfo;
     }
 
     /**

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/strategy/RankStrategy4RegionMergeModelV564.java

@@ -125,7 +125,7 @@ public class RankStrategy4RegionMergeModelV564 extends RankStrategy4RegionMergeM
             cate2Coefficient.putAll(simCateScore);
         }
         Double cate2CoefficientDenominator = mergeWeight.getOrDefault("cate2CoefficientDenominator", 1d);
-        Map<String, String> regionMap = getUserRegion(param);
+        Map<String, String> contextInfo = getContextInfo(param);
 
         List<Video> result = new ArrayList<>();
         for (RankItem item : items) {
@@ -177,8 +177,8 @@ public class RankStrategy4RegionMergeModelV564 extends RankStrategy4RegionMergeM
             if (MapUtils.isNotEmpty(param.getCreativeInfoFeature())) {
                 video.getMetaFeatureMap().put("creativeInfo", param.getCreativeInfoFeature());
             }
-            if (MapUtils.isNotEmpty(regionMap)) {
-                video.getMetaFeatureMap().put("region", regionMap);
+            if (MapUtils.isNotEmpty(contextInfo)) {
+                video.getMetaFeatureMap().put("context", contextInfo);
             }
             result.add(video);
         }

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/strategy/RankStrategy4RegionMergeModelV565.java

@@ -128,7 +128,7 @@ public class RankStrategy4RegionMergeModelV565 extends RankStrategy4RegionMergeM
             cate2Coefficient.putAll(simCateScore);
         }
         Double cate2CoefficientDenominator = mergeWeight.getOrDefault("cate2CoefficientDenominator", 1d);
-        Map<String, String> regionMap = getUserRegion(param);
+        Map<String, String> contextInfo = getContextInfo(param);
 
         List<Video> result = new ArrayList<>();
         for (RankItem item : items) {
@@ -185,8 +185,8 @@ public class RankStrategy4RegionMergeModelV565 extends RankStrategy4RegionMergeM
             if (MapUtils.isNotEmpty(param.getCreativeInfoFeature())) {
                 video.getMetaFeatureMap().put("creativeInfo", param.getCreativeInfoFeature());
             }
-            if (MapUtils.isNotEmpty(regionMap)) {
-                video.getMetaFeatureMap().put("region", regionMap);
+            if (MapUtils.isNotEmpty(contextInfo)) {
+                video.getMetaFeatureMap().put("context", contextInfo);
             }
             result.add(video);
         }

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/strategy/RankStrategy4RegionMergeModelV566.java

@@ -135,7 +135,7 @@ public class RankStrategy4RegionMergeModelV566 extends RankStrategy4RegionMergeM
             cate2Coefficient.putAll(simCateScore);
         }
         Double cate2CoefficientDenominator = mergeWeight.getOrDefault("cate2CoefficientDenominator", 1d);
-        Map<String, String> regionMap = getUserRegion(param);
+        Map<String, String> contextInfo = getContextInfo(param);
         Map<String, Double> prioriVidProvinceRovn = this.getPrioriVidProvinceRovn(param.getProvince(), items, videoBaseInfoMap);
 
         List<Video> result = new ArrayList<>();
@@ -193,8 +193,8 @@ public class RankStrategy4RegionMergeModelV566 extends RankStrategy4RegionMergeM
             if (MapUtils.isNotEmpty(param.getCreativeInfoFeature())) {
                 video.getMetaFeatureMap().put("creativeInfo", param.getCreativeInfoFeature());
             }
-            if (MapUtils.isNotEmpty(regionMap)) {
-                video.getMetaFeatureMap().put("region", regionMap);
+            if (MapUtils.isNotEmpty(contextInfo)) {
+                video.getMetaFeatureMap().put("context", contextInfo);
             }
             result.add(video);
         }

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/strategy/RankStrategy4RegionMergeModelV567.java

@@ -128,7 +128,7 @@ public class RankStrategy4RegionMergeModelV567 extends RankStrategy4RegionMergeM
             cate2Coefficient.putAll(simCateScore);
         }
         Double cate2CoefficientDenominator = mergeWeight.getOrDefault("cate2CoefficientDenominator", 1d);
-        Map<String, String> regionMap = getUserRegion(param);
+        Map<String, String> contextInfo = getContextInfo(param);
 
         List<Video> result = new ArrayList<>();
         for (RankItem item : items) {
@@ -180,8 +180,8 @@ public class RankStrategy4RegionMergeModelV567 extends RankStrategy4RegionMergeM
             if (MapUtils.isNotEmpty(param.getCreativeInfoFeature())) {
                 video.getMetaFeatureMap().put("creativeInfo", param.getCreativeInfoFeature());
             }
-            if (MapUtils.isNotEmpty(regionMap)) {
-                video.getMetaFeatureMap().put("region", regionMap);
+            if (MapUtils.isNotEmpty(contextInfo)) {
+                video.getMetaFeatureMap().put("context", contextInfo);
             }
             result.add(video);
         }

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/strategy/RankStrategy4RegionMergeModelV568.java

@@ -135,7 +135,7 @@ public class RankStrategy4RegionMergeModelV568 extends RankStrategy4RegionMergeM
             cate2Coefficient.putAll(simCateScore);
         }
         Double cate2CoefficientDenominator = mergeWeight.getOrDefault("cate2CoefficientDenominator", 1d);
-        Map<String, String> regionMap = getUserRegion(param);
+        Map<String, String> contextInfo = getContextInfo(param);
         Map<String, Double> prioriVidProvinceRovn = this.getPrioriVidProvinceRovn(param.getProvince(), items, videoBaseInfoMap);
 
         List<Video> result = new ArrayList<>();
@@ -193,8 +193,8 @@ public class RankStrategy4RegionMergeModelV568 extends RankStrategy4RegionMergeM
             if (MapUtils.isNotEmpty(param.getCreativeInfoFeature())) {
                 video.getMetaFeatureMap().put("creativeInfo", param.getCreativeInfoFeature());
             }
-            if (MapUtils.isNotEmpty(regionMap)) {
-                video.getMetaFeatureMap().put("region", regionMap);
+            if (MapUtils.isNotEmpty(contextInfo)) {
+                video.getMetaFeatureMap().put("context", contextInfo);
             }
             result.add(video);
         }

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

@@ -48,4 +48,5 @@ public class RecallParam {
     private String currentPageSource;
     private Map<String, String> creativeInfoFeature;
     private Map<String, Map<String, String>> behaviorVideos;
+    private String openGId;
 }