diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/serversetting/service/ServerSettingServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/serversetting/service/ServerSettingServiceImpl.java index d016c29601..ab8ae5fd23 100644 --- a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/serversetting/service/ServerSettingServiceImpl.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/serversetting/service/ServerSettingServiceImpl.java @@ -31,7 +31,9 @@ public class ServerSettingServiceImpl implements ServerSettingService { "LOWCODER_SUPERADMIN_PASSWORD", "LOWCODER_SUPERADMIN_USERNAME", "LOWCODER_SUPERUSER_PASSWORD", - "LOWCODER_SUPERUSER_USERNAME"); + "LOWCODER_SUPERUSER_USERNAME", + "LOWCODER_DB_ENCRYPTION_SALT", + "LOWCODER_DB_ENCRYPTION_PASSWORD"); @Autowired public ServerSettingServiceImpl(ServerSettingRepository repository) { diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationController.java index bff1fff990..b1dd5c556b 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationController.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationController.java @@ -97,31 +97,28 @@ public Mono> getEditingApplication(@PathVariable S @Override public Mono> getPublishedApplication(@PathVariable String applicationId, @RequestParam(required = false) Boolean withDeleted) { return gidService.convertApplicationIdToObjectId(applicationId).flatMap(appId -> - applicationApiService.getEditingApplication(appId, true).flatMap(originalApplicationView -> applicationApiService.getPublishedApplication(appId, ApplicationRequestType.PUBLIC_TO_ALL, withDeleted) .delayUntil(applicationView -> applicationApiService.updateUserApplicationLastViewTime(appId)) - .delayUntil(applicationView -> businessEventPublisher.publishApplicationCommonEvent(originalApplicationView, applicationView, APPLICATION_VIEW)) - .map(ResponseView::success))); + .delayUntil(applicationView -> businessEventPublisher.publishApplicationCommonEvent(applicationView, applicationView, APPLICATION_VIEW)) + .map(ResponseView::success)); } @Override public Mono> getPublishedMarketPlaceApplication(@PathVariable String applicationId) { return gidService.convertApplicationIdToObjectId(applicationId).flatMap(appId -> - applicationApiService.getEditingApplication(appId, true).flatMap(originalApplicationView -> applicationApiService.getPublishedApplication(appId, ApplicationRequestType.PUBLIC_TO_MARKETPLACE, false) .delayUntil(applicationView -> applicationApiService.updateUserApplicationLastViewTime(appId)) - .delayUntil(applicationView -> businessEventPublisher.publishApplicationCommonEvent(originalApplicationView, applicationView, APPLICATION_VIEW)) - .map(ResponseView::success))); + .delayUntil(applicationView -> businessEventPublisher.publishApplicationCommonEvent(applicationView, applicationView, APPLICATION_VIEW)) + .map(ResponseView::success)); } @Override public Mono> getAgencyProfileApplication(@PathVariable String applicationId) { return gidService.convertApplicationIdToObjectId(applicationId).flatMap(appId -> - applicationApiService.getEditingApplication(appId, true).flatMap(originalApplicationView -> applicationApiService.getPublishedApplication(appId, ApplicationRequestType.AGENCY_PROFILE, false) .delayUntil(applicationView -> applicationApiService.updateUserApplicationLastViewTime(appId)) - .delayUntil(applicationView -> businessEventPublisher.publishApplicationCommonEvent(originalApplicationView, applicationView, APPLICATION_VIEW)) - .map(ResponseView::success))); + .delayUntil(applicationView -> businessEventPublisher.publishApplicationCommonEvent(applicationView, applicationView, APPLICATION_VIEW)) + .map(ResponseView::success)); } @Override