dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change order for EdgeSyncCursor: up resource to top, cuz all entities which 'hasImage' should have link for resource

Browse Source
This commit is contained in:
Andrii Landiak 2023-12-08 14:06:05 +02:00
parent 2378f2ec2d
commit c48737be47
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeSyncCursor.java
View File

@ -56,6 +56,8 @@ public class EdgeSyncCursor {
if (fullSync) { if (fullSync) {
fetchers.add(new TenantEdgeEventFetcher(ctx.getTenantService())); fetchers.add(new TenantEdgeEventFetcher(ctx.getTenantService()));
fetchers.add(new QueuesEdgeEventFetcher(ctx.getQueueService())); fetchers.add(new QueuesEdgeEventFetcher(ctx.getQueueService()));
fetchers.add(new SystemResourcesEdgeEventFetcher(ctx.getResourceService()));
fetchers.add(new TenantResourcesEdgeEventFetcher(ctx.getResourceService()));
fetchers.add(new RuleChainsEdgeEventFetcher(ctx.getRuleChainService())); fetchers.add(new RuleChainsEdgeEventFetcher(ctx.getRuleChainService()));
fetchers.add(new AdminSettingsEdgeEventFetcher(ctx.getAdminSettingsService())); fetchers.add(new AdminSettingsEdgeEventFetcher(ctx.getAdminSettingsService()));
fetchers.add(new TenantAdminUsersEdgeEventFetcher(ctx.getUserService())); fetchers.add(new TenantAdminUsersEdgeEventFetcher(ctx.getUserService()));
@ -79,8 +81,6 @@ public class EdgeSyncCursor {
fetchers.add(new SystemWidgetsBundlesEdgeEventFetcher(ctx.getWidgetsBundleService())); fetchers.add(new SystemWidgetsBundlesEdgeEventFetcher(ctx.getWidgetsBundleService()));
fetchers.add(new TenantWidgetsBundlesEdgeEventFetcher(ctx.getWidgetsBundleService())); fetchers.add(new TenantWidgetsBundlesEdgeEventFetcher(ctx.getWidgetsBundleService()));
fetchers.add(new OtaPackagesEdgeEventFetcher(ctx.getOtaPackageService())); fetchers.add(new OtaPackagesEdgeEventFetcher(ctx.getOtaPackageService()));
fetchers.add(new SystemResourcesEdgeEventFetcher(ctx.getResourceService()));
fetchers.add(new TenantResourcesEdgeEventFetcher(ctx.getResourceService()));
} }
} }

6
dao/src/main/java/org/thingsboard/server/dao/resource/BaseImageService.java
View File

@ -510,7 +510,7 @@ public class BaseImageService extends BaseResourceService implements ImageServic
@Override @Override
public void inlineImage(HasImage entity) { public void inlineImage(HasImage entity) {
log.trace("Executing inlineImage [{}] [{}] [{}]", entity.getTenantId(), entity.getClass().getSimpleName(), entity.getName()); log.trace("Executing inlineImage [{}] [{}] [{}]", entity.getTenantId(), entity.getClass().getSimpleName(), entity.getName());
entity.setImage(inlineImage(entity.getTenantId(), "image", entity.getImage())); entity.setImage(inlineImage(entity.getTenantId(), "image", entity.getImage(), true));
} }
@Override @Override
@ -582,10 +582,6 @@ public class BaseImageService extends BaseResourceService implements ImageServic
} }
} }
private String inlineImage(TenantId tenantId, String path, String url) {
return inlineImage(tenantId, path, url, true);
}
private String inlineImage(TenantId tenantId, String path, String url, boolean addTbImagePrefix) { private String inlineImage(TenantId tenantId, String path, String url, boolean addTbImagePrefix) {
try { try {
ImageCacheKey key = getKeyFromUrl(tenantId, url); ImageCacheKey key = getKeyFromUrl(tenantId, url);