Skip to content

Commit 81b4ef0

Browse files
authored
fix: Format code and fix style and data issues (#225)
1 parent bd015fe commit 81b4ef0

File tree

96 files changed

+1640
-1550
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+1640
-1550
lines changed

app/src/main/resources/application-local.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ spring:
88
password:
99
sql:
1010
init:
11-
schema-locations: classpath:sql/h2/create_all_tables_ddl_v1.h2.sql
12-
data-locations: classpath:sql/h2/init_data_for_test.sql
11+
schema-locations: classpath:sql/h2/create_all_tables_ddl_v1.0.0.h2.sql
12+
data-locations: classpath:sql/h2/init_data_for_test_v1.0.0.sql
1313

1414
springdoc:
1515
api-docs:

app/src/main/resources/sql/h2/init_data_for_test.sql

Lines changed: 0 additions & 178 deletions
This file was deleted.

app/src/main/resources/sql/h2/init_data_for_test_v1.0.0.sql

Lines changed: 175 additions & 0 deletions
Large diffs are not rendered by default.

app/src/main/resources/sql/h2/update_all_tables_ddl.sql

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,5 @@ ALTER TABLE t_platform_history MODIFY tenant_id varchar(60) NULL;
2828
ALTER TABLE t_task_record MODIFY tenant_id varchar(60) NULL;
2929
ALTER TABLE t_user MODIFY tenant_id varchar(60) NULL;
3030

31-
ALTER TABLE t_component_library ADD app_id int NULL;
31+
ALTER TABLE t_component_library ADD app_id int NULL;
32+

app/src/main/resources/sql/mysql/init_data_for_test.sql

Lines changed: 0 additions & 180 deletions
This file was deleted.

app/src/main/resources/sql/mysql/init_data_for_test_v1.0.0.sql

Lines changed: 175 additions & 0 deletions
Large diffs are not rendered by default.

app/src/main/resources/sql/mysql/update_all_tables_ddl.sql

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,5 @@ ALTER TABLE t_platform_history MODIFY tenant_id varchar(60) NULL;
2828
ALTER TABLE t_task_record MODIFY tenant_id varchar(60) NULL;
2929
ALTER TABLE t_user MODIFY tenant_id varchar(60) NULL;
3030

31-
ALTER TABLE t_component_library ADD app_id int NULL;
31+
ALTER TABLE t_component_library ADD app_id int NULL;
32+

base/src/main/java/com/tinyengine/it/common/context/LoginUserContext.java

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,31 +20,35 @@ public interface LoginUserContext {
2020
* 返回当前用户所诉的业务租户信息
2121
* @return 租户ID
2222
*/
23-
public String getTenantId();
23+
String getTenantId();
2424

2525
/**
2626
* 返回当前用户信息
2727
* @return 用户ID
2828
*/
29-
public String getLoginUserId();
29+
String getLoginUserId();
3030

3131
/**
3232
* 返回当前用户所属业务租户信息
3333
* @return 业务租户ID
3434
*/
35-
public String getRenterId();
35+
String getRenterId();
3636

3737
/**
3838
* 返回当前应用信息
3939
* @return 应用ID
4040
*/
41-
public int getAppId();
41+
int getAppId();
4242

4343
/**
4444
* 返回当前设计器信息
4545
* @return 设计器ID
4646
*/
47-
public int getPlatformId();
47+
int getPlatformId();
4848

49-
public String getSiteId();
49+
/**
50+
* getSiteId
51+
* @return Strinig
52+
*/
53+
String getSiteId();
5054
}

base/src/main/java/com/tinyengine/it/common/utils/SecurityFileCheckUtil.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import org.springframework.web.multipart.MultipartFile;
1919

2020
import java.io.File;
21+
import java.util.Locale;
2122
import java.util.Map;
2223
import java.util.Objects;
2324
import java.util.regex.Pattern;
@@ -41,7 +42,8 @@ public class SecurityFileCheckUtil {
4142
public static boolean checkPathHasCrossDir(String dirOrFileName) {
4243
if (!dirOrFileName.contains("../") && !dirOrFileName.contains("/..")) {
4344
if (!dirOrFileName.contains("..\\") && !dirOrFileName.contains("\\..")) {
44-
return dirOrFileName.contains("./") || dirOrFileName.contains(".\\.\\") || dirOrFileName.contains("%00");
45+
return dirOrFileName.contains("./") || dirOrFileName.contains(".\\.\\")
46+
|| dirOrFileName.contains("%00");
4547
} else {
4648
return true;
4749
}
@@ -142,15 +144,16 @@ public static boolean filePathIsValid(String fileName) {
142144
}
143145

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

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

150152
if (os.contains("win")) {
151153
// 针对Windows的非法字符
152154
illegalChars = "[<>:\"/\\|?*]";
153-
} else if (os.contains("nix") || os.contains("nux") || os.contains("mac")) {
155+
}
156+
if (os.contains("nix") || os.contains("nux") || os.contains("mac")) {
154157
// 针对Linux和macOS的非法字符(一般来说,Linux和macOS对文件名的限制较少,但有一些常见的非法字符)
155158
illegalChars = "[/]"; // Linux和macOS的路径不能包含斜杠 '/'
156159
}

base/src/main/java/com/tinyengine/it/config/AiChatConfig.java

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,21 +52,25 @@ public static Map<String, AiChatConfigData> getAiChatConfig(String model, String
5252
Map<String, String> ernieBotHeaders = new HashMap<>();
5353

5454

55-
config.put(Enums.FoundationModel.GPT_35_TURBO.getValue(), new AiChatConfigData(
56-
OPENAI_API_URL + "/v1/chat/completions", createCommonRequestOption(), openaiHeaders, "openai"));
55+
config.put(Enums.FoundationModel.GPT_35_TURBO.getValue(),
56+
new AiChatConfigData(
57+
OPENAI_API_URL + "/v1/chat/completions", createCommonRequestOption(), openaiHeaders,
58+
"openai"));
5759

58-
config.put(Enums.FoundationModel.LOCAL_GPT.getValue(), new AiChatConfigData(
59-
LOCAL_GPT_API_URL + "/v1/chat/completions", createCommonRequestOption(), localGptHeaders, "!openai"));
60+
config.put(Enums.FoundationModel.LOCAL_GPT.getValue(),
61+
new AiChatConfigData(
62+
LOCAL_GPT_API_URL + "/v1/chat/completions", createCommonRequestOption(), localGptHeaders,
63+
"!openai"));
6064

61-
config.put(Enums.FoundationModel.DEEPSEEK_V3.getValue(), new AiChatConfigData(
62-
DEEPSEEK_V3_URL + "/chat/completions", createCommonRequestOption(), deepSeekHeaders, "DeepSeek"));
65+
config.put(Enums.FoundationModel.DEEPSEEK_V3.getValue(),
66+
new AiChatConfigData(
67+
DEEPSEEK_V3_URL + "/chat/completions", createCommonRequestOption(), deepSeekHeaders,
68+
"DeepSeek"));
6369

6470
String ernieBotAccessToken = Enums.FoundationModel.ERNIBOT_TURBO.getValue().equals(model) ? token : null;
65-
config.put(Enums.FoundationModel.ERNIBOT_TURBO.getValue(),
66-
new AiChatConfigData(
67-
"https://aip.baidubce.com/rpc/2.0/ai_custom/v1/wenxinworkshop/chat/completions_pro?access_token="
68-
+ ernieBotAccessToken,
69-
createCommonRequestOption(), ernieBotHeaders, "baidu"));
71+
config.put(Enums.FoundationModel.ERNIBOT_TURBO.getValue(), new AiChatConfigData(
72+
"https://aip.baidubce.com/rpc/2.0/ai_custom/v1/wenxinworkshop/chat/completions_pro?access_token="
73+
+ ernieBotAccessToken, createCommonRequestOption(), ernieBotHeaders, "baidu"));
7074
return config;
7175
}
7276

0 commit comments

Comments
 (0)