gufengshou1 1 anno fa
parent
commit
f609417bdc

+ 1 - 1
recommend-feature-service/src/main/java/com/tzld/piaoquan/recommend/feature/grpcservice/FeatureGrpcService.java

@@ -62,7 +62,7 @@ public class FeatureGrpcService extends FeatureServiceGrpc.FeatureServiceImplBas
     public void getUserAdFeature(GetUserAdFeatureRequest request,
                                    StreamObserver<GetUserAdFeatureResponse> responseObserver) {
         log.info("FeatureGrpcService getUserAdFeature request={}", ProtobufUtils.toJson(request));
-        GetUserAdFeatureResponse response = userAdFeatureService.getUserFeature(request);
+        GetUserAdFeatureResponse response = userAdFeatureService.getUserAdFeature(request);
         log.info("FeatureGrpcService getUserAdFeature response={}", ProtobufUtils.toJson(response));
         responseObserver.onNext(response);
         responseObserver.onCompleted();

+ 1 - 1
recommend-feature-service/src/main/java/com/tzld/piaoquan/recommend/feature/service/AdItemFeatureService.java

@@ -21,7 +21,7 @@ public class AdItemFeatureService  extends AbstractFeatureService<String, AdItem
         super.emptyData = "{}";
         super.emptyDataExpire = 0;
         super.defaultExpire = 0;
-        super.keyFunc = k -> String.format("ad:adid:%s", k);
+        super.keyFunc = k -> String.format("ad:%s", k);
         super.typeToken = new TypeToken<AdItemFeature>() {
         };
 

+ 4 - 0
recommend-feature-service/src/main/java/com/tzld/piaoquan/recommend/feature/service/FeatureConverter.java

@@ -82,6 +82,7 @@ public class FeatureConverter {
 
     public static UserAdFeatureProto convertToProto(UserAdFeature userAdFeature) {
         UserAdFeatureProto.Builder builder = UserAdFeatureProto.newBuilder();
+        if(userAdFeature==null) return builder.build();
         builder.setMid(userAdFeature.getMid());
         builder.setGender(userAdFeature.getGender());
         builder.setUserType(userAdFeature.getUser_type());
@@ -128,7 +129,9 @@ public class FeatureConverter {
     }
 
     public static AdActionFeatureProto convertToProto(AdActionFeature adActionFeature) {
+
         AdActionFeatureProto.Builder builder = AdActionFeatureProto.newBuilder();
+        if(adActionFeature==null) return builder.build();
         builder.setAdView(adActionFeature.getAdView());
         builder.setAdClick(adActionFeature.getAdClick());
         builder.setAdConversion(adActionFeature.getAdConversion());
@@ -138,6 +141,7 @@ public class FeatureConverter {
     }
 
     public static AdItemFeatureProto convertToProto(AdItemFeature adItemFeature) {
+        if(adItemFeature==null) return null;
         AdItemFeatureProto.Builder builder = AdItemFeatureProto.newBuilder();
         builder.setAdId(adItemFeature.getAdId());
         builder.setAdCode(adItemFeature.getAdCode());

+ 1 - 1
recommend-feature-service/src/main/java/com/tzld/piaoquan/recommend/feature/service/UserAdFeatureService.java

@@ -27,7 +27,7 @@ public class UserAdFeatureService extends AbstractFeatureService<String, UserAdF
         initLocalCache(maximumSize, refreshAfterWrite, expireAfterWrite, expireAfterAccess);
     }
 
-    public GetUserAdFeatureResponse getUserFeature(GetUserAdFeatureRequest request) {
+    public GetUserAdFeatureResponse getUserAdFeature(GetUserAdFeatureRequest request) {
         String uid = request.getMid();
         if (StringUtils.isBlank(uid)) {
             return GetUserAdFeatureResponse.newBuilder()

+ 2 - 2
recommend-feature-service/src/main/resources/application-dev.yml

@@ -18,7 +18,7 @@ eureka:
 
 spring:
   redis:
-    hostName: r-bp1ps6my7lzg8rdhwx682.redis.rds.aliyuncs.com
+    hostName: r-bp1pi8wyv6lzvgjy5z.redis.rds.aliyuncs.com
     port: 6379
     password: Wqsd@2019
     timeout: 1000
@@ -29,7 +29,7 @@ spring:
         max-idle: 8
         min-idle: 0
   tair:
-    hostName: r-bp1hyi7jeuw3xf0rxh.redis.rds.aliyuncs.com
+    hostName: r-bp1pi8wyv6lzvgjy5z.redis.rds.aliyuncs.com
     port: 6379
     password: Wqsd@2019
     timeout: 1000

+ 2 - 2
recommend-feature-service/src/main/resources/application-test.yml

@@ -14,7 +14,7 @@ eureka:
 
 spring:
   redis:
-    hostName: r-bp1ps6my7lzg8rdhwx682.redis.rds.aliyuncs.com
+    hostName: r-bp1pi8wyv6lzvgjy5z.redis.rds.aliyuncs.com
     port: 6379
     password: Wqsd@2019
     timeout: 1000
@@ -25,7 +25,7 @@ spring:
         max-idle: 8
         min-idle: 0
   tair:
-    hostName: r-bp1hyi7jeuw3xf0rxh.redis.rds.aliyuncs.com
+    hostName: r-bp1pi8wyv6lzvgjy5z.redis.rds.aliyuncs.com
     port: 6379
     password: Wqsd@2019
     timeout: 1000