Merge pull request #1447 from lowcoder-org/feature/deploymentid

FalkWolsky · web-flow · commit 7149282cc4fa · 2025-01-17T22:58:43.000+01:00
add deploymentid into events published
diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/AbstractEvent.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/AbstractEvent.java
@@ -1,6 +1,7 @@
 package org.lowcoder.infra.event;
 
 import lombok.Getter;
+import lombok.Setter;
 import lombok.experimental.SuperBuilder;
 import org.lowcoder.plugin.api.event.LowcoderEvent;
 
@@ -18,6 +19,8 @@ public abstract class AbstractEvent implements LowcoderEvent
 	protected final Boolean isAnonymous;
 	private final String ipAddress;
     protected Map<String, Object> details;
+	@Setter
+	private static String deploymentID;
     
     public Map<String, Object> details()
     {
@@ -33,6 +36,7 @@ public B detail(String name, String value)
     			details = new HashMap<>();
     		}
     		this.details.put(name, value);
+			this.details.put("deploymentID", deploymentID);
     		return self();
     	}
     }
@@ -51,5 +55,6 @@ public void populateDetails() {
             }
 
 		}
+		details.put("deploymentID", deploymentID);
 	}
 }
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/eventlistener/AppEventListener.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/eventlistener/AppEventListener.java
@@ -1,16 +1,23 @@
 package org.lowcoder.runner.eventlistener;
 
+import lombok.RequiredArgsConstructor;
+import org.lowcoder.infra.config.model.ServerConfig;
+import org.lowcoder.infra.config.repository.ServerConfigRepository;
+import org.lowcoder.infra.event.AbstractEvent;
 import org.lowcoder.sdk.exception.BizError;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
 
 import lombok.extern.slf4j.Slf4j;
+import reactor.core.publisher.Mono;
 
 @Slf4j
 @Component
+@RequiredArgsConstructor
 public class AppEventListener {
 
+    private final ServerConfigRepository serverConfigRepository;
     @EventListener
     public void onApplicationEvent(ApplicationReadyEvent event) {
         System.out.println(
@@ -23,5 +30,7 @@ public void onApplicationEvent(ApplicationReadyEvent event) {
                                        """
         );
         log.info("check BizError duplicates: {}", BizError.values().length);
+        String deploymentId = (String)(serverConfigRepository.findByKey("deployment.id").map(ServerConfig::getValue).switchIfEmpty(Mono.just("")).block());
+        AbstractEvent.setDeploymentID(deploymentId);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package org.lowcoder.infra.event;`
`2`	`2`
`3`	`3`	`import lombok.Getter;`
	`4`	`+import lombok.Setter;`
`4`	`5`	`import lombok.experimental.SuperBuilder;`
`5`	`6`	`import org.lowcoder.plugin.api.event.LowcoderEvent;`
`6`	`7`
`@@ -18,6 +19,8 @@ public abstract class AbstractEvent implements LowcoderEvent`
`18`	`19`	`protected final Boolean isAnonymous;`
`19`	`20`	`private final String ipAddress;`
`20`	`21`	`protected Map<String, Object> details;`
	`22`	`+ @Setter`
	`23`	`+ private static String deploymentID;`
`21`	`24`
`22`	`25`	`public Map<String, Object> details()`
`23`	`26`	`{`
`@@ -33,6 +36,7 @@ public B detail(String name, String value)`
`33`	`36`	`details = new HashMap<>();`
`34`	`37`	`}`
`35`	`38`	`this.details.put(name, value);`
	`39`	`+ this.details.put("deploymentID", deploymentID);`
`36`	`40`	`return self();`
`37`	`41`	`}`
`38`	`42`	`}`
`@@ -51,5 +55,6 @@ public void populateDetails() {`
`51`	`55`	`}`
`52`	`56`
`53`	`57`	`}`
	`58`	`+ details.put("deploymentID", deploymentID);`
`54`	`59`	`}`
`55`	`60`	`}`