Skip to content

Commit e969ee5

Browse files
authored
Merge branch 'dev' into concurrency-user-display
2 parents 1d2b53d + 750e6ca commit e969ee5

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/service/ApplicationServiceImpl.java

-1
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,6 @@ public Flux<Application> findAll() {
350350
@Override
351351
public Mono<Boolean> updateLastEditedAt(String applicationId, Instant time, String visitorId) {
352352
return repository.findByIdIn(List.of(applicationId))
353-
.filter(application -> application.getEditingUserId().equals(visitorId))
354353
.doOnNext(application -> application.setLastEditedAt(time))
355354
.doOnNext(application -> application.setEditingUserId(visitorId))
356355
.flatMap(repository::save)

server/api-service/lowcoder-plugins/smtpPlugin/pom.xml

+8-6
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,12 @@
2727
</properties>
2828

2929
<dependencies>
30+
<!-- https://mvnrepository.com/artifact/org.eclipse.angus/all -->
3031
<dependency>
31-
<groupId>jakarta.mail</groupId>
32-
<artifactId>jakarta.mail-api</artifactId>
33-
<version>2.1.3</version>
32+
<groupId>com.sun.mail</groupId>
33+
<artifactId>jakarta.mail</artifactId>
34+
<version>2.0.1</version>
35+
<scope>provided</scope>
3436
</dependency>
3537

3638
<!-- vertx os async but not mature, used in test -->
@@ -105,9 +107,9 @@
105107
</execution>
106108
</executions>
107109
</plugin>
108-
<plugin>
109-
<artifactId>maven-antrun-plugin</artifactId>
110-
</plugin>
110+
<plugin>
111+
<artifactId>maven-antrun-plugin</artifactId>
112+
</plugin>
111113
</plugins>
112114
</build>
113115

0 commit comments

Comments
 (0)