czm/ManuAgent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整项目结构

Browse Source
This commit is contained in:
陈子默
2026-08-29 14:02:28 +08:00
parent c56aa6e752
commit c13302c0cb
52 changed files with 55270 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -10,8 +10,6 @@ data/
.env
.env.local
.DS_Store
dashscope_key.txt
deepseek_key.txt
__pycache__/
*.py[cod]
.env.*

2
README.md
View File

@@ -30,4 +30,4 @@ npm --prefix client run test -- --run
npm --prefix client run build
```
产品、数据库与验收设计见 [docs](docs/)。标准 Skill 源文件位于 [标准Skills](标准Skills/)，仅作为开发素材保留，不参与应用启动同步。
产品、数据库与验收设计见 [docs](docs/)。内置 Skill 与资源由 Flyway 种子迁移写入数据库，无需额外导入文件。

1
dashscope_key.txt Normal file
View File

@@ -0,0 +1 @@
sk-ws-H.EPYDEHX.hEpq.MEYCIQCvMQg2IhYKPVDB76hcNSvgbVVQ_npnqH6s2cRjiniBKAIhAN1UmUSUg6fiJLhYt3rJXONC6YrC7BlfzYd-FPqrIiD9

1
deepseek_key.txt Normal file
View File

@@ -0,0 +1 @@
sk-8d1419754bce4306bc99854ee5ccd505

6
server/pom.xml
View File

@@ -11,10 +11,10 @@
<relativePath/>
</parent>
<groupId>cn.alphaline</groupId>
<groupId>tech.easyflow</groupId>
<artifactId>ManuAgent-server</artifactId>
<version>0.1.0-SNAPSHOT</version>
<name>Smart Factory Approval Agent</name>
<version>0.1.0</version>
<name>ManuAgent</name>
<properties>
<java.version>21</java.version>

8
server/src/main/java/cn/alphaline/smartfactory/SmartFactoryApplication.java → server/src/main/java/tech/easyflow/manuagent/ManuAgentApplication.java
View File

@@ -1,6 +1,6 @@
package cn.alphaline.smartfactory;
package tech.easyflow.manuagent;
import cn.alphaline.smartfactory.config.AppProperties;
import tech.easyflow.manuagent.config.AppProperties;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -10,7 +10,7 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
*/
@SpringBootApplication
@EnableConfigurationProperties(AppProperties.class)
public class SmartFactoryApplication {
public class ManuAgentApplication {
/**
* 启动 Spring Boot 应用。
@@ -18,7 +18,7 @@ public class SmartFactoryApplication {
* @param args 命令行参数
*/
public static void main(String[] args) {
SpringApplication.run(SmartFactoryApplication.class, args);
SpringApplication.run(ManuAgentApplication.class, args);
}
}

2
server/src/main/java/cn/alphaline/smartfactory/agent/AgentController.java → server/src/main/java/tech/easyflow/manuagent/agent/AgentController.java
View File

@@ -1,4 +1,4 @@
package cn.alphaline.smartfactory.agent;
package tech.easyflow.manuagent.agent;
import com.fasterxml.jackson.databind.JsonNode;
import java.security.Principal;

2
server/src/main/java/cn/alphaline/smartfactory/agent/AgentEventService.java → server/src/main/java/tech/easyflow/manuagent/agent/AgentEventService.java
View File

@@ -1,4 +1,4 @@
package cn.alphaline.smartfactory.agent;
package tech.easyflow.manuagent.agent;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;

8
server/src/main/java/cn/alphaline/smartfactory/agent/AgentExecutionService.java → server/src/main/java/tech/easyflow/manuagent/agent/AgentExecutionService.java
View File

@@ -1,8 +1,8 @@
package cn.alphaline.smartfactory.agent;
package tech.easyflow.manuagent.agent;
import cn.alphaline.smartfactory.project.ProjectFileService;
import cn.alphaline.smartfactory.project.ProjectService;
import cn.alphaline.smartfactory.skill.SkillService;
import tech.easyflow.manuagent.project.ProjectFileService;
import tech.easyflow.manuagent.project.ProjectService;
import tech.easyflow.manuagent.skill.SkillService;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;

8
server/src/main/java/cn/alphaline/smartfactory/agent/AgentFactory.java → server/src/main/java/tech/easyflow/manuagent/agent/AgentFactory.java
View File

@@ -1,8 +1,8 @@
package cn.alphaline.smartfactory.agent;
package tech.easyflow.manuagent.agent;
import cn.alphaline.smartfactory.config.AppProperties;
import cn.alphaline.smartfactory.model.ModelService;
import cn.alphaline.smartfactory.project.ProjectFileService;
import tech.easyflow.manuagent.config.AppProperties;
import tech.easyflow.manuagent.model.ModelService;
import tech.easyflow.manuagent.project.ProjectFileService;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.agentscope.core.agui.adapter.AguiAdapterConfig;
import io.agentscope.core.agui.adapter.AguiAgentAdapter;

6
server/src/main/java/cn/alphaline/smartfactory/agent/AgentOutputService.java → server/src/main/java/tech/easyflow/manuagent/agent/AgentOutputService.java
View File

@@ -1,7 +1,7 @@
package cn.alphaline.smartfactory.agent;
package tech.easyflow.manuagent.agent;
import cn.alphaline.smartfactory.common.ApiException;
import cn.alphaline.smartfactory.project.ProjectFileService;
import tech.easyflow.manuagent.common.ApiException;
import tech.easyflow.manuagent.project.ProjectFileService;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;

12
server/src/main/java/cn/alphaline/smartfactory/agent/AgentRunService.java → server/src/main/java/tech/easyflow/manuagent/agent/AgentRunService.java
View File

@@ -1,10 +1,10 @@
package cn.alphaline.smartfactory.agent;
package tech.easyflow.manuagent.agent;
import cn.alphaline.smartfactory.artifact.ArtifactService;
import cn.alphaline.smartfactory.auth.UserService;
import cn.alphaline.smartfactory.common.ApiException;
import cn.alphaline.smartfactory.project.ProjectFileService;
import cn.alphaline.smartfactory.project.ProjectService;
import tech.easyflow.manuagent.artifact.ArtifactService;
import tech.easyflow.manuagent.auth.UserService;
import tech.easyflow.manuagent.common.ApiException;
import tech.easyflow.manuagent.project.ProjectFileService;
import tech.easyflow.manuagent.project.ProjectService;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;

6
server/src/main/java/cn/alphaline/smartfactory/agent/AgentRunStore.java → server/src/main/java/tech/easyflow/manuagent/agent/AgentRunStore.java
View File

@@ -1,7 +1,7 @@
package cn.alphaline.smartfactory.agent;
package tech.easyflow.manuagent.agent;
import cn.alphaline.smartfactory.common.ApiException;
import cn.alphaline.smartfactory.project.ProjectService;
import tech.easyflow.manuagent.common.ApiException;
import tech.easyflow.manuagent.project.ProjectService;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;

2
server/src/main/java/cn/alphaline/smartfactory/agent/DocumentViewTool.java → server/src/main/java/tech/easyflow/manuagent/agent/DocumentViewTool.java
View File

@@ -1,4 +1,4 @@
package cn.alphaline.smartfactory.agent;
package tech.easyflow.manuagent.agent;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonNode;

2
server/src/main/java/cn/alphaline/smartfactory/agent/PagedReadFileTool.java → server/src/main/java/tech/easyflow/manuagent/agent/PagedReadFileTool.java
View File

@@ -1,4 +1,4 @@
package cn.alphaline.smartfactory.agent;
package tech.easyflow.manuagent.agent;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;

2
server/src/main/java/cn/alphaline/smartfactory/agent/RunRecoveryService.java → server/src/main/java/tech/easyflow/manuagent/agent/RunRecoveryService.java
View File

@@ -1,4 +1,4 @@
package cn.alphaline.smartfactory.agent;
package tech.easyflow.manuagent.agent;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;

2
server/src/main/java/cn/alphaline/smartfactory/artifact/ArtifactController.java → server/src/main/java/tech/easyflow/manuagent/artifact/ArtifactController.java
View File

@@ -1,4 +1,4 @@
package cn.alphaline.smartfactory.artifact;
package tech.easyflow.manuagent.artifact;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;

6
server/src/main/java/cn/alphaline/smartfactory/artifact/ArtifactService.java → server/src/main/java/tech/easyflow/manuagent/artifact/ArtifactService.java
View File

@@ -1,7 +1,7 @@
package cn.alphaline.smartfactory.artifact;
package tech.easyflow.manuagent.artifact;
import cn.alphaline.smartfactory.common.ApiException;
import cn.alphaline.smartfactory.project.ProjectFileService;
import tech.easyflow.manuagent.common.ApiException;
import tech.easyflow.manuagent.project.ProjectFileService;
import com.fasterxml.jackson.databind.JsonNode;
import java.io.IOException;
import java.io.InputStream;

4
server/src/main/java/cn/alphaline/smartfactory/artifact/DocxValidator.java → server/src/main/java/tech/easyflow/manuagent/artifact/DocxValidator.java
View File

@@ -1,6 +1,6 @@
package cn.alphaline.smartfactory.artifact;
package tech.easyflow.manuagent.artifact;
import cn.alphaline.smartfactory.common.ApiException;
import tech.easyflow.manuagent.common.ApiException;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;

3
server/src/main/java/cn/alphaline/smartfactory/auth/AuthController.java → server/src/main/java/tech/easyflow/manuagent/auth/AuthController.java
View File

@@ -1,4 +1,4 @@
package cn.alphaline.smartfactory.auth;
package tech.easyflow.manuagent.auth;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
@@ -17,7 +17,6 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.bind.annotation.RestController;
/**

6
server/src/main/java/cn/alphaline/smartfactory/auth/UserService.java → server/src/main/java/tech/easyflow/manuagent/auth/UserService.java
View File

@@ -1,7 +1,7 @@
package cn.alphaline.smartfactory.auth;
package tech.easyflow.manuagent.auth;
import cn.alphaline.smartfactory.common.ApiException;
import cn.alphaline.smartfactory.config.AppProperties;
import tech.easyflow.manuagent.common.ApiException;
import tech.easyflow.manuagent.config.AppProperties;
import java.util.UUID;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;

2
server/src/main/java/cn/alphaline/smartfactory/common/ApiError.java → server/src/main/java/tech/easyflow/manuagent/common/ApiError.java
View File

@@ -1,4 +1,4 @@
package cn.alphaline.smartfactory.common;
package tech.easyflow.manuagent.common;
import java.time.Instant;

2
server/src/main/java/cn/alphaline/smartfactory/common/ApiException.java → server/src/main/java/tech/easyflow/manuagent/common/ApiException.java
View File

@@ -1,4 +1,4 @@
package cn.alphaline.smartfactory.common;
package tech.easyflow.manuagent.common;
import org.springframework.http.HttpStatus;

2
server/src/main/java/cn/alphaline/smartfactory/common/GlobalExceptionHandler.java → server/src/main/java/tech/easyflow/manuagent/common/GlobalExceptionHandler.java
View File

@@ -1,4 +1,4 @@
package cn.alphaline.smartfactory.common;
package tech.easyflow.manuagent.common;
import jakarta.validation.ConstraintViolationException;
import java.util.UUID;

2
server/src/main/java/cn/alphaline/smartfactory/common/TraceIdFilter.java → server/src/main/java/tech/easyflow/manuagent/common/TraceIdFilter.java
View File

@@ -1,4 +1,4 @@
package cn.alphaline.smartfactory.common;
package tech.easyflow.manuagent.common;
import jakarta.servlet.FilterChain;
import jakarta.servlet.ServletException;

2
server/src/main/java/cn/alphaline/smartfactory/config/AppProperties.java → server/src/main/java/tech/easyflow/manuagent/config/AppProperties.java
View File

@@ -1,4 +1,4 @@
package cn.alphaline.smartfactory.config;
package tech.easyflow.manuagent.config;
import java.nio.file.Path;
import java.time.Duration;

2
server/src/main/java/cn/alphaline/smartfactory/config/InfraConfig.java → server/src/main/java/tech/easyflow/manuagent/config/InfraConfig.java
View File

@@ -1,4 +1,4 @@
package cn.alphaline.smartfactory.config;
package tech.easyflow.manuagent.config;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;

6
server/src/main/java/cn/alphaline/smartfactory/config/SecurityConfig.java → server/src/main/java/tech/easyflow/manuagent/config/SecurityConfig.java
View File

@@ -1,7 +1,7 @@
package cn.alphaline.smartfactory.config;
package tech.easyflow.manuagent.config;
import cn.alphaline.smartfactory.auth.UserService;
import cn.alphaline.smartfactory.common.ApiError;
import tech.easyflow.manuagent.auth.UserService;
import tech.easyflow.manuagent.common.ApiError;
import com.fasterxml.jackson.databind.ObjectMapper;
import java.time.Instant;
import java.util.UUID;

2
server/src/main/java/cn/alphaline/smartfactory/config/SkillRepositoryConfig.java → server/src/main/java/tech/easyflow/manuagent/config/SkillRepositoryConfig.java
View File

@@ -1,4 +1,4 @@
package cn.alphaline.smartfactory.config;
package tech.easyflow.manuagent.config;
import io.agentscope.core.skill.repository.postgresql.PostgresSkillRepository;
import javax.sql.DataSource;

6
server/src/main/java/cn/alphaline/smartfactory/model/KeyCipher.java → server/src/main/java/tech/easyflow/manuagent/model/KeyCipher.java
View File

@@ -1,7 +1,7 @@
package cn.alphaline.smartfactory.model;
package tech.easyflow.manuagent.model;
import cn.alphaline.smartfactory.common.ApiException;
import cn.alphaline.smartfactory.config.AppProperties;
import tech.easyflow.manuagent.common.ApiException;
import tech.easyflow.manuagent.config.AppProperties;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.security.GeneralSecurityException;

2
server/src/main/java/cn/alphaline/smartfactory/model/ModelController.java → server/src/main/java/tech/easyflow/manuagent/model/ModelController.java
View File

@@ -1,4 +1,4 @@
package cn.alphaline.smartfactory.model;
package tech.easyflow.manuagent.model;
import jakarta.validation.Valid;
import java.security.Principal;

8
server/src/main/java/cn/alphaline/smartfactory/model/ModelService.java → server/src/main/java/tech/easyflow/manuagent/model/ModelService.java
View File

@@ -1,8 +1,8 @@
package cn.alphaline.smartfactory.model;
package tech.easyflow.manuagent.model;
import cn.alphaline.smartfactory.auth.UserService;
import cn.alphaline.smartfactory.common.ApiException;
import cn.alphaline.smartfactory.config.AppProperties;
import tech.easyflow.manuagent.auth.UserService;
import tech.easyflow.manuagent.common.ApiException;
import tech.easyflow.manuagent.config.AppProperties;
import com.fasterxml.jackson.databind.ObjectMapper;
import java.io.IOException;
import java.net.URI;

4
server/src/main/java/cn/alphaline/smartfactory/project/ProjectController.java → server/src/main/java/tech/easyflow/manuagent/project/ProjectController.java
View File

@@ -1,6 +1,6 @@
package cn.alphaline.smartfactory.project;
package tech.easyflow.manuagent.project;
import cn.alphaline.smartfactory.agent.AgentRunService;
import tech.easyflow.manuagent.agent.AgentRunService;
import com.fasterxml.jackson.databind.JsonNode;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotBlank;

8
server/src/main/java/cn/alphaline/smartfactory/project/ProjectFileService.java → server/src/main/java/tech/easyflow/manuagent/project/ProjectFileService.java
View File

@@ -1,8 +1,8 @@
package cn.alphaline.smartfactory.project;
package tech.easyflow.manuagent.project;
import cn.alphaline.smartfactory.auth.UserService;
import cn.alphaline.smartfactory.common.ApiException;
import cn.alphaline.smartfactory.config.AppProperties;
import tech.easyflow.manuagent.auth.UserService;
import tech.easyflow.manuagent.common.ApiException;
import tech.easyflow.manuagent.config.AppProperties;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;

6
server/src/main/java/cn/alphaline/smartfactory/project/ProjectService.java → server/src/main/java/tech/easyflow/manuagent/project/ProjectService.java
View File

@@ -1,7 +1,7 @@
package cn.alphaline.smartfactory.project;
package tech.easyflow.manuagent.project;
import cn.alphaline.smartfactory.auth.UserService;
import cn.alphaline.smartfactory.common.ApiException;
import tech.easyflow.manuagent.auth.UserService;
import tech.easyflow.manuagent.common.ApiException;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;

2
server/src/main/java/cn/alphaline/smartfactory/skill/SkillController.java → server/src/main/java/tech/easyflow/manuagent/skill/SkillController.java
View File

@@ -1,4 +1,4 @@
package cn.alphaline.smartfactory.skill;
package tech.easyflow.manuagent.skill;
import java.security.Principal;
import java.util.List;

5
server/src/main/java/cn/alphaline/smartfactory/skill/SkillPackageReader.java → server/src/main/java/tech/easyflow/manuagent/skill/SkillPackageReader.java
View File

@@ -1,6 +1,6 @@
package cn.alphaline.smartfactory.skill;
package tech.easyflow.manuagent.skill;
import cn.alphaline.smartfactory.common.ApiException;
import tech.easyflow.manuagent.common.ApiException;
import io.agentscope.core.skill.AgentSkill;
import java.io.IOException;
import java.nio.ByteBuffer;
@@ -11,7 +11,6 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HexFormat;

8
server/src/main/java/cn/alphaline/smartfactory/skill/SkillService.java → server/src/main/java/tech/easyflow/manuagent/skill/SkillService.java
View File

@@ -1,8 +1,8 @@
package cn.alphaline.smartfactory.skill;
package tech.easyflow.manuagent.skill;
import cn.alphaline.smartfactory.auth.UserService;
import cn.alphaline.smartfactory.common.ApiException;
import cn.alphaline.smartfactory.config.AppProperties;
import tech.easyflow.manuagent.auth.UserService;
import tech.easyflow.manuagent.common.ApiException;
import tech.easyflow.manuagent.config.AppProperties;
import io.agentscope.core.skill.AgentSkill;
import io.agentscope.core.skill.repository.postgresql.PostgresSkillRepository;
import java.io.IOException;

36
server/src/main/resources/application.yml
View File

@@ -1,10 +1,10 @@
spring:
application:
name: smart-factory-approval-agent
name: manu-agent
datasource:
url: ${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:54330/smart_factory_agent}
username: ${SPRING_DATASOURCE_USERNAME:smart_factory}
password: ${SPRING_DATASOURCE_PASSWORD:smart_factory}
url: jdbc:postgresql://localhost:54330/smart_factory_agent
username: smart_factory
password: smart_factory
hikari:
maximum-pool-size: 12
minimum-idle: 2
@@ -22,27 +22,27 @@ spring:
default-property-inclusion: non_null
server:
port: ${SERVER_PORT:8080}
port: 8080
servlet:
session:
cookie:
http-only: true
same-site: lax
secure: ${SESSION_COOKIE_SECURE:false}
secure: false
app:
data-root: ${APP_DATA_ROOT:file:../data}
deepseek-key-file: ${DEEPSEEK_KEY_FILE:./deepseek_key.txt}
dashscope-key-file: ${DASHSCOPE_KEY_FILE:./dashscope_key.txt}
master-key: ${APP_MASTER_KEY:smart-factory-local-master-key}
admin-username: ${APP_ADMIN_USERNAME:admin}
admin-password: ${APP_ADMIN_PASSWORD:admin123}
model-base-url: ${APP_MODEL_BASE_URL:https://api.deepseek.com}
model-id: ${APP_MODEL_ID:deepseek-v4-flash}
model-context-window: ${APP_MODEL_CONTEXT_WINDOW:131072}
sandbox-image: ${APP_SANDBOX_IMAGE:smart-factory-agent-runtime:0.1.0}
sandbox-network: ${APP_SANDBOX_NETWORK:bridge}
run-timeout: ${APP_RUN_TIMEOUT:60m}
data-root: file:../data
deepseek-key-file: ./deepseek_key.txt
dashscope-key-file: ./dashscope_key.txt
master-key: smart-factory-local-master-key
admin-username: admin
admin-password: admin123
model-base-url: https://api.deepseek.com
model-id: deepseek-v4-flash
model-context-window: 131072
sandbox-image: smart-factory-agent-runtime:0.1.0
sandbox-network: bridge
run-timeout: 60m
logging:
pattern:

55145
server/src/main/resources/db/migration/V2__seed_skills.sql Normal file
View File

File diff suppressed because it is too large Load Diff

1
server/src/main/resources/db/migration/V2__seed_skills.sql.conf Normal file
View File

@@ -0,0 +1 @@
placeholderReplacement=false

15
server/src/test/java/cn/alphaline/smartfactory/DatabaseAndEventIntegrationTest.java → server/src/test/java/tech/easyflow/manuagent/DatabaseAndEventIntegrationTest.java
View File

@@ -1,14 +1,15 @@
package cn.alphaline.smartfactory;
package tech.easyflow.manuagent;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import cn.alphaline.smartfactory.agent.AgentEventService;
import cn.alphaline.smartfactory.artifact.ArtifactService;
import cn.alphaline.smartfactory.artifact.DocxValidator;
import cn.alphaline.smartfactory.project.ProjectService;
import cn.alphaline.smartfactory.project.ProjectFileService;
import tech.easyflow.manuagent.agent.AgentEventService;
import tech.easyflow.manuagent.artifact.ArtifactService;
import tech.easyflow.manuagent.artifact.DocxValidator;
import tech.easyflow.manuagent.auth.UserService;
import tech.easyflow.manuagent.project.ProjectService;
import tech.easyflow.manuagent.project.ProjectFileService;
import com.fasterxml.jackson.databind.ObjectMapper;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -212,7 +213,7 @@ class DatabaseAndEventIntegrationTest {
""").param("id", UUID.randomUUID()).param("projectId", projectId).param("runId", runId)
.param("sha", "0".repeat(64)).update();
ProjectService service = new ProjectService(jdbc, mock(cn.alphaline.smartfactory.auth.UserService.class), new ObjectMapper());
ProjectService service = new ProjectService(jdbc, mock(UserService.class), new ObjectMapper());
service.delete(projectId);
for (String table : List.of("agent_event", "artifact", "project_plan", "project_file", "agent_run")) {

6
server/src/test/java/cn/alphaline/smartfactory/KeyCipherAndShellTest.java → server/src/test/java/tech/easyflow/manuagent/KeyCipherAndShellTest.java
View File

@@ -1,9 +1,9 @@
package cn.alphaline.smartfactory;
package tech.easyflow.manuagent;
import static org.assertj.core.api.Assertions.assertThat;
import cn.alphaline.smartfactory.config.AppProperties;
import cn.alphaline.smartfactory.model.KeyCipher;
import tech.easyflow.manuagent.config.AppProperties;
import tech.easyflow.manuagent.model.KeyCipher;
import java.nio.file.Path;
import java.time.Duration;
import org.junit.jupiter.api.Test;

2
server/src/test/java/cn/alphaline/smartfactory/agent/AgentExecutionServiceTest.java → server/src/test/java/tech/easyflow/manuagent/agent/AgentExecutionServiceTest.java
View File

@@ -1,4 +1,4 @@
package cn.alphaline.smartfactory.agent;
package tech.easyflow.manuagent.agent;
import static org.assertj.core.api.Assertions.assertThat;

2
server/src/test/java/cn/alphaline/smartfactory/agent/AgentRunServiceTest.java → server/src/test/java/tech/easyflow/manuagent/agent/AgentRunServiceTest.java
View File

@@ -1,4 +1,4 @@
package cn.alphaline.smartfactory.agent;
package tech.easyflow.manuagent.agent;
import static org.assertj.core.api.Assertions.assertThat;

2
server/src/test/java/cn/alphaline/smartfactory/agent/DocumentViewToolTest.java → server/src/test/java/tech/easyflow/manuagent/agent/DocumentViewToolTest.java
View File

@@ -1,4 +1,4 @@
package cn.alphaline.smartfactory.agent;
package tech.easyflow.manuagent.agent;
import static org.assertj.core.api.Assertions.assertThat;

2
server/src/test/java/cn/alphaline/smartfactory/agent/PagedReadFileToolTest.java → server/src/test/java/tech/easyflow/manuagent/agent/PagedReadFileToolTest.java
View File

@@ -1,4 +1,4 @@
package cn.alphaline.smartfactory.agent;
package tech.easyflow.manuagent.agent;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;

4
server/src/test/java/cn/alphaline/smartfactory/artifact/DocxValidatorTest.java → server/src/test/java/tech/easyflow/manuagent/artifact/DocxValidatorTest.java
View File

@@ -1,9 +1,9 @@
package cn.alphaline.smartfactory.artifact;
package tech.easyflow.manuagent.artifact;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import cn.alphaline.smartfactory.common.ApiException;
import tech.easyflow.manuagent.common.ApiException;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;

4
server/src/test/java/cn/alphaline/smartfactory/auth/AuthControllerTest.java → server/src/test/java/tech/easyflow/manuagent/auth/AuthControllerTest.java
View File

@@ -1,4 +1,4 @@
package cn.alphaline.smartfactory.auth;
package tech.easyflow.manuagent.auth;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
@@ -7,7 +7,7 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import cn.alphaline.smartfactory.common.GlobalExceptionHandler;
import tech.easyflow.manuagent.common.GlobalExceptionHandler;
import org.junit.jupiter.api.Test;
import org.springframework.http.MediaType;
import org.springframework.security.authentication.AuthenticationManager;

2
server/src/test/java/cn/alphaline/smartfactory/common/GlobalExceptionHandlerTest.java → server/src/test/java/tech/easyflow/manuagent/common/GlobalExceptionHandlerTest.java
View File

@@ -1,4 +1,4 @@
package cn.alphaline.smartfactory.common;
package tech.easyflow.manuagent.common;
import static org.assertj.core.api.Assertions.assertThatCode;

11
server/src/test/java/cn/alphaline/smartfactory/project/ProjectFileServiceTest.java → server/src/test/java/tech/easyflow/manuagent/project/ProjectFileServiceTest.java
View File

@@ -1,11 +1,12 @@
package cn.alphaline.smartfactory.project;
package tech.easyflow.manuagent.project;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockito.Mockito.mock;
import cn.alphaline.smartfactory.auth.UserService;
import cn.alphaline.smartfactory.config.AppProperties;
import tech.easyflow.manuagent.auth.UserService;
import tech.easyflow.manuagent.common.ApiException;
import tech.easyflow.manuagent.config.AppProperties;
import java.nio.file.Files;
import java.nio.file.Path;
import java.time.Duration;
@@ -66,9 +67,9 @@ class ProjectFileServiceTest {
ProjectFileService service = service();
assertThatThrownBy(() -> service.normalizeUploadPath("../企业材料.pdf", "企业材料.pdf"))
.isInstanceOf(cn.alphaline.smartfactory.common.ApiException.class);
.isInstanceOf(ApiException.class);
assertThatThrownBy(() -> service.normalizeUploadPath("其他文件.pdf", "企业材料.pdf"))
.isInstanceOf(cn.alphaline.smartfactory.common.ApiException.class);
.isInstanceOf(ApiException.class);
}
/**

2
server/src/test/java/cn/alphaline/smartfactory/skill/SkillArchiveTest.java → server/src/test/java/tech/easyflow/manuagent/skill/SkillArchiveTest.java
View File

@@ -1,4 +1,4 @@
package cn.alphaline.smartfactory.skill;
package tech.easyflow.manuagent.skill;
import static org.assertj.core.api.Assertions.assertThat;