Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 3967225

Browse files
Merge branch 'dev' into feature-horizontal-list
2 parents 43ec591 + 530533d commit 3967225

File tree

84 files changed

+551
-583
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+551
-583
lines changed

‎deploy/docker/Dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ RUN --mount=type=cache,target=/root/.m2 mvn -f pom.xml clean package -DskipTests
1212
RUN mkdir -p /lowcoder/api-service/config /lowcoder/api-service/logs /lowcoder/plugins
1313

1414
# Copy lowcoder server configuration
15-
COPY server/api-service/lowcoder-server/src/main/resources/selfhost/ce/application.yml /lowcoder/api-service/config/
16-
COPY server/api-service/lowcoder-server/src/main/resources/selfhost/ce/application-selfhost.yml /lowcoder/api-service/config/
15+
COPY server/api-service/lowcoder-server/src/main/resources/application.yaml /lowcoder/api-service/config/
1716

1817
# Add bootstrapfile
1918
COPY deploy/docker/api-service/entrypoint.sh /lowcoder/api-service/entrypoint.sh

‎deploy/docker/api-service/entrypoint.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ exec gosu ${USER_ID}:${GROUP_ID} ${JAVA_HOME}/bin/java \
3434
-Djava.security.egd=file:/dev/./urandom \
3535
-Dhttps.protocols=TLSv1.1,TLSv1.2 \
3636
-Dlog4j2.formatMsgNoLookups=true \
37-
-Dspring.config.location="file:///lowcoder/api-service/config/application.yml,file:///lowcoder/api-service/config/application-selfhost.yml" \
37+
-Dspring.config.location="file:///lowcoder/api-service/config/application.yaml" \
3838
--add-opens java.base/java.nio=ALL-UNNAMED \
3939
-cp "${LOWCODER_CLASSPATH:=.}" \
4040
${JAVA_OPTS} \

‎server/api-service/lowcoder-dependencies/pom.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<dependency>
4545
<groupId>org.projectlombok</groupId>
4646
<artifactId>lombok</artifactId>
47-
<version>1.18.26</version>
47+
<version>1.18.32</version>
4848
</dependency>
4949

5050
<dependency>
@@ -222,7 +222,5 @@
222222
</dependency>
223223
</dependencies>
224224
</dependencyManagement>
225-
226-
227225
</project>
228226

‎server/api-service/lowcoder-domain/pom.xml‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -252,18 +252,6 @@
252252

253253
<build>
254254
<plugins>
255-
<plugin>
256-
<groupId>org.apache.maven.plugins</groupId>
257-
<artifactId>maven-compiler-plugin</artifactId>
258-
<configuration>
259-
<source>${java.version}</source>
260-
<target>${java.version}</target>
261-
<compilerArgs>
262-
<arg>-parameters</arg>
263-
</compilerArgs>
264-
</configuration>
265-
</plugin>
266-
267255
<plugin>
268256
<groupId>com.mysema.maven</groupId>
269257
<artifactId>apt-maven-plugin</artifactId>
@@ -291,8 +279,6 @@
291279
<properties>
292280
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
293281
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
294-
295-
<java.version>17</java.version>
296282
</properties>
297283

298284
<dependencyManagement>

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/Application.java‎

Lines changed: 33 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@
1212
import java.util.Set;
1313
import java.util.function.Supplier;
1414

15+
import lombok.NoArgsConstructor;
1516
import lombok.Setter;
17+
import lombok.experimental.SuperBuilder;
18+
import lombok.extern.jackson.Jacksonized;
1619
import org.apache.commons.collections4.MapUtils;
1720
import org.apache.commons.lang3.BooleanUtils;
1821
import org.lowcoder.domain.query.model.ApplicationQuery;
@@ -30,14 +33,18 @@
3033
import lombok.Builder;
3134

3235
@Document
36+
@Jacksonized
37+
@SuperBuilder
38+
@NoArgsConstructor
3339
public class Application extends HasIdAndAuditing {
3440

35-
private finalString organizationId;
36-
private finalString name;
37-
private finalInteger applicationType;
38-
private finalApplicationStatus applicationStatus;
41+
private String organizationId;
42+
private String name;
43+
private Integer applicationType;
44+
private ApplicationStatus applicationStatus;
3945

40-
private final Map<String, Object> publishedApplicationDSL;
46+
private Map<String, Object> publishedApplicationDSL;
47+
private Map<String, Object> editingApplicationDSL;
4148

4249
@Setter
4350
private Boolean publicToAll;
@@ -46,7 +53,27 @@ public class Application extends HasIdAndAuditing {
4653
@Setter
4754
private Boolean agencyProfile;
4855

49-
private Map<String, Object> editingApplicationDSL;
56+
public Application(
57+
@JsonProperty("orgId") String organizationId,
58+
@JsonProperty("name") String name,
59+
@JsonProperty("applicationType") Integer applicationType,
60+
@JsonProperty("applicationStatus") ApplicationStatus applicationStatus,
61+
@JsonProperty("publishedApplicationDSL") Map<String, Object> publishedApplicationDSL,
62+
@JsonProperty("editingApplicationDSL") Map<String, Object> editingApplicationDSL,
63+
@JsonProperty("publicToAll") Boolean publicToAll,
64+
@JsonProperty("publicToMarketplace") Boolean publicToMarketplace,
65+
@JsonProperty("agencyProfile") Boolean agencyProfile
66+
) {
67+
this.organizationId = organizationId;
68+
this.name = name;
69+
this.applicationType = applicationType;
70+
this.applicationStatus = applicationStatus;
71+
this.publishedApplicationDSL = publishedApplicationDSL;
72+
this.publicToAll = publicToAll;
73+
this.publicToMarketplace = publicToMarketplace;
74+
this.agencyProfile = agencyProfile;
75+
this.editingApplicationDSL = editingApplicationDSL;
76+
}
5077

5178
@Transient
5279
private final Supplier<Set<ApplicationQuery>> editingQueries =
@@ -73,31 +100,6 @@ public class Application extends HasIdAndAuditing {
73100
return getContainerSizeFromDSL(getLiveApplicationDsl());
74101
});
75102

76-
77-
@Builder
78-
@JsonCreator
79-
public Application(
80-
@JsonProperty("orgId") String organizationId,
81-
@JsonProperty("name") String name,
82-
@JsonProperty("applicationType") Integer applicationType,
83-
@JsonProperty("applicationStatus") ApplicationStatus applicationStatus,
84-
@JsonProperty("publishedApplicationDSL") Map<String, Object> publishedApplicationDSL,
85-
@JsonProperty("editingApplicationDSL") Map<String, Object> editingApplicationDSL,
86-
@JsonProperty("publicToAll") Boolean publicToAll,
87-
@JsonProperty("publicToMarketplace") Boolean publicToMarketplace,
88-
@JsonProperty("agencyProfile") Boolean agencyProfile
89-
) {
90-
this.organizationId = organizationId;
91-
this.name = name;
92-
this.applicationType = applicationType;
93-
this.applicationStatus = applicationStatus;
94-
this.publishedApplicationDSL = publishedApplicationDSL;
95-
this.publicToAll = publicToAll;
96-
this.publicToMarketplace = publicToMarketplace;
97-
this.agencyProfile = agencyProfile;
98-
this.editingApplicationDSL = editingApplicationDSL;
99-
}
100-
101103
public Set<ApplicationQuery> getEditingQueries() {
102104
return editingQueries.get();
103105
}

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/ApplicationHistorySnapshot.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.util.Map;
44

5+
import lombok.NoArgsConstructor;
56
import org.lowcoder.sdk.models.HasIdAndAuditing;
67
import org.springframework.data.mongodb.core.mapping.Document;
78

@@ -13,6 +14,7 @@
1314
@Document
1415
@Getter
1516
@Setter
17+
@NoArgsConstructor
1618
public class ApplicationHistorySnapshot extends HasIdAndAuditing {
1719

1820
private String applicationId;

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/UiItem.java‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/asset/model/Asset.java‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,29 @@
11
package org.lowcoder.domain.asset.model;
22

3+
import lombok.NoArgsConstructor;
4+
import lombok.experimental.SuperBuilder;
5+
import lombok.extern.jackson.Jacksonized;
36
import org.lowcoder.sdk.models.HasIdAndAuditing;
47
import org.springframework.data.mongodb.core.mapping.Document;
58
import org.springframework.http.MediaType;
69

710
import com.fasterxml.jackson.annotation.JsonCreator;
811

912
@Document
13+
@Jacksonized
14+
@SuperBuilder
15+
@NoArgsConstructor
1016
public class Asset extends HasIdAndAuditing {
1117

12-
private finalString contentType;
18+
private String contentType;
1319

14-
private final byte[] data;
15-
16-
@JsonCreator
17-
private Asset(String contentType, byte[] data) {
18-
this.contentType = contentType;
19-
this.data = data;
20-
}
20+
private byte[] data;
2121

2222
public static Asset from(MediaType mediaType, byte[] data) {
23-
return new Asset(mediaType == null ? null : mediaType.toString(), data);
23+
return Asset.builder()
24+
.contentType(mediaType == null ? null : mediaType.toString())
25+
.data(data)
26+
.build();
2427
}
2528

2629
public String getContentType() {

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/Datasource.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@
1111

1212
import javax.annotation.Nullable;
1313

14+
import com.fasterxml.jackson.annotation.JsonCreator;
15+
import lombok.AllArgsConstructor;
16+
import lombok.NoArgsConstructor;
17+
import lombok.experimental.SuperBuilder;
18+
import lombok.extern.jackson.Jacksonized;
1419
import org.apache.commons.lang3.ObjectUtils;
1520
import org.lowcoder.domain.plugin.DatasourceMetaInfoConstants;
1621
import org.lowcoder.domain.plugin.client.dto.DatasourcePluginDefinition;
@@ -28,9 +33,13 @@
2833

2934
import lombok.Getter;
3035
import lombok.Setter;
36+
import org.springframework.data.mongodb.core.mapping.Document;
3137

3238
@Getter
3339
@Setter
40+
@SuperBuilder
41+
@Jacksonized
42+
@NoArgsConstructor
3443
public class Datasource extends HasIdAndAuditing {
3544

3645
private static final DatasourceStatus DEFAULT_STATUS = DatasourceStatus.NORMAL;

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/DatasourceDO.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
import java.util.Map;
44

5+
import com.fasterxml.jackson.annotation.JsonCreator;
6+
import lombok.AllArgsConstructor;
7+
import lombok.NoArgsConstructor;
8+
import lombok.experimental.SuperBuilder;
9+
import lombok.extern.jackson.Jacksonized;
510
import org.lowcoder.sdk.models.HasIdAndAuditing;
611
import org.springframework.data.mongodb.core.mapping.Document;
712

@@ -14,6 +19,10 @@
1419
@Document(collection = "datasource")
1520
@Getter
1621
@Setter
22+
@Jacksonized
23+
@SuperBuilder
24+
@NoArgsConstructor
25+
@AllArgsConstructor(onConstructor_ = { @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)})
1726
public class DatasourceDO extends HasIdAndAuditing {
1827

1928
private String name;

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /