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

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

@@ -56,6 +56,8 @@ public class EdgeSyncCursor {
         if (fullSync) {
             fetchers.add(new TenantEdgeEventFetcher(ctx.getTenantService()));
             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 AdminSettingsEdgeEventFetcher(ctx.getAdminSettingsService()));
             fetchers.add(new TenantAdminUsersEdgeEventFetcher(ctx.getUserService()));
@@ -79,8 +81,6 @@ public class EdgeSyncCursor {
             fetchers.add(new SystemWidgetsBundlesEdgeEventFetcher(ctx.getWidgetsBundleService()));
             fetchers.add(new TenantWidgetsBundlesEdgeEventFetcher(ctx.getWidgetsBundleService()));
             fetchers.add(new OtaPackagesEdgeEventFetcher(ctx.getOtaPackageService()));
-            fetchers.add(new SystemResourcesEdgeEventFetcher(ctx.getResourceService()));
-            fetchers.add(new TenantResourcesEdgeEventFetcher(ctx.getResourceService()));
         }
     }
 

dao/src/main/java/org/thingsboard/server/dao/resource/BaseImageService.java

@@ -510,7 +510,7 @@ public class BaseImageService extends BaseResourceService implements ImageServic
     @Override
     public void inlineImage(HasImage entity) {
         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
@@ -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) {
         try {
             ImageCacheKey key = getKeyFromUrl(tenantId, url);