Merge remote-tracking branch 'refs/remotes/origin/master'

recommend-feature-client/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>recommend-feature-client</artifactId>
-    <version>1.1.32</version>
+    <version>1.1.35</version>
 
     <dependencies>
         <dependency>

recommend-feature-client/src/main/java/com/tzld/piaoquan/recommend/feature/domain/ad/base/AdRankItem.java

@@ -59,11 +59,23 @@ public class AdRankItem implements Comparable<AdRankItem> {
     private Long id;
     // 广告id
     private Long skuId;
+
+    private Long adSkuId;
+    private String adSkuCode;
+    private String adSkuName;
+
     //客户id
     private Long customerId;
     //行业
     private String profession;
 
+    private String adProfessionName;
+
+    private String adCategoryId;
+    private String adCategoryName;
+
+    private Integer landingPageType;
+
     // 特征
     private Map<String, Object> ext = new HashMap<>();
 

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

@@ -8,7 +8,7 @@ grpc:
 eureka:
   instance:
     prefer-ip-address: true #是否优先使用IP地址作为主机名的标识，默认false
-    instance-id: ${spring.cloud.client.ip-address}:${spring.application.name}:${server.port} #注册到eureka上的唯一实例ID
+    instance-id: ${spring.application.name}:${POD_NAME}:${server.port} #注册到eureka上的唯一实例ID
     lease-renewal-interval-in-seconds: 10 #表示eureka client发送心跳给server端的频率，默认30
     lease-expiration-duration-in-seconds: 30 #表示eureka server至上一次收到client的心跳之后，等待下一次心跳的超时时间，在这个时间内若没收到下一次心跳，则将移除该instance，默认90
   client:

recommend-feature-service/src/main/resources/application-pre.yml

@@ -4,7 +4,7 @@ server:
 eureka:
   instance:
     prefer-ip-address: true #是否优先使用IP地址作为主机名的标识，默认false
-    instance-id: ${spring.cloud.client.ip-address}:${spring.application.name}:${server.port} #注册到eureka上的唯一实例ID
+    instance-id: ${spring.application.name}:${POD_NAME}:${server.port} #注册到eureka上的唯一实例ID
     lease-renewal-interval-in-seconds: 10 #表示eureka client发送心跳给server端的频率，默认30
     lease-expiration-duration-in-seconds: 30 #表示eureka server至上一次收到client的心跳之后，等待下一次心跳的超时时间，在这个时间内若没收到下一次心跳，则将移除该instance，默认90
   client:

recommend-feature-service/src/main/resources/application-prod.yml

@@ -28,7 +28,7 @@ thread:
 eureka:
   instance:
     prefer-ip-address: true #是否优先使用IP地址作为主机名的标识，默认false
-    instance-id: ${spring.cloud.client.ip-address}:${spring.application.name}:${server.port} #注册到eureka上的唯一实例ID
+    instance-id: ${spring.application.name}:${POD_NAME}:${server.port} #注册到eureka上的唯一实例ID
     lease-renewal-interval-in-seconds: 10 #表示eureka client发送心跳给server端的频率，默认30
     lease-expiration-duration-in-seconds: 30 #表示eureka server至上一次收到client的心跳之后，等待下一次心跳的超时时间，在这个时间内若没收到下一次心跳，则将移除该instance，默认90
   client:

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

@@ -4,7 +4,7 @@ server:
 eureka:
   instance:
     prefer-ip-address: true #是否优先使用IP地址作为主机名的标识，默认false
-    instance-id: ${spring.cloud.client.ip-address}:${spring.application.name}:${server.port} #注册到eureka上的唯一实例ID
+    instance-id: ${spring.application.name}:${POD_NAME}:${server.port} #注册到eureka上的唯一实例ID
     lease-renewal-interval-in-seconds: 10 #表示eureka client发送心跳给server端的频率，默认30
     lease-expiration-duration-in-seconds: 30 #表示eureka server至上一次收到client的心跳之后，等待下一次心跳的超时时间，在这个时间内若没收到下一次心跳，则将移除该instance，默认90
   client: