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

Commit0838e42

Browse files
Thomasrludomikula
Thomasr
authored andcommitted
Fix issue that gid api blocked
1 parent1500c55 commit0838e42

File tree

8 files changed

+258
-267
lines changed

8 files changed

+258
-267
lines changed

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

Lines changed: 53 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -58,18 +58,18 @@ public Mono<ResponseView<ApplicationView>> createFromTemplate(@RequestParam Stri
5858

5959
@Override
6060
publicMono<ResponseView<Boolean>>recycle(@PathVariableStringapplicationId) {
61-
StringappId =gidService.convertApplicationIdToObjectId(applicationId);
62-
returnapplicationApiService.recycle(appId)
63-
.delayUntil(__ ->businessEventPublisher.publishApplicationCommonEvent(applicationId,null,APPLICATION_RECYCLED))
64-
.map(ResponseView::success);
61+
returngidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
62+
applicationApiService.recycle(appId)
63+
.delayUntil(__ ->businessEventPublisher.publishApplicationCommonEvent(applicationId,null,APPLICATION_RECYCLED))
64+
.map(ResponseView::success));
6565
}
6666

6767
@Override
6868
publicMono<ResponseView<Boolean>>restore(@PathVariableStringapplicationId) {
69-
StringappId =gidService.convertApplicationIdToObjectId(applicationId);
70-
returnapplicationApiService.restore(appId)
69+
returngidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
70+
applicationApiService.restore(appId)
7171
.delayUntil(__ ->businessEventPublisher.publishApplicationCommonEvent(applicationId,null,APPLICATION_RESTORE))
72-
.map(ResponseView::success);
72+
.map(ResponseView::success));
7373
}
7474

7575
@Override
@@ -81,68 +81,68 @@ public Mono<ResponseView<List<ApplicationInfoView>>> getRecycledApplications(@Re
8181

8282
@Override
8383
publicMono<ResponseView<ApplicationView>>delete(@PathVariableStringapplicationId) {
84-
StringappId =gidService.convertApplicationIdToObjectId(applicationId);
85-
returnapplicationApiService.delete(appId)
84+
returngidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
85+
applicationApiService.delete(appId)
8686
.delayUntil(applicationView ->businessEventPublisher.publishApplicationCommonEvent(applicationView,APPLICATION_DELETE))
87-
.map(ResponseView::success);
87+
.map(ResponseView::success));
8888
}
8989

9090
@Override
9191
publicMono<ResponseView<ApplicationView>>getEditingApplication(@PathVariableStringapplicationId) {
92-
StringappId =gidService.convertApplicationIdToObjectId(applicationId);
93-
returnapplicationApiService.getEditingApplication(appId)
92+
returngidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
93+
applicationApiService.getEditingApplication(appId)
9494
.delayUntil(__ ->applicationApiService.updateUserApplicationLastViewTime(appId))
95-
.map(ResponseView::success);
95+
.map(ResponseView::success));
9696
}
9797

9898
@Override
9999
publicMono<ResponseView<ApplicationView>>getPublishedApplication(@PathVariableStringapplicationId) {
100-
StringappId =gidService.convertApplicationIdToObjectId(applicationId);
101-
returnapplicationApiService.getPublishedApplication(appId,ApplicationRequestType.PUBLIC_TO_ALL)
100+
returngidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
101+
applicationApiService.getPublishedApplication(appId,ApplicationRequestType.PUBLIC_TO_ALL)
102102
.delayUntil(applicationView ->applicationApiService.updateUserApplicationLastViewTime(appId))
103103
.delayUntil(applicationView ->businessEventPublisher.publishApplicationCommonEvent(applicationView,APPLICATION_VIEW))
104-
.map(ResponseView::success);
104+
.map(ResponseView::success));
105105
}
106106

107107
@Override
108108
publicMono<ResponseView<ApplicationView>>getPublishedMarketPlaceApplication(@PathVariableStringapplicationId) {
109-
StringappId =gidService.convertApplicationIdToObjectId(applicationId);
110-
returnapplicationApiService.getPublishedApplication(appId,ApplicationRequestType.PUBLIC_TO_MARKETPLACE)
109+
returngidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
110+
applicationApiService.getPublishedApplication(appId,ApplicationRequestType.PUBLIC_TO_MARKETPLACE)
111111
.delayUntil(applicationView ->applicationApiService.updateUserApplicationLastViewTime(appId))
112112
.delayUntil(applicationView ->businessEventPublisher.publishApplicationCommonEvent(applicationView,APPLICATION_VIEW))
113-
.map(ResponseView::success);
113+
.map(ResponseView::success));
114114
}
115115

116116
@Override
117117
publicMono<ResponseView<ApplicationView>>getAgencyProfileApplication(@PathVariableStringapplicationId) {
118-
StringappId =gidService.convertApplicationIdToObjectId(applicationId);
119-
returnapplicationApiService.getPublishedApplication(appId,ApplicationRequestType.AGENCY_PROFILE)
118+
returngidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
119+
applicationApiService.getPublishedApplication(appId,ApplicationRequestType.AGENCY_PROFILE)
120120
.delayUntil(applicationView ->applicationApiService.updateUserApplicationLastViewTime(appId))
121121
.delayUntil(applicationView ->businessEventPublisher.publishApplicationCommonEvent(applicationView,APPLICATION_VIEW))
122-
.map(ResponseView::success);
122+
.map(ResponseView::success));
123123
}
124124

125125
@Override
126126
publicMono<ResponseView<ApplicationView>>update(@PathVariableStringapplicationId,
127127
@RequestBodyApplicationnewApplication) {
128-
StringappId =gidService.convertApplicationIdToObjectId(applicationId);
129-
returnapplicationApiService.update(appId,newApplication)
128+
returngidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
129+
applicationApiService.update(appId,newApplication)
130130
.delayUntil(applicationView ->businessEventPublisher.publishApplicationCommonEvent(applicationView,APPLICATION_UPDATE))
131-
.map(ResponseView::success);
131+
.map(ResponseView::success));
132132
}
133133

134134
@Override
135135
publicMono<ResponseView<ApplicationView>>publish(@PathVariableStringapplicationId) {
136-
StringappId =gidService.convertApplicationIdToObjectId(applicationId);
137-
returnapplicationApiService.publish(appId)
138-
.map(ResponseView::success);
136+
returngidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
137+
applicationApiService.publish(appId)
138+
.map(ResponseView::success));
139139
}
140140

141141
@Override
142142
publicMono<ResponseView<Boolean>>updateEditState(@PathVariableStringapplicationId,@RequestBodyUpdateEditStateRequestupdateEditStateRequest) {
143-
StringappId =gidService.convertApplicationIdToObjectId(applicationId);
144-
returnapplicationApiService.updateEditState(appId,updateEditStateRequest)
145-
.map(ResponseView::success);
143+
returngidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
144+
applicationApiService.updateEditState(appId,updateEditStateRequest)
145+
.map(ResponseView::success));
146146
}
147147

148148
@Override
@@ -197,72 +197,71 @@ public Mono<ResponseView<List<MarketplaceApplicationInfoView>>> getAgencyProfile
197197
publicMono<ResponseView<Boolean>>updatePermission(@PathVariableStringapplicationId,
198198
@PathVariableStringpermissionId,
199199
@RequestBodyUpdatePermissionRequestupdatePermissionRequest) {
200-
StringappId =gidService.convertApplicationIdToObjectId(applicationId);
200+
201201
ResourceRolerole =ResourceRole.fromValue(updatePermissionRequest.role());
202202
if (role ==null) {
203203
returnofError(INVALID_PARAMETER,"INVALID_PARAMETER",updatePermissionRequest);
204204
}
205-
206-
returnapplicationApiService.updatePermission(appId,permissionId,role)
207-
.map(ResponseView::success);
205+
returngidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
206+
applicationApiService.updatePermission(appId,permissionId,role)
207+
.map(ResponseView::success));
208208
}
209209

210210
@Override
211211
publicMono<ResponseView<Boolean>>removePermission(
212212
@PathVariableStringapplicationId,
213213
@PathVariableStringpermissionId) {
214-
StringappId =gidService.convertApplicationIdToObjectId(applicationId);
215-
216-
returnapplicationApiService.removePermission(appId,permissionId)
217-
.map(ResponseView::success);
214+
returngidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
215+
applicationApiService.removePermission(appId,permissionId)
216+
.map(ResponseView::success));
218217
}
219218

220219
@Override
221220
publicMono<ResponseView<Boolean>>grantPermission(
222221
@PathVariableStringapplicationId,
223222
@RequestBodyBatchAddPermissionRequestrequest) {
224-
StringappId =gidService.convertApplicationIdToObjectId(applicationId);
225223
ResourceRolerole =ResourceRole.fromValue(request.role());
226224
if (role ==null) {
227225
returnofError(INVALID_PARAMETER,"INVALID_PARAMETER",request.role());
228226
}
229-
returnapplicationApiService.grantPermission(appId,
227+
returngidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
228+
applicationApiService.grantPermission(appId,
230229
emptyIfNull(request.userIds()),
231230
emptyIfNull(request.groupIds()),
232231
role)
233-
.map(ResponseView::success);
232+
.map(ResponseView::success));
234233
}
235234

236235

237236
@Override
238237
publicMono<ResponseView<ApplicationPermissionView>>getApplicationPermissions(@PathVariableStringapplicationId) {
239-
StringappId =gidService.convertApplicationIdToObjectId(applicationId);
240-
returnapplicationApiService.getApplicationPermissions(appId)
241-
.map(ResponseView::success);
238+
returngidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
239+
applicationApiService.getApplicationPermissions(appId)
240+
.map(ResponseView::success));
242241
}
243242

244243
@Override
245244
publicMono<ResponseView<Boolean>>setApplicationPublicToAll(@PathVariableStringapplicationId,
246245
@RequestBodyApplicationPublicToAllRequestrequest) {
247-
StringappId =gidService.convertApplicationIdToObjectId(applicationId);
248-
returnapplicationApiService.setApplicationPublicToAll(appId,request.publicToAll())
249-
.map(ResponseView::success);
246+
returngidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
247+
applicationApiService.setApplicationPublicToAll(appId,request.publicToAll())
248+
.map(ResponseView::success));
250249
}
251250

252251
@Override
253252
publicMono<ResponseView<Boolean>>setApplicationPublicToMarketplace(@PathVariableStringapplicationId,
254253
@RequestBodyApplicationPublicToMarketplaceRequestrequest) {
255-
StringappId =gidService.convertApplicationIdToObjectId(applicationId);
256-
returnapplicationApiService.setApplicationPublicToMarketplace(appId,request)
257-
.map(ResponseView::success);
254+
returngidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
255+
applicationApiService.setApplicationPublicToMarketplace(appId,request)
256+
.map(ResponseView::success));
258257
}
259258

260259
@Override
261260
publicMono<ResponseView<Boolean>>setApplicationAsAgencyProfile(@PathVariableStringapplicationId,
262261
@RequestBodyApplicationAsAgencyProfileRequestrequest) {
263-
StringappId =gidService.convertApplicationIdToObjectId(applicationId);
264-
returnapplicationApiService.setApplicationAsAgencyProfile(appId,request.agencyProfile())
265-
.map(ResponseView::success);
262+
returngidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
263+
applicationApiService.setApplicationAsAgencyProfile(appId,request.agencyProfile())
264+
.map(ResponseView::success));
266265
}
267266

268267

0 commit comments

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