Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
b97583e
fix: update page history bug
lu-yg Dec 26, 2024
d30877c
fix: format code and fix style issue
lu-yg Jan 7, 2025
33316bf
Merge branch 'develop' of github.com:lu-yg/tiny-engine-backend-java i…
lu-yg Jan 7, 2025
7fc6507
fix: modify page histiry entity
lu-yg Jan 7, 2025
64be7b4
Merge branch 'opentiny:develop' into develop
lu-yg Jan 9, 2025
24474b8
feat: add code submission rules
lu-yg Jan 9, 2025
9745b66
Merge branch 'develop' of github.com:lu-yg/tiny-engine-backend-java i…
lu-yg Jan 9, 2025
239c624
Merge branch 'opentiny:develop' into develop
lu-yg Jan 9, 2025
b77f2f4
fix: modify app schema for test
lu-yg Jan 9, 2025
feeb8f7
Merge branch 'develop' of github.com:lu-yg/tiny-engine-backend-java i…
lu-yg Jan 9, 2025
7d52937
fix: modify block group
lu-yg Jan 22, 2025
6559bec
fix: modify t_i18n_entry u_idx_i18n_entity
lu-yg Jan 22, 2025
2a7fc44
Merge branch 'opentiny:develop' into develop
lu-yg Jan 22, 2025
656a4a1
fix: modify t_i18n_entry u_idx_i18n_entity
lu-yg Jan 22, 2025
9de10c5
Merge branch 'develop' of github.com:lu-yg/tiny-engine-backend-java i…
lu-yg Jan 22, 2025
e9aa592
fix: modify block update api
lu-yg Jan 23, 2025
aff95bb
Merge branch 'opentiny:develop' into develop
lu-yg Jan 23, 2025
02607e4
Merge branch 'develop' of github.com:lu-yg/tiny-engine-backend-java i…
lu-yg Jan 23, 2025
ed7483d
fix: Modify code format
lu-yg Jan 23, 2025
48267d6
fix: Modify code format
lu-yg Jan 23, 2025
cabb309
fix: Modify code format
lu-yg Jan 23, 2025
83cb48a
fix: Modify code format
lu-yg Jan 24, 2025
486944b
fix: Modify code format
lu-yg Jan 24, 2025
751f331
Merge branch 'opentiny:develop' into develop
lu-yg Jan 26, 2025
48645e1
fix: modify block group api
lu-yg Jan 26, 2025
d2f2406
fix: modify block group mapper
lu-yg Jan 26, 2025
e24d0ec
Merge branch 'develop' of github.com:lu-yg/tiny-engine-backend-java i…
lu-yg Jan 26, 2025
ee8219f
fix: modify workflows
lu-yg Jan 26, 2025
efad29b
fix: Update checkstyle.yml
lu-yg Jan 26, 2025
6868add
fix: modify workflows
lu-yg Jan 26, 2025
2e131ff
fix: Modify block create and update api
lu-yg Jan 27, 2025
9c1225a
Merge branch 'opentiny:develop' into develop
lu-yg Jan 27, 2025
8cc8ca5
fix: Modify code format
lu-yg Jan 27, 2025
4ba0818
fix: Modify code format
lu-yg Jan 27, 2025
6d978f1
fix: Modify block group
lu-yg Feb 6, 2025
b3f35a0
fix: Modify block group
lu-yg Feb 6, 2025
9717200
fix: Modify block group
lu-yg Feb 6, 2025
e757b29
fix: Modify block group
lu-yg Feb 6, 2025
7d90c86
fix: Modify block group api
lu-yg Feb 13, 2025
d6856ba
Merge branch 'opentiny:develop' into develop
lu-yg Feb 13, 2025
8a89475
Merge branch 'develop' of github.com:lu-yg/tiny-engine-backend-java i…
lu-yg Feb 13, 2025
baa4eeb
fix: Modify block group api
lu-yg Feb 13, 2025
654da8b
fix: Modify block group api
lu-yg Feb 13, 2025
a230c24
feat: add code check
lu-yg Feb 27, 2025
6966946
Merge branch 'opentiny:develop' into develop
lu-yg Feb 27, 2025
d503c96
Merge branch 'develop' of github.com:lu-yg/tiny-engine-backend-java i…
lu-yg Feb 27, 2025
7f9b378
feat: add code check
lu-yg Feb 27, 2025
2bdf54c
feat: add code check
lu-yg Feb 27, 2025
bef4adc
Merge branch 'opentiny:develop' into develop
lu-yg Feb 28, 2025
88dec60
feat: add code check
lu-yg Feb 28, 2025
63efa3c
Merge branch 'opentiny:develop' into develop
lu-yg Feb 28, 2025
f05a3ef
fix: Fix code check
lu-yg Feb 28, 2025
dbc910c
Merge branch 'opentiny:develop' into develop
lu-yg Mar 6, 2025
8a4041c
fix: Cross domain configuration
lu-yg Mar 6, 2025
57fd35a
fix: Cross domain configuration
lu-yg Mar 6, 2025
bff62cc
fix: i18n file upload
lu-yg Mar 7, 2025
ededae7
fix: i18n file upload
lu-yg Mar 7, 2025
1fa284b
Merge branch 'opentiny:develop' into develop
lu-yg Mar 20, 2025
7f17fb7
fix: page update api
lu-yg Mar 20, 2025
934130f
fix: page update api
lu-yg Mar 20, 2025
a920283
feat: material history api
lu-yg Apr 1, 2025
b1e0f83
feat: component library api
lu-yg Apr 2, 2025
5d244ba
Merge branch 'develop' of github.com:lu-yg/tiny-engine-backend-java i…
lu-yg Apr 2, 2025
05f4473
feat: component library api
lu-yg Apr 7, 2025
58ed56b
Merge branch 'develop' of github.com:lu-yg/tiny-engine-backend-java i…
lu-yg Apr 7, 2025
6a5269d
feat: component library api
lu-yg Apr 7, 2025
2f31f88
feat: component library api
lu-yg Apr 7, 2025
9ee1ef1
feat: component library api
lu-yg Apr 7, 2025
59c6ddc
feat: component library api
lu-yg Apr 7, 2025
8373484
feat: component library api
lu-yg Apr 7, 2025
fb123c6
feat: component library api
lu-yg Apr 7, 2025
0875559
feat: component library api
lu-yg Apr 7, 2025
4082626
fix: Mock data is changed to be obtained from loginUserContext
lu-yg Apr 7, 2025
b70579e
Merge branch 'opentiny:develop' into develop
lu-yg Apr 7, 2025
a25abab
Merge branch 'opentiny:develop' into develop
lu-yg Apr 10, 2025
72539c5
fix: Component library mapper
lu-yg Apr 10, 2025
a98b503
fix:Update t_component index
lu-yg Apr 11, 2025
9c82702
Merge branch 'opentiny:develop' into develop
lu-yg Apr 11, 2025
e1e1ef4
Merge branch 'develop' of github.com:lu-yg/tiny-engine-backend-java i…
lu-yg Apr 11, 2025
8005656
fix:Update t_component index
lu-yg Apr 11, 2025
898e66d
Merge branch 'opentiny:develop' into develop
lu-yg Apr 16, 2025
3c66527
fix: Component and component library mapper
lu-yg Apr 16, 2025
267f667
fix: App v1 service
lu-yg Apr 16, 2025
75f0be1
fix: App v1 service
lu-yg Apr 16, 2025
40e6829
Merge branch 'opentiny:develop' into develop
lu-yg Apr 17, 2025
e7071e7
fix: Modify code format
lu-yg Apr 17, 2025
9a4e612
Merge branch 'develop' of github.com:lu-yg/tiny-engine-backend-java i…
lu-yg Apr 17, 2025
0993e94
Merge branch 'opentiny:develop' into develop
lu-yg Apr 21, 2025
7d88f1c
fix: Modify mapper
lu-yg Apr 21, 2025
2265f07
Merge branch 'develop' of github.com:lu-yg/tiny-engine-backend-java i…
lu-yg Apr 21, 2025
c35445f
Merge branch 'opentiny:develop' into develop
lu-yg Apr 23, 2025
cabc129
fix: Modify bundle split
lu-yg Apr 23, 2025
958c7b6
Merge branch 'develop' of github.com:lu-yg/tiny-engine-backend-java i…
lu-yg Apr 23, 2025
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions base/src/main/java/com/tinyengine/it/model/entity/User.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

package com.tinyengine.it.model.entity;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.tinyengine.it.common.base.BaseEntity;

Expand All @@ -38,6 +39,7 @@ public class User extends BaseEntity {
@Schema(name = "email", description = "邮箱")
private String email;

@TableField("enable")
@Schema(name = "enable", description = "账号是否可用")
private Boolean isEnable;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
package com.tinyengine.it.service.material;

import com.tinyengine.it.common.base.Result;
import com.tinyengine.it.model.dto.BundleDto;
import com.tinyengine.it.model.dto.BundleResultDto;
import com.tinyengine.it.model.dto.CustComponentDto;
import com.tinyengine.it.model.dto.FileResult;
Expand Down Expand Up @@ -92,6 +93,22 @@ public interface ComponentService {
*/
Result<BundleResultDto> bundleSplit(MultipartFile file);

/**
* 解析bundleDto为component集合
*
* @param bundleDto bundleDto
* @return BundleResultDto BundleResultDto
*/
Result<BundleResultDto> parseBundle(BundleDto bundleDto);

/**
* 批量创建/更新组件
*
* @param componentList componentList
* @return FileResult FileResult
*/
Result<FileResult> bulkCreate(List<Component> componentList);

/**
* 批量创建component
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,17 @@ public Result<BundleResultDto> bundleSplit(MultipartFile file) {
data = (Map<String, Object>) dataObj;
}
BundleDto bundleDto = BeanUtil.mapToBean(data, BundleDto.class, true);
return this.parseBundle(bundleDto);
}

/**
* 解析bundleDto为component集合
*
* @param bundleDto bundleDto
* @return BundleResultDto BundleResultDto
*/
@Override
public Result<BundleResultDto> parseBundle(BundleDto bundleDto) {
List<Map<String, Object>> components = bundleDto.getMaterials().getComponents();
List<Child> snippets = bundleDto.getMaterials().getSnippets();

Expand Down
Loading