diff --git a/app/src/main/resources/sql/mysql/create_all_tables_ddl_v1.mysql.sql b/app/src/main/resources/sql/mysql/create_all_tables_ddl_v1.mysql.sql index 71896f28..ee023852 100644 --- a/app/src/main/resources/sql/mysql/create_all_tables_ddl_v1.mysql.sql +++ b/app/src/main/resources/sql/mysql/create_all_tables_ddl_v1.mysql.sql @@ -67,7 +67,7 @@ create table `t_app` `id` int not null auto_increment comment '主键id', `name` varchar(255) not null comment '应用名称', `platform_id` int not null comment '关联设计器id', - `platform_history_id` int not null comment '关联设计器历史版本id', + `platform_history_id` int comment '关联设计器历史版本id', `publish_url` varchar(255) comment '应用静态资源托管地址', `editor_url` varchar(255) comment '设计器地址', `visit_url` varchar(255) comment '访问地址', diff --git a/base/src/main/java/com/tinyengine/it/model/entity/App.java b/base/src/main/java/com/tinyengine/it/model/entity/App.java index 4f97874d..58b261e3 100644 --- a/base/src/main/java/com/tinyengine/it/model/entity/App.java +++ b/base/src/main/java/com/tinyengine/it/model/entity/App.java @@ -24,6 +24,8 @@ import lombok.Setter; import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -47,6 +49,7 @@ public class App extends BaseEntity { private String appWebsite; @Schema(name = "platformId", description = "设计器id") + @JsonProperty("platform") private Integer platformId; @Schema(name = "platformHistoryId", description = "关联设计器的历史版本ID") @@ -62,6 +65,7 @@ public class App extends BaseEntity { private String visitUrl; @Schema(name = "imageUrl", description = "封面图地址") + @JsonProperty("image_url") private String imageUrl; @Schema(name = "assetsUrl", description = "应用资源url") @@ -82,14 +86,14 @@ public class App extends BaseEntity { @Schema(name = "config", description = "*设计预留字段*") @TableField(typeHandler = MapTypeHandler.class) - private Map config; + private Map config = new HashMap<>(); @Schema(name = "constants", description = "*设计预留字段*") private String constants; @Schema(name = "dataHandler", description = "数据源的拦截器") @TableField(typeHandler = MapTypeHandler.class) - private Map dataHandler; + private Map dataHandler = new HashMap<>(); @Schema(name = "description", description = "描述") private String description; @@ -130,14 +134,14 @@ public class App extends BaseEntity { @Schema(name = "globalState", description = "应用全局状态") @JsonProperty("global_state") @TableField(typeHandler = ListTypeHandler.class) - private List> globalState; + private List> globalState = new ArrayList<>(); @Schema(name = "defaultLang", description = "默认语言") private String defaultLang; @Schema(name = "extendConfig", description = "应用扩展config") @TableField(typeHandler = MapTypeHandler.class) - private Map extendConfig; + private Map extendConfig = new HashMap<>(); @Schema(name = "dataHash", description = "应用内容哈希值") private String dataHash; @@ -148,5 +152,5 @@ public class App extends BaseEntity { @Schema(name = "dataSourceGlobal", description = "数据源全局配置") @JsonProperty("data_source_global") @TableField(typeHandler = MapTypeHandler.class) - private Map dataSourceGlobal; + private Map dataSourceGlobal = new HashMap<>(); } diff --git a/base/src/main/java/com/tinyengine/it/service/app/impl/AppServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/app/impl/AppServiceImpl.java index 40ddae6b..5db38537 100644 --- a/base/src/main/java/com/tinyengine/it/service/app/impl/AppServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/app/impl/AppServiceImpl.java @@ -185,6 +185,7 @@ public Result createApp(App app) { if (!appResult.isEmpty()) { return Result.failed(ExceptionEnum.CM003); } + app.setIsPublish(false); int result = appMapper.createApp(app); if (result < 1) { return Result.failed(ExceptionEnum.CM001);