门户etag值计算错误

o2server/x_portal_assemble_surface/src/main/java/com/x/portal/assemble/surface/jaxrs/page/V2Get.java

@@ -24,6 +24,7 @@ import java.util.Optional;
 import java.util.TreeMap;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 class V2Get extends BaseAction {
@@ -118,6 +119,8 @@ class V2Get extends BaseAction {
 			}
 			return map;
 		});
+		_relatedWidget.get(300, TimeUnit.SECONDS);
+		_relatedScript.get(300, TimeUnit.SECONDS);
 		list.add(page.getId() + page.getUpdateTime().getTime());
 		List<String> sortList = list.stream().sorted().collect(Collectors.toList());
 		wo.setFastETag(StringUtils.join(sortList, "#"));
@@ -130,4 +133,4 @@ class V2Get extends BaseAction {
 
 	}
 
-}
+}
\ No newline at end of file

o2server/x_portal_assemble_surface/src/main/java/com/x/portal/assemble/surface/jaxrs/page/V2GetMobile.java

@@ -24,6 +24,7 @@ import java.util.Optional;
 import java.util.TreeMap;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 class V2GetMobile extends BaseAction {
@@ -118,6 +119,8 @@ class V2GetMobile extends BaseAction {
 			}
 			return map;
 		});
+		_relatedWidget.get(300, TimeUnit.SECONDS);
+		_relatedScript.get(300, TimeUnit.SECONDS);
 		list.add(page.getId() + page.getUpdateTime().getTime());
 		List<String> sortList = list.stream().sorted().collect(Collectors.toList());
 		wo.setFastETag(StringUtils.join(sortList, "#"));
@@ -130,4 +133,4 @@ class V2GetMobile extends BaseAction {
 
 	}
 
-}
+}
\ No newline at end of file

o2server/x_portal_assemble_surface/src/main/java/com/x/portal/assemble/surface/jaxrs/page/V2GetWithPortal.java

@@ -20,6 +20,7 @@ import java.util.Optional;
 import java.util.TreeMap;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 class V2GetWithPortal extends BaseAction {
@@ -134,6 +135,8 @@ class V2GetWithPortal extends BaseAction {
 			}
 			return map;
 		});
+		_relatedWidget.get(300, TimeUnit.SECONDS);
+		_relatedScript.get(300, TimeUnit.SECONDS);
 		list.add(page.getId() + page.getUpdateTime().getTime());
 		List<String> sortList = list.stream().sorted().collect(Collectors.toList());
 		wo.setFastETag(StringUtils.join(sortList, "#"));
@@ -146,4 +149,4 @@ class V2GetWithPortal extends BaseAction {
 
 	}
 
-}
+}
\ No newline at end of file

o2server/x_portal_assemble_surface/src/main/java/com/x/portal/assemble/surface/jaxrs/page/V2GetWithPortalMobile.java

@@ -20,6 +20,7 @@ import java.util.Optional;
 import java.util.TreeMap;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 class V2GetWithPortalMobile extends BaseAction {
@@ -134,6 +135,8 @@ class V2GetWithPortalMobile extends BaseAction {
 			}
 			return map;
 		});
+		_relatedWidget.get(300, TimeUnit.SECONDS);
+		_relatedScript.get(300, TimeUnit.SECONDS);
 		list.add(page.getId() + page.getUpdateTime().getTime());
 		List<String> sortList = list.stream().sorted().collect(Collectors.toList());
 		wo.setFastETag(StringUtils.join(sortList, "#"));
@@ -146,4 +149,4 @@ class V2GetWithPortalMobile extends BaseAction {
 
 	}
 
-}
+}
\ No newline at end of file