Skip to content

fix:Format code and fix style and data issues #225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 120 commits into from
May 26, 2025
Merged
Show file tree
Hide file tree
Changes from 119 commits
Commits
Show all changes
120 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
7e33a5d
Merge branch 'opentiny:develop' into develop
lu-yg Apr 27, 2025
2c60fa1
fix: format code and fix style issue
lu-yg Apr 27, 2025
e7e4be5
Merge branch 'opentiny:develop' into develop
lu-yg Apr 27, 2025
1a380b6
fix: fix getSchemaComponentsTree function bug
lu-yg Apr 30, 2025
15c6e8f
fix: Fix folder hierarchy restrictions and add AI models
lu-yg May 7, 2025
4ab18bd
Merge branch 'opentiny:develop' into develop
lu-yg May 8, 2025
243d8f9
fix: block lock issue
lu-yg May 8, 2025
818986d
Merge branch 'opentiny:develop' into develop
lu-yg May 9, 2025
b98e193
fead: platform API
lu-yg May 9, 2025
4ac65e2
feat: platform API
lu-yg May 9, 2025
16ad90d
Merge branch 'develop' of github.com:lu-yg/tiny-engine-backend-java i…
lu-yg May 13, 2025
7f875ce
feat: platform API
lu-yg May 13, 2025
091ed5e
feat: Add inspection file
lu-yg May 13, 2025
3438b96
feat: Add inspection file
lu-yg May 13, 2025
68b329a
feat: Add inspection file
lu-yg May 13, 2025
37e06a9
feat: Add inspection file
lu-yg May 13, 2025
2df5550
feat: Add inspection file
lu-yg May 13, 2025
c679a28
Merge branch 'opentiny:develop' into develop
lu-yg May 14, 2025
a20073b
fix: Modify the default values of table fields and page API
lu-yg May 14, 2025
0e44141
fix: Modify the default values of table fields and page API
lu-yg May 14, 2025
46f3277
fix: Format code and fix style issue
lu-yg May 22, 2025
385ca28
fix: Format code and fix style issue
lu-yg May 22, 2025
76a672d
fix: Format code and fix style issue
lu-yg May 23, 2025
0b9ce6c
fix: Modify database initialization data
lu-yg May 23, 2025
a654915
fix: Modify database initialization data
lu-yg May 23, 2025
6c08dcb
fix: Modify mapper xml
lu-yg May 26, 2025
f5dabe1
fix: Modify mapper xml
lu-yg May 26, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/src/main/resources/application-local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ spring:
password:
sql:
init:
schema-locations: classpath:sql/h2/create_all_tables_ddl_v1.h2.sql
data-locations: classpath:sql/h2/init_data_for_test.sql
schema-locations: classpath:sql/h2/create_all_tables_ddl_v1.0.0.h2.sql
data-locations: classpath:sql/h2/init_data_for_test_v1.0.0.sql

springdoc:
api-docs:
Expand Down
178 changes: 0 additions & 178 deletions app/src/main/resources/sql/h2/init_data_for_test.sql

This file was deleted.

175 changes: 175 additions & 0 deletions app/src/main/resources/sql/h2/init_data_for_test_v1.0.0.sql

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion app/src/main/resources/sql/h2/update_all_tables_ddl.sql
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,5 @@ ALTER TABLE t_platform_history MODIFY tenant_id varchar(60) NULL;
ALTER TABLE t_task_record MODIFY tenant_id varchar(60) NULL;
ALTER TABLE t_user MODIFY tenant_id varchar(60) NULL;

ALTER TABLE t_component_library ADD app_id int NULL;
ALTER TABLE t_component_library ADD app_id int NULL;

180 changes: 0 additions & 180 deletions app/src/main/resources/sql/mysql/init_data_for_test.sql

This file was deleted.

175 changes: 175 additions & 0 deletions app/src/main/resources/sql/mysql/init_data_for_test_v1.0.0.sql

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion app/src/main/resources/sql/mysql/update_all_tables_ddl.sql
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,5 @@ ALTER TABLE t_platform_history MODIFY tenant_id varchar(60) NULL;
ALTER TABLE t_task_record MODIFY tenant_id varchar(60) NULL;
ALTER TABLE t_user MODIFY tenant_id varchar(60) NULL;

ALTER TABLE t_component_library ADD app_id int NULL;
ALTER TABLE t_component_library ADD app_id int NULL;

Original file line number Diff line number Diff line change
Expand Up @@ -20,31 +20,35 @@ public interface LoginUserContext {
* 返回当前用户所诉的业务租户信息
* @return 租户ID
*/
public String getTenantId();
String getTenantId();

/**
* 返回当前用户信息
* @return 用户ID
*/
public String getLoginUserId();
String getLoginUserId();

/**
* 返回当前用户所属业务租户信息
* @return 业务租户ID
*/
public String getRenterId();
String getRenterId();

/**
* 返回当前应用信息
* @return 应用ID
*/
public int getAppId();
int getAppId();

/**
* 返回当前设计器信息
* @return 设计器ID
*/
public int getPlatformId();
int getPlatformId();

public String getSiteId();
/**
* getSiteId
* @return Strinig
*/
String getSiteId();
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import org.springframework.web.multipart.MultipartFile;

import java.io.File;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
import java.util.regex.Pattern;
Expand All @@ -41,7 +42,8 @@ public class SecurityFileCheckUtil {
public static boolean checkPathHasCrossDir(String dirOrFileName) {
if (!dirOrFileName.contains("../") && !dirOrFileName.contains("/..")) {
if (!dirOrFileName.contains("..\\") && !dirOrFileName.contains("\\..")) {
return dirOrFileName.contains("./") || dirOrFileName.contains(".\\.\\") || dirOrFileName.contains("%00");
return dirOrFileName.contains("./") || dirOrFileName.contains(".\\.\\")
|| dirOrFileName.contains("%00");
} else {
return true;
}
Expand Down Expand Up @@ -142,15 +144,16 @@ public static boolean filePathIsValid(String fileName) {
}

// 获取当前操作系统的名称
String os = System.getProperty("os.name").toLowerCase();
String os = System.getProperty("os.name").toLowerCase(Locale.ROOT);

// 定义通用的非法字符
String illegalChars = "";

if (os.contains("win")) {
// 针对Windows的非法字符
illegalChars = "[<>:\"/\\|?*]";
} else if (os.contains("nix") || os.contains("nux") || os.contains("mac")) {
}
if (os.contains("nix") || os.contains("nux") || os.contains("mac")) {
// 针对Linux和macOS的非法字符(一般来说,Linux和macOS对文件名的限制较少,但有一些常见的非法字符)
illegalChars = "[/]"; // Linux和macOS的路径不能包含斜杠 '/'
}
Expand Down
26 changes: 15 additions & 11 deletions base/src/main/java/com/tinyengine/it/config/AiChatConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -52,21 +52,25 @@ public static Map<String, AiChatConfigData> getAiChatConfig(String model, String
Map<String, String> ernieBotHeaders = new HashMap<>();


config.put(Enums.FoundationModel.GPT_35_TURBO.getValue(), new AiChatConfigData(
OPENAI_API_URL + "/v1/chat/completions", createCommonRequestOption(), openaiHeaders, "openai"));
config.put(Enums.FoundationModel.GPT_35_TURBO.getValue(),
new AiChatConfigData(
OPENAI_API_URL + "/v1/chat/completions", createCommonRequestOption(), openaiHeaders,
"openai"));

config.put(Enums.FoundationModel.LOCAL_GPT.getValue(), new AiChatConfigData(
LOCAL_GPT_API_URL + "/v1/chat/completions", createCommonRequestOption(), localGptHeaders, "!openai"));
config.put(Enums.FoundationModel.LOCAL_GPT.getValue(),
new AiChatConfigData(
LOCAL_GPT_API_URL + "/v1/chat/completions", createCommonRequestOption(), localGptHeaders,
"!openai"));

config.put(Enums.FoundationModel.DEEPSEEK_V3.getValue(), new AiChatConfigData(
DEEPSEEK_V3_URL + "/chat/completions", createCommonRequestOption(), deepSeekHeaders, "DeepSeek"));
config.put(Enums.FoundationModel.DEEPSEEK_V3.getValue(),
new AiChatConfigData(
DEEPSEEK_V3_URL + "/chat/completions", createCommonRequestOption(), deepSeekHeaders,
"DeepSeek"));

String ernieBotAccessToken = Enums.FoundationModel.ERNIBOT_TURBO.getValue().equals(model) ? token : null;
config.put(Enums.FoundationModel.ERNIBOT_TURBO.getValue(),
new AiChatConfigData(
"https://aip.baidubce.com/rpc/2.0/ai_custom/v1/wenxinworkshop/chat/completions_pro?access_token="
+ ernieBotAccessToken,
createCommonRequestOption(), ernieBotHeaders, "baidu"));
config.put(Enums.FoundationModel.ERNIBOT_TURBO.getValue(), new AiChatConfigData(
"https://aip.baidubce.com/rpc/2.0/ai_custom/v1/wenxinworkshop/chat/completions_pro?access_token="
+ ernieBotAccessToken, createCommonRequestOption(), ernieBotHeaders, "baidu"));
return config;
}

Expand Down
Loading
Loading