Movatterモバイル変換

[0]ホーム
URL:

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

Commit1a50316

Browse files
authored
Merge branch 'dev' into versions-for-datasources
2 parentsb831451 +d63d3a0 commit1a50316

File tree

14 files changed

+129
-103
lines changed

14 files changed

+129
-103
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")BooleanpublicToMarketplace,
6666
@JsonProperty("agencyProfile")BooleanagencyProfile
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/group/service/GroupServiceImpl.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
importjava.util.Collection;
88
importjava.util.Locale;
99

10+
importcom.github.f4b6a3.uuid.UuidCreator;
1011
importlombok.RequiredArgsConstructor;
1112
importorg.lowcoder.domain.group.event.GroupDeletedEvent;
1213
importorg.lowcoder.domain.group.model.Group;
@@ -94,9 +95,11 @@ private Mono<Group> createSystemGroup(String organizationId, String type) {
9495
Groupgroup =Group.builder()
9596
.organizationId(organizationId)
9697
.name(SystemGroups.getName(type,locale))
98+
.gid(UuidCreator.getTimeOrderedEpoch().toString())
9799
.type(type)
98100
.allUsersGroup(type.equals(ALL_USER))
99101
.build();
102+
100103
returnrepository.save(group);
101104
});
102105
}

‎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
packageorg.lowcoder.domain.solutions;
22

3+
importcom.github.f4b6a3.uuid.UuidCreator;
34
importjakarta.annotation.Nonnull;
45
importlombok.RequiredArgsConstructor;
56
importorg.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
Applicationapplication =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
privateMono<String>createNewDatasourceFrom(StringorganizationId,StringvisitorId,Datasourcedatasource) {
133135
DatasourcecopyDatasource =newDatasource();
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
packageorg.lowcoder.api.application;
22

3+
importcom.github.f4b6a3.uuid.UuidCreator;
34
importcom.google.common.collect.Maps;
45
importcom.google.common.collect.Sets;
56
importjakarta.annotation.Nonnull;
@@ -98,7 +99,7 @@ public class ApplicationApiServiceImpl implements ApplicationApiService {
9899
publicMono<ApplicationView>create(CreateApplicationRequestcreateApplicationRequest) {
99100

100101
Applicationapplication =newApplication(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/ApplicationController.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
importorg.lowcoder.api.home.UserHomeApiService;
2323
importorg.lowcoder.api.home.UserHomepageView;
2424
importorg.lowcoder.api.util.BusinessEventPublisher;
25-
importorg.lowcoder.api.util.GIDUtil;
25+
importorg.lowcoder.api.util.GidService;
2626
importorg.lowcoder.domain.application.model.Application;
2727
importorg.lowcoder.domain.application.model.ApplicationRequestType;
2828
importorg.lowcoder.domain.application.model.ApplicationStatus;
@@ -44,7 +44,7 @@ public class ApplicationController implements ApplicationEndpoints {
4444
privatefinalApplicationApiServiceapplicationApiService;
4545
privatefinalBusinessEventPublisherbusinessEventPublisher;
4646
privatefinalSessionUserServicesessionUserService;
47-
privatefinalGIDUtilgidUtil;
47+
privatefinalGidServicegidService;
4848

4949
@Override
5050
publicMono<ResponseView<ApplicationView>>create(@RequestBodyCreateApplicationRequestcreateApplicationRequest) {
@@ -62,15 +62,15 @@ public Mono<ResponseView<ApplicationView>> createFromTemplate(@RequestParam Stri
6262

6363
@Override
6464
publicMono<ResponseView<Boolean>>recycle(@PathVariableStringapplicationId) {
65-
StringappId =gidUtil.convertApplicationIdToObjectId(applicationId);
65+
StringappId =gidService.convertApplicationIdToObjectId(applicationId);
6666
returnapplicationApiService.recycle(appId)
6767
.delayUntil(__ ->businessEventPublisher.publishApplicationCommonEvent(applicationId,null,APPLICATION_RECYCLED))
6868
.map(ResponseView::success);
6969
}
7070

7171
@Override
7272
publicMono<ResponseView<Boolean>>restore(@PathVariableStringapplicationId) {
73-
StringappId =gidUtil.convertApplicationIdToObjectId(applicationId);
73+
StringappId =gidService.convertApplicationIdToObjectId(applicationId);
7474
returnapplicationApiService.restore(appId)
7575
.delayUntil(__ ->businessEventPublisher.publishApplicationCommonEvent(applicationId,null,APPLICATION_RESTORE))
7676
.map(ResponseView::success);
@@ -85,23 +85,23 @@ public Mono<ResponseView<List<ApplicationInfoView>>> getRecycledApplications() {
8585

8686
@Override
8787
publicMono<ResponseView<ApplicationView>>delete(@PathVariableStringapplicationId) {
88-
StringappId =gidUtil.convertApplicationIdToObjectId(applicationId);
88+
StringappId =gidService.convertApplicationIdToObjectId(applicationId);
8989
returnapplicationApiService.delete(appId)
9090
.delayUntil(applicationView ->businessEventPublisher.publishApplicationCommonEvent(applicationView,APPLICATION_DELETE))
9191
.map(ResponseView::success);
9292
}
9393

9494
@Override
9595
publicMono<ResponseView<ApplicationView>>getEditingApplication(@PathVariableStringapplicationId) {
96-
StringappId =gidUtil.convertApplicationIdToObjectId(applicationId);
96+
StringappId =gidService.convertApplicationIdToObjectId(applicationId);
9797
returnapplicationApiService.getEditingApplication(appId)
9898
.delayUntil(__ ->applicationApiService.updateUserApplicationLastViewTime(appId))
9999
.map(ResponseView::success);
100100
}
101101

102102
@Override
103103
publicMono<ResponseView<ApplicationView>>getPublishedApplication(@PathVariableStringapplicationId) {
104-
StringappId =gidUtil.convertApplicationIdToObjectId(applicationId);
104+
StringappId =gidService.convertApplicationIdToObjectId(applicationId);
105105
returnapplicationApiService.getPublishedApplication(appId,ApplicationRequestType.PUBLIC_TO_ALL)
106106
.delayUntil(applicationView ->applicationApiService.updateUserApplicationLastViewTime(appId))
107107
.delayUntil(applicationView ->businessEventPublisher.publishApplicationCommonEvent(applicationView,APPLICATION_VIEW))
@@ -110,7 +110,7 @@ public Mono<ResponseView<ApplicationView>> getPublishedApplication(@PathVariable
110110

111111
@Override
112112
publicMono<ResponseView<ApplicationView>>getPublishedMarketPlaceApplication(@PathVariableStringapplicationId) {
113-
StringappId =gidUtil.convertApplicationIdToObjectId(applicationId);
113+
StringappId =gidService.convertApplicationIdToObjectId(applicationId);
114114
returnapplicationApiService.getPublishedApplication(appId,ApplicationRequestType.PUBLIC_TO_MARKETPLACE)
115115
.delayUntil(applicationView ->applicationApiService.updateUserApplicationLastViewTime(appId))
116116
.delayUntil(applicationView ->businessEventPublisher.publishApplicationCommonEvent(applicationView,APPLICATION_VIEW))
@@ -119,7 +119,7 @@ public Mono<ResponseView<ApplicationView>> getPublishedMarketPlaceApplication(@P
119119

120120
@Override
121121
publicMono<ResponseView<ApplicationView>>getAgencyProfileApplication(@PathVariableStringapplicationId) {
122-
StringappId =gidUtil.convertApplicationIdToObjectId(applicationId);
122+
StringappId =gidService.convertApplicationIdToObjectId(applicationId);
123123
returnapplicationApiService.getPublishedApplication(appId,ApplicationRequestType.AGENCY_PROFILE)
124124
.delayUntil(applicationView ->applicationApiService.updateUserApplicationLastViewTime(appId))
125125
.delayUntil(applicationView ->businessEventPublisher.publishApplicationCommonEvent(applicationView,APPLICATION_VIEW))
@@ -129,15 +129,15 @@ public Mono<ResponseView<ApplicationView>> getAgencyProfileApplication(@PathVari
129129
@Override
130130
publicMono<ResponseView<ApplicationView>>update(@PathVariableStringapplicationId,
131131
@RequestBodyApplicationnewApplication) {
132-
StringappId =gidUtil.convertApplicationIdToObjectId(applicationId);
132+
StringappId =gidService.convertApplicationIdToObjectId(applicationId);
133133
returnapplicationApiService.update(appId,newApplication)
134134
.delayUntil(applicationView ->businessEventPublisher.publishApplicationCommonEvent(applicationView,APPLICATION_UPDATE))
135135
.map(ResponseView::success);
136136
}
137137

138138
@Override
139139
publicMono<ResponseView<ApplicationView>>publish(@PathVariableStringapplicationId) {
140-
StringappId =gidUtil.convertApplicationIdToObjectId(applicationId);
140+
StringappId =gidService.convertApplicationIdToObjectId(applicationId);
141141
returnapplicationApiService.publish(appId)
142142
.map(ResponseView::success);
143143
}
@@ -179,7 +179,7 @@ public Mono<ResponseView<List<MarketplaceApplicationInfoView>>> getAgencyProfile
179179
publicMono<ResponseView<Boolean>>updatePermission(@PathVariableStringapplicationId,
180180
@PathVariableStringpermissionId,
181181
@RequestBodyUpdatePermissionRequestupdatePermissionRequest) {
182-
StringappId =gidUtil.convertApplicationIdToObjectId(applicationId);
182+
StringappId =gidService.convertApplicationIdToObjectId(applicationId);
183183
ResourceRolerole =ResourceRole.fromValue(updatePermissionRequest.role());
184184
if (role ==null) {
185185
returnofError(INVALID_PARAMETER,"INVALID_PARAMETER",updatePermissionRequest);
@@ -193,7 +193,7 @@ public Mono<ResponseView<Boolean>> updatePermission(@PathVariable String applica
193193
publicMono<ResponseView<Boolean>>removePermission(
194194
@PathVariableStringapplicationId,
195195
@PathVariableStringpermissionId) {
196-
StringappId =gidUtil.convertApplicationIdToObjectId(applicationId);
196+
StringappId =gidService.convertApplicationIdToObjectId(applicationId);
197197

198198
returnapplicationApiService.removePermission(appId,permissionId)
199199
.map(ResponseView::success);
@@ -203,7 +203,7 @@ public Mono<ResponseView<Boolean>> removePermission(
203203
publicMono<ResponseView<Boolean>>grantPermission(
204204
@PathVariableStringapplicationId,
205205
@RequestBodyBatchAddPermissionRequestrequest) {
206-
StringappId =gidUtil.convertApplicationIdToObjectId(applicationId);
206+
StringappId =gidService.convertApplicationIdToObjectId(applicationId);
207207
ResourceRolerole =ResourceRole.fromValue(request.role());
208208
if (role ==null) {
209209
returnofError(INVALID_PARAMETER,"INVALID_PARAMETER",request.role());
@@ -218,31 +218,31 @@ public Mono<ResponseView<Boolean>> grantPermission(
218218

219219
@Override
220220
publicMono<ResponseView<ApplicationPermissionView>>getApplicationPermissions(@PathVariableStringapplicationId) {
221-
StringappId =gidUtil.convertApplicationIdToObjectId(applicationId);
221+
StringappId =gidService.convertApplicationIdToObjectId(applicationId);
222222
returnapplicationApiService.getApplicationPermissions(appId)
223223
.map(ResponseView::success);
224224
}
225225

226226
@Override
227227
publicMono<ResponseView<Boolean>>setApplicationPublicToAll(@PathVariableStringapplicationId,
228228
@RequestBodyApplicationPublicToAllRequestrequest) {
229-
StringappId =gidUtil.convertApplicationIdToObjectId(applicationId);
229+
StringappId =gidService.convertApplicationIdToObjectId(applicationId);
230230
returnapplicationApiService.setApplicationPublicToAll(appId,request.publicToAll())
231231
.map(ResponseView::success);
232232
}
233233

234234
@Override
235235
publicMono<ResponseView<Boolean>>setApplicationPublicToMarketplace(@PathVariableStringapplicationId,
236236
@RequestBodyApplicationPublicToMarketplaceRequestrequest) {
237-
StringappId =gidUtil.convertApplicationIdToObjectId(applicationId);
237+
StringappId =gidService.convertApplicationIdToObjectId(applicationId);
238238
returnapplicationApiService.setApplicationPublicToMarketplace(appId,request)
239239
.map(ResponseView::success);
240240
}
241241

242242
@Override
243243
publicMono<ResponseView<Boolean>>setApplicationAsAgencyProfile(@PathVariableStringapplicationId,
244244
@RequestBodyApplicationAsAgencyProfileRequestrequest) {
245-
StringappId =gidUtil.convertApplicationIdToObjectId(applicationId);
245+
StringappId =gidService.convertApplicationIdToObjectId(applicationId);
246246
returnapplicationApiService.setApplicationAsAgencyProfile(appId,request.agencyProfile())
247247
.map(ResponseView::success);
248248
}

‎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
publicrecordCreateApplicationRequest(@JsonProperty("orgId")StringorganizationId,
282-
Stringgid,
283282
Stringname,
284283
IntegerapplicationType,
285284
Map<String,Object>publishedApplicationDSL,

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp