Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -651,6 +651,7 @@ create table `t_component_library`
`id` int not null auto_increment comment '主键id',
`version` varchar(255) not null comment '版本',
`name` varchar(255) not null comment '名称',
`app_id` int comment '关联应用id',
`package` varchar(255) not null comment '包名',
`registry` varchar(255) comment '注册',
`framework` varchar(255) not null comment '技术栈',
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: 3 additions & 0 deletions app/src/main/resources/sql/h2/update_all_tables_ddl.sql
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,6 @@ ALTER TABLE t_platform MODIFY tenant_id varchar(60) NULL;
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;

Original file line number Diff line number Diff line change
Expand Up @@ -651,6 +651,7 @@ create table `t_component_library`
`id` int not null auto_increment comment '主键id',
`version` varchar(255) not null comment '版本',
`name` varchar(255) not null comment '名称',
`app_id` int comment '关联应用id',
`package` varchar(255) not null comment '包名',
`registry` varchar(255) comment '注册',
`framework` varchar(255) not null comment '技术栈',
Expand Down
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: 3 additions & 0 deletions app/src/main/resources/sql/mysql/update_all_tables_ddl.sql
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,6 @@ ALTER TABLE t_platform MODIFY tenant_id varchar(60) NULL;
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;

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 @@ -41,6 +41,7 @@ public void insertFill(MetaObject metaObject) {
this.setFieldValByName("createdBy", loginUserContext.getLoginUserId(), metaObject);
this.setFieldValByName("lastUpdatedBy", loginUserContext.getLoginUserId(), metaObject);
this.setFieldValByName("platformId", loginUserContext.getPlatformId(), metaObject);
fillStrategy(metaObject, "tenantId", loginUserContext.getTenantId());
}

@Override
Expand Down
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