diff --git a/ruoyi-site/README.md b/ruoyi-site/README.md index b999214a1..878227bf3 100644 --- a/ruoyi-site/README.md +++ b/ruoyi-site/README.md @@ -2,4 +2,7 @@ -后续:h5在线链接、在线抽奖系统。 \ No newline at end of file +后续:h5在线链接、在线抽奖系统。 + +支持两种部署方式切换,分布式、单机。 +同时支持多租户,或者单租户 \ No newline at end of file diff --git a/ruoyi-site/ruoyi-h5/doc/init.sql b/ruoyi-site/ruoyi-h5/doc/init.sql index 7401e8c84..1660ea45c 100644 --- a/ruoyi-site/ruoyi-h5/doc/init.sql +++ b/ruoyi-site/ruoyi-h5/doc/init.sql @@ -90,13 +90,14 @@ create table h5_form_submission primary key, project_id bigint null comment 'H5Project的ID', templet_form_id bigint null comment '模板表单ID', - form_id bigint null comment '表单ID', + form_id bigint null comment '表单ID', ip_address varchar(50) null comment '提交者IP地址', user_agent varchar(512) null comment '用户代理信息', form_data json not null comment '表单数据(JSON格式存储)', - create_time datetime default CURRENT_TIMESTAMP not null comment '创建时间戳', - update_time datetime null on update CURRENT_TIMESTAMP comment '更新时间戳', - created_by bigint null comment '创建人' + create_time datetime default CURRENT_TIMESTAMP not null comment '创建时间戳', + update_time datetime null on update CURRENT_TIMESTAMP comment '更新时间戳', + created_by bigint null comment '创建人', + td bigint not null comment '租户id' ) comment '表单提交记录表' charset = utf8mb4; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5ProjectController.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5ProjectController.java index 7073e6e5b..7f2222422 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5ProjectController.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5ProjectController.java @@ -74,7 +74,7 @@ public class H5ProjectController { @Operation(summary = "根据ID查询H5项目") @GetMapping("/{id}") public H5Project getH5ProjectById(@PathVariable Long id) { - return h5ProjectService.getH5ProjectWithContent(id); + return TenantHelper.ignore(() -> h5ProjectService.getById(id)); } /** diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/H5ProjectContentDTO.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/H5ProjectContentDTO.java index 6cced29a0..4b0a85e46 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/H5ProjectContentDTO.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/H5ProjectContentDTO.java @@ -587,7 +587,7 @@ public class H5ProjectContentDTO { public static class Animation { private String type; private Integer order; - private Map keyframes; + private Object keyframes; private Integer delay; private Integer duration; private String fill;