[app-platform] Modify the icon prefix in applications and templates. (#331)

* [app-platform] Modify the icon prefix in applications and templates.

* [app-platform] The database only stores filenames, and the backend constructs the complete URI to return to the frontend.

* [app-platform] Add icon handling during AppVersion conversion.

* [app-platform] Modify java doc of IconConverter.

* [app-platform] Address code review comments.

* [app-platform] Address code review comments.

Author: RonnyChan96

app-builder/jane/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/converters/IconConverter.java

@@ -0,0 +1,31 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) 2025 Huawei Technologies Co., Ltd. All rights reserved.
+ *  This file is a part of the ModelEngine Project.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+package modelengine.fit.jober.aipp.converters;
+
+/**
+ * 头像转换器接口。
+ *
+ * @author 陈镕希
+ * @since 2025-07-16
+ */
+public interface IconConverter {
+    /**
+     * 从数据库中读出 {@code iconValue} 后添加前端直接调用前缀。
+     *
+     * @param storedValue 数据库中存的值的 {@link String}。
+     * @return 补充前端直接调用前缀后的值的 {@link String}。
+     */
+    String toFrontend(String storedValue);
+
+    /**
+     * 从前端传入的 {@code iconValue} 中截取文件名部分后落库。
+     *
+     * @param frontendValue 前端传入的值的 {@link String}。
+     * @return 截取文件名部分后的值的 {@link String}。
+     */
+    String toStorage(String frontendValue);
+}

app-builder/jane/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/converters/impl/AppVersionToAippDtoConverter.java

@@ -6,7 +6,9 @@
 
 package modelengine.fit.jober.aipp.converters.impl;
 
+import lombok.RequiredArgsConstructor;
 import modelengine.fit.jober.aipp.converters.EntityConverter;
+import modelengine.fit.jober.aipp.converters.IconConverter;
 import modelengine.fit.jober.aipp.domains.appversion.AppVersion;
 import modelengine.fit.jober.aipp.dto.AippDto;
 import modelengine.fit.jober.aipp.util.JsonUtils;
@@ -24,7 +26,10 @@
  * @since 2025-02-18
  */
 @Component
+@RequiredArgsConstructor
 public class AppVersionToAippDtoConverter implements EntityConverter {
+    private final IconConverter iconConverter;
+
     @Override
     public Class<AppVersion> source() {
         return AppVersion.class;
@@ -39,7 +44,7 @@ public Class<AippDto> target() {
     public AippDto convert(Object appVersion) {
         return Optional.ofNullable(appVersion).map(ObjectUtils::<AppVersion>cast).map(s -> {
             String description = ObjectUtils.nullIf(s.getDescription(), StringUtils.EMPTY);
-            String icon = ObjectUtils.nullIf(s.getIcon(), StringUtils.EMPTY);
+            String icon = this.iconConverter.toFrontend(ObjectUtils.nullIf(s.getIcon(), StringUtils.EMPTY));
             return AippDto.builder()
                     .name(s.getData().getName())
                     .description(description)

app-builder/jane/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/converters/impl/AppVersionToAppDtoConverter.java

@@ -6,9 +6,11 @@
 
 package modelengine.fit.jober.aipp.converters.impl;
 
+import lombok.RequiredArgsConstructor;
 import modelengine.fit.jober.aipp.common.exception.AippErrCode;
 import modelengine.fit.jober.aipp.common.exception.AippException;
 import modelengine.fit.jober.aipp.converters.EntityConverter;
+import modelengine.fit.jober.aipp.converters.IconConverter;
 import modelengine.fit.jober.aipp.domain.AppBuilderConfig;
 import modelengine.fit.jober.aipp.domain.AppBuilderFlowGraph;
 import modelengine.fit.jober.aipp.domain.AppBuilderFormProperty;
@@ -25,6 +27,7 @@
 import modelengine.fitframework.util.ObjectUtils;
 
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -39,8 +42,10 @@
  * @since 2025-02-18
  */
 @Component
+@RequiredArgsConstructor
 public class AppVersionToAppDtoConverter implements EntityConverter {
     private static final String FORM_PROPERTY_GROUP_NULL = "null";
+    private final IconConverter iconConverter;
 
     @Override
     public Class<AppVersion> source() {
@@ -55,12 +60,15 @@ public Class<AppBuilderAppDto> target() {
     @Override
     public AppBuilderAppDto convert(Object appVersion) {
         return Optional.ofNullable(appVersion).map(ObjectUtils::<AppVersion>cast).map(s -> {
+            Map<String, Object> attributes = new HashMap<>(s.getAttributes());
+            attributes.computeIfPresent("icon",
+                    (k, v) -> this.iconConverter.toFrontend(String.valueOf(v)));
             AppBuilderAppDto.AppBuilderAppDtoBuilder appDtoBuilder = AppBuilderAppDto.builder()
                     .id(s.getData().getId())
                     .name(s.getData().getName())
                     .type(s.getData().getType())
                     .state(s.getData().getState())
-                    .attributes(s.getAttributes())
+                    .attributes(attributes)
                     .appType(s.getData().getAppType())
                     .version(s.getData().getVersion())
                     .appCategory(s.getData().getAppCategory())

app-builder/jane/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/converters/impl/AppVersionToCreateDtoConverter.java

@@ -6,7 +6,9 @@
 
 package modelengine.fit.jober.aipp.converters.impl;
 
+import lombok.RequiredArgsConstructor;
 import modelengine.fit.jober.aipp.converters.EntityConverter;
+import modelengine.fit.jober.aipp.converters.IconConverter;
 import modelengine.fit.jober.aipp.domains.appversion.AppVersion;
 import modelengine.fit.jober.aipp.dto.AppBuilderAppCreateDto;
 
@@ -22,7 +24,10 @@
  * @since 2025-02-18
  */
 @Component
+@RequiredArgsConstructor
 public class AppVersionToCreateDtoConverter implements EntityConverter {
+    private final IconConverter iconConverter;
+
     @Override
     public Class<AppVersion> source() {
         return AppVersion.class;
@@ -40,7 +45,7 @@ public AppBuilderAppCreateDto convert(Object appVersion) {
                 .map(s -> AppBuilderAppCreateDto.builder()
                         .name(s.getData().getName())
                         .description(s.getDescription())
-                        .icon(s.getIcon())
+                        .icon(this.iconConverter.toFrontend(s.getIcon()))
                         .greeting(s.getGreeting())
                         .appType(s.getData().getAppType())
                         .type(s.getData().getType())

app-builder/jane/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/converters/impl/AppVersionToExportAppConverter.java

@@ -6,14 +6,18 @@
 
 package modelengine.fit.jober.aipp.converters.impl;
 
+import lombok.RequiredArgsConstructor;
 import modelengine.fit.jober.aipp.converters.EntityConverter;
+import modelengine.fit.jober.aipp.converters.IconConverter;
 import modelengine.fit.jober.aipp.domains.appversion.AppVersion;
 import modelengine.fit.jober.aipp.dto.export.AppExportApp;
 import modelengine.fit.jober.aipp.po.AppBuilderAppPo;
 import modelengine.fit.jober.aipp.util.JsonUtils;
 import modelengine.fitframework.annotation.Component;
 import modelengine.fitframework.util.ObjectUtils;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Optional;
 
 /**
@@ -23,7 +27,10 @@
  * @since 2025-02-14
  */
 @Component
+@RequiredArgsConstructor
 public class AppVersionToExportAppConverter implements EntityConverter {
+    private final IconConverter iconConverter;
+
     @Override
     public Class<AppVersion> source() {
         return AppVersion.class;
@@ -38,13 +45,18 @@ public Class<AppExportApp> target() {
     public AppExportApp convert(Object appVersion) {
         return Optional.ofNullable(appVersion).map(ObjectUtils::<AppVersion>cast).map(s -> {
             AppBuilderAppPo appBuilderAppPo = s.getData();
+            Map<String, Object> attributes = Optional.ofNullable(appBuilderAppPo.getAttributes())
+                    .map(JsonUtils::parseObject)
+                    .orElseGet(HashMap::new);
+            attributes.computeIfPresent("icon",
+                    (k, v) -> this.iconConverter.toFrontend(String.valueOf(v)));
             return AppExportApp.builder()
                     .name(appBuilderAppPo.getName())
                     .tenantId(appBuilderAppPo.getTenantId())
                     .type(appBuilderAppPo.getType())
                     .appBuiltType(appBuilderAppPo.getAppBuiltType())
                     .version(appBuilderAppPo.getVersion())
-                    .attributes(JsonUtils.parseObject(appBuilderAppPo.getAttributes()))
+                    .attributes(attributes)
                     .appCategory(appBuilderAppPo.getAppCategory())
                     .appType(appBuilderAppPo.getAppType())
                     .build();

app-builder/jane/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/converters/impl/AppVersionToMetaDtoConverter.java

@@ -6,16 +6,20 @@
 
 package modelengine.fit.jober.aipp.converters.impl;
 
+import lombok.RequiredArgsConstructor;
 import modelengine.fit.jober.aipp.converters.EntityConverter;
+import modelengine.fit.jober.aipp.converters.IconConverter;
 import modelengine.fit.jober.aipp.domains.appversion.AppVersion;
 import modelengine.fit.jober.aipp.dto.AppBuilderAppMetadataDto;
 
 import modelengine.fitframework.annotation.Component;
 import modelengine.fitframework.util.ObjectUtils;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.Optional;
 
 /**
@@ -25,7 +29,10 @@
  * @since 2025-02-18
  */
 @Component
+@RequiredArgsConstructor
 public class AppVersionToMetaDtoConverter implements EntityConverter {
+    private final IconConverter iconConverter;
+
     @Override
     public Class<AppVersion> source() {
         return AppVersion.class;
@@ -41,13 +48,16 @@ public AppBuilderAppMetadataDto convert(Object appVersion) {
         return Optional.ofNullable(appVersion).map(ObjectUtils::<AppVersion>cast).map(s -> {
             List<String> tags = new ArrayList<>();
             tags.add(s.getData().getType().toUpperCase(Locale.ROOT));
+            Map<String, Object> attributes = new HashMap<>(s.getAttributes());
+            attributes.computeIfPresent("icon",
+                    (k, v) -> this.iconConverter.toFrontend(String.valueOf(v)));
             return AppBuilderAppMetadataDto.builder()
                     .id(s.getData().getId())
                     .name(s.getData().getName())
                     .type(s.getData().getType())
                     .state(s.getData().getState())
                     .appType(s.getData().getAppType())
-                    .attributes(s.getAttributes())
+                    .attributes(attributes)
                     .version(s.getData().getVersion())
                     .createBy(s.getData().getCreateBy())
                     .updateBy(s.getData().getUpdateBy())

app-builder/jane/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/converters/impl/AppVersionToTemplateConverter.java

@@ -6,12 +6,16 @@
 
 package modelengine.fit.jober.aipp.converters.impl;
 
+import lombok.RequiredArgsConstructor;
 import modelengine.fit.jober.aipp.converters.EntityConverter;
+import modelengine.fit.jober.aipp.converters.IconConverter;
 import modelengine.fit.jober.aipp.domain.AppTemplate;
 import modelengine.fit.jober.aipp.domains.appversion.AppVersion;
 import modelengine.fitframework.annotation.Component;
 import modelengine.fitframework.util.ObjectUtils;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Optional;
 
 /**
@@ -21,7 +25,10 @@
  * @since 2025-02-18
  */
 @Component
+@RequiredArgsConstructor
 public class AppVersionToTemplateConverter implements EntityConverter {
+    private final IconConverter iconConverter;
+
     @Override
     public Class<AppVersion> source() {
         return AppVersion.class;
@@ -36,27 +43,32 @@ public Class<AppTemplate> target() {
     public AppTemplate convert(Object appVersion) {
         return Optional.ofNullable(appVersion)
                 .map(ObjectUtils::<AppVersion>cast)
-                .map(appVersionObj -> AppTemplate.builder()
-                        .id(appVersionObj.getData().getId())
-                        .name(appVersionObj.getData().getName())
-                        .builtType(appVersionObj.getData().getAppBuiltType())
-                        .appType(appVersionObj.getData().getAppType())
-                        .category(appVersionObj.getData().getAppCategory())
-                        .attributes(appVersionObj.getAttributes())
-                        .like(0)
-                        .collection(0)
-                        .usage(0)
-                        .version("1.0.0")
-                        .configId(appVersionObj.getData().getConfigId())
-                        .flowGraphId(appVersionObj.getData().getFlowGraphId())
-                        .createBy(appVersionObj.getData().getCreateBy())
-                        .createAt(appVersionObj.getData().getCreateAt())
-                        .updateBy(appVersionObj.getData().getUpdateBy())
-                        .updateAt(appVersionObj.getData().getUpdateAt())
-                        .config(appVersionObj.getConfig())
-                        .flowGraph(appVersionObj.getFlowGraph())
-                        .formProperties(appVersionObj.getFormProperties())
-                        .build())
+                .map(appVersionObj -> {
+                    Map<String, Object> attributes = new HashMap<>(appVersionObj.getAttributes());
+                    attributes.computeIfPresent("icon",
+                            (k, v) -> this.iconConverter.toFrontend(String.valueOf(v)));
+                    return AppTemplate.builder()
+                            .id(appVersionObj.getData().getId())
+                            .name(appVersionObj.getData().getName())
+                            .builtType(appVersionObj.getData().getAppBuiltType())
+                            .appType(appVersionObj.getData().getAppType())
+                            .category(appVersionObj.getData().getAppCategory())
+                            .attributes(attributes)
+                            .like(0)
+                            .collection(0)
+                            .usage(0)
+                            .version("1.0.0")
+                            .configId(appVersionObj.getData().getConfigId())
+                            .flowGraphId(appVersionObj.getData().getFlowGraphId())
+                            .createBy(appVersionObj.getData().getCreateBy())
+                            .createAt(appVersionObj.getData().getCreateAt())
+                            .updateBy(appVersionObj.getData().getUpdateBy())
+                            .updateAt(appVersionObj.getData().getUpdateAt())
+                            .config(appVersionObj.getConfig())
+                            .flowGraph(appVersionObj.getFlowGraph())
+                            .formProperties(appVersionObj.getFormProperties())
+                            .build();
+                })
                 .orElse(null);
     }
 }

app-builder/jane/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/converters/impl/IconConverterImpl.java

@@ -0,0 +1,70 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) 2025 Huawei Technologies Co., Ltd. All rights reserved.
+ *  This file is a part of the ModelEngine Project.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+package modelengine.fit.jober.aipp.converters.impl;
+
+import static modelengine.fit.jober.aipp.constant.AippConstant.DOWNLOAD_FILE_ORIGIN;
+import static modelengine.fit.jober.aipp.constant.AippConstant.NAS_SHARE_DIR;
+
+import modelengine.fit.jober.aipp.converters.IconConverter;
+import modelengine.fit.jober.aipp.util.TenantUtils;
+import modelengine.fitframework.annotation.Component;
+import modelengine.fitframework.annotation.Value;
+import modelengine.fitframework.util.StringUtils;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * {@link IconConverter} 的默认实现类。
+ *
+ * @author 陈镕希
+ * @since 2025-07-16
+ */
+@Component
+public class IconConverterImpl implements IconConverter {
+    private final String contextRoot;
+
+    private static final Pattern FILE_PATH_PATTERN;
+    private static final String FILE_PATH_PARAM = "filePath=";
+    private static final String FILE_NAME_PARAM = "&fileName=";
+
+    static {
+        String regex = FILE_PATH_PARAM + Pattern.quote(NAS_SHARE_DIR) + "/([^&]+)";
+        FILE_PATH_PATTERN = Pattern.compile(regex);
+    }
+
+    public IconConverterImpl(@Value("${app-engine.contextRoot}") String contextRoot) {
+        this.contextRoot = contextRoot;
+    }
+
+    @Override
+    public String toFrontend(String storedValue) {
+        if (StringUtils.isBlank(storedValue)) {
+            return storedValue;
+        }
+
+        Matcher matcher = FILE_PATH_PATTERN.matcher(storedValue);
+        String fileName = matcher.find() ? matcher.group(1) : storedValue;
+        return buildFileUrl(fileName);
+    }
+
+    @Override
+    public String toStorage(String frontendValue) {
+        if (StringUtils.isBlank(frontendValue)) {
+            return frontendValue;
+        }
+
+        Matcher matcher = FILE_PATH_PATTERN.matcher(frontendValue);
+        return matcher.find() ? matcher.group(1) : frontendValue;
+    }
+
+    private String buildFileUrl(String fileName) {
+        String originWithTenant = String.format(DOWNLOAD_FILE_ORIGIN, TenantUtils.getDefaultTenantId());
+        return this.contextRoot + originWithTenant + FILE_PATH_PARAM + NAS_SHARE_DIR + "/" + fileName
+                + FILE_NAME_PARAM + fileName;
+    }
+}