Skip to content

Commit ab5747f

Browse files
author
Thomasr
committed
fix gid issue when creating an app
1 parent f7f7261 commit ab5747f

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public Application(
6565
@JsonProperty("publicToMarketplace") Boolean publicToMarketplace,
6666
@JsonProperty("agencyProfile") Boolean agencyProfile
6767
) {
68-
this.gid = StringUtils.isEmpty(gid)?UuidCreator.getTimeOrderedEpoch().toString():gid;
68+
this.gid = gid;
6969
this.organizationId = organizationId;
7070
this.name = name;
7171
this.applicationType = applicationType;

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/solutions/TemplateSolutionServiceImpl.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.lowcoder.domain.solutions;
22

3+
import com.github.f4b6a3.uuid.UuidCreator;
34
import jakarta.annotation.Nonnull;
45
import lombok.RequiredArgsConstructor;
56
import org.apache.commons.lang3.RandomStringUtils;
@@ -65,6 +66,7 @@ public Mono<Application> createFromTemplate(String templateId, String orgId, Str
6566
Map<String, Object> applicationDSL = JsonUtils.fromJsonMap(dsl);
6667
Application application = Application.builder()
6768
.applicationStatus(ApplicationStatus.NORMAL)
69+
.gid(UuidCreator.getTimeOrderedEpoch().toString())
6870
.organizationId(organizationId)
6971
.name(template.getName())
7072
.editingApplicationDSL(applicationDSL)
@@ -132,7 +134,7 @@ private Mono<String> doCopyDatasource(String organizationId, String datasourceId
132134
private Mono<String> createNewDatasourceFrom(String organizationId, String visitorId, Datasource datasource) {
133135
Datasource copyDatasource = new Datasource();
134136
copyDatasource.setName(generateCopyDatasourceName(datasource.getName()));
135-
copyDatasource.setGid(datasource.getGid());
137+
copyDatasource.setGid(UuidCreator.getTimeOrderedEpoch().toString());
136138
copyDatasource.setType(datasource.getType());
137139
copyDatasource.setDetailConfig(datasource.getDetailConfig());
138140
copyDatasource.setCreationSource(DatasourceCreationSource.CLONE_FROM_TEMPLATE.getValue());

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.lowcoder.api.application;
22

3+
import com.github.f4b6a3.uuid.UuidCreator;
34
import com.google.common.collect.Maps;
45
import com.google.common.collect.Sets;
56
import jakarta.annotation.Nonnull;
@@ -98,7 +99,7 @@ public class ApplicationApiServiceImpl implements ApplicationApiService {
9899
public Mono<ApplicationView> create(CreateApplicationRequest createApplicationRequest) {
99100

100101
Application application = new Application(createApplicationRequest.organizationId(),
101-
createApplicationRequest.gid(),
102+
UuidCreator.getTimeOrderedEpoch().toString(),
102103
createApplicationRequest.name(),
103104
createApplicationRequest.applicationType(),
104105
NORMAL,

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,6 @@ public record UpdatePermissionRequest(String role) {
279279
}
280280

281281
public record CreateApplicationRequest(@JsonProperty("orgId") String organizationId,
282-
String gid,
283282
String name,
284283
Integer applicationType,
285284
Map<String, Object> publishedApplicationDSL,

0 commit comments

Comments
 (0)