Commit7149282

authored

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

add deploymentid into events published

2 parents7d8efc0 +5738280 commit7149282Copy full SHA for 7149282

File tree

+14

-0

lines changed

server/api-service
- lowcoder-infra/src/main/java/org/lowcoder/infra/event
  - AbstractEvent.java
- lowcoder-server/src/main/java/org/lowcoder/runner/eventlistener
  - AppEventListener.java

+14

-0

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`packageorg.lowcoder.infra.event;`
`2`	`2`
`3`	`3`	`importlombok.Getter;`
	`4`	`+importlombok.Setter;`
`4`	`5`	`importlombok.experimental.SuperBuilder;`
`5`	`6`	`importorg.lowcoder.plugin.api.event.LowcoderEvent;`
`6`	`7`
`@@ -18,6 +19,8 @@ public abstract class AbstractEvent implements LowcoderEvent`
`18`	`19`	`protectedfinalBooleanisAnonymous;`
`19`	`20`	`privatefinalStringipAddress;`
`20`	`21`	`protectedMap<String,Object>details;`
	`22`	`+@Setter`
	`23`	`+privatestaticStringdeploymentID;`
`21`	`24`
`22`	`25`	`publicMap<String,Object>details()`
`23`	`26`	`{`
`@@ -33,6 +36,7 @@ public B detail(String name, String value)`
`33`	`36`	`details =newHashMap<>();`
`34`	`37`	`}`
`35`	`38`	`this.details.put(name,value);`
	`39`	`+this.details.put("deploymentID",deploymentID);`
`36`	`40`	`returnself();`
`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`	`}`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,23 @@`
`1`	`1`	`packageorg.lowcoder.runner.eventlistener;`
`2`	`2`
	`3`	`+importlombok.RequiredArgsConstructor;`
	`4`	`+importorg.lowcoder.infra.config.model.ServerConfig;`
	`5`	`+importorg.lowcoder.infra.config.repository.ServerConfigRepository;`
	`6`	`+importorg.lowcoder.infra.event.AbstractEvent;`
`3`	`7`	`importorg.lowcoder.sdk.exception.BizError;`
`4`	`8`	`importorg.springframework.boot.context.event.ApplicationReadyEvent;`
`5`	`9`	`importorg.springframework.context.event.EventListener;`
`6`	`10`	`importorg.springframework.stereotype.Component;`
`7`	`11`
`8`	`12`	`importlombok.extern.slf4j.Slf4j;`
	`13`	`+importreactor.core.publisher.Mono;`
`9`	`14`
`10`	`15`	`@Slf4j`
`11`	`16`	`@Component`
	`17`	`+@RequiredArgsConstructor`
`12`	`18`	`publicclassAppEventListener {`
`13`	`19`
	`20`	`+privatefinalServerConfigRepositoryserverConfigRepository;`
`14`	`21`	`@EventListener`
`15`	`22`	`publicvoidonApplicationEvent(ApplicationReadyEventevent) {`
`16`	`23`	`System.out.println(`
`@@ -23,5 +30,7 @@ public void onApplicationEvent(ApplicationReadyEvent event) {`
`23`	`30`	`"""`
`24`	`31`	`);`
`25`	`32`	`log.info("check BizError duplicates: {}",BizError.values().length);`
	`33`	`+StringdeploymentId = (String)(serverConfigRepository.findByKey("deployment.id").map(ServerConfig::getValue).switchIfEmpty(Mono.just("")).block());`
	`34`	`+AbstractEvent.setDeploymentID(deploymentId);`
`26`	`35`	`}`
`27`	`36`	`}`

Comments

(0)