Merge branch '1.1.x'

Author: CodeCasterX

app-builder/jane/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/domains/appversion/AppVersion.java

@@ -896,7 +896,7 @@ public void importData(AppExportDto appDto, String appSuiteId, String contextRoo
         String newName = AppImExportUtil.generateNewAppName(similarNames, initAppName);
         this.data.setName(newName);
 
-        this.attributes = JsonUtils.parseObject(this.data.getAttributes());
+        this.attributes = AppImExportUtil.resetAppAttributes(JsonUtils.parseObject(this.data.getAttributes()));
         this.config = AppImExportUtil.convertToAppBuilderConfig(appDto.getConfig(), context);
         this.flowGraph = AppImExportUtil.convertToAppBuilderFlowGraph(appDto.getFlowGraph(), context);
         this.formProperties = AppImExportUtil.getFormProperties(this.config.getConfigProperties());

app-builder/jane/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/util/AppImExportUtil.java

@@ -76,7 +76,7 @@ public class AppImExportUtil {
     private static final String[] APP_BUILT_TYPE_SET = {"basic", "workflow"};
     private static final String[] APP_CATEGORY_SET = {"chatbot", "workflow", "agent"};
     private static final String[] APP_TYPE_SET = {"app", "waterflow", "template"};
-    private static final String[] APP_ATTR_DEFAULT_SET = {"icon", "greeting", "description", "name"};
+    private static final String[] APP_ATTR_DEFAULT_SET = {"icon", "description"};
 
     /**
      * 将 {@link AppBuilderApp} 转换为 {@link AppExportApp}。
@@ -396,7 +396,7 @@ public static AppBuilderApp convertToAppBuilderApp(AppExportDto appExportDto, Op
         AppBuilderConfig config = convertToAppBuilderConfig(appExportDto.getConfig(), context);
         AppBuilderFlowGraph flowGraph = convertToAppBuilderFlowGraph(appExportDto.getFlowGraph(), context);
         appExportApp.getAttributes().put("icon", "");
-        resetAppAttributes(appExportApp);
+        appExportApp.setAttributes(resetAppAttributes(appExportApp.getAttributes()));
         return AppBuilderApp.builder()
                 .createBy(context.getOperator())
                 .config(config)
@@ -429,10 +429,15 @@ public static List<AppBuilderFormProperty> getFormProperties(List<AppBuilderConf
                 .collect(Collectors.toList());
     }
 
-    private static void resetAppAttributes(AppExportApp importedApp) {
-        Map<String, Object> attributes = Stream.of(APP_ATTR_DEFAULT_SET)
-                .collect(Collectors.toMap(Function.identity(), importedApp.getAttributes()::get));
-        importedApp.setAttributes(attributes);
+    /**
+     * 将应用属性重置为预定义的默认属性集，仅保留输入参数与默认集。
+     *
+     * @param attributes 表示导入应用属性的 {@link Map}{@code <}{@link String}{@code , }{@link Object}{@code >}。
+     * @return 表示重置后应用属性的 {@link Map}{@code <}{@link String}{@code , }{@link Object}{@code >}。
+     */
+    public static Map<String, Object> resetAppAttributes(Map<String, Object> attributes) {
+        return Stream.of(APP_ATTR_DEFAULT_SET)
+                .collect(Collectors.toMap(Function.identity(), attributes::get));
     }
 
     /**