调整项目结构

server/src/main/java/tech/easyflow/manuagent/ManuAgentApplication.java

@@ -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);
     }
 }
 

server/src/main/java/tech/easyflow/manuagent/agent/AgentController.java

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

server/src/main/java/tech/easyflow/manuagent/agent/AgentEventService.java

@@ -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;

server/src/main/java/tech/easyflow/manuagent/agent/AgentExecutionService.java

@@ -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;

server/src/main/java/tech/easyflow/manuagent/agent/AgentFactory.java

@@ -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;

server/src/main/java/tech/easyflow/manuagent/agent/AgentOutputService.java

@@ -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;

server/src/main/java/tech/easyflow/manuagent/agent/AgentRunService.java

@@ -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;

server/src/main/java/tech/easyflow/manuagent/agent/AgentRunStore.java

@@ -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;

server/src/main/java/tech/easyflow/manuagent/agent/DocumentViewTool.java

@@ -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;

server/src/main/java/tech/easyflow/manuagent/agent/PagedReadFileTool.java

@@ -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;

server/src/main/java/tech/easyflow/manuagent/agent/RunRecoveryService.java

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

server/src/main/java/tech/easyflow/manuagent/artifact/ArtifactController.java

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

server/src/main/java/tech/easyflow/manuagent/artifact/ArtifactService.java

@@ -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;

server/src/main/java/tech/easyflow/manuagent/artifact/DocxValidator.java

@@ -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;

server/src/main/java/tech/easyflow/manuagent/auth/AuthController.java

@@ -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;
 
 /**

server/src/main/java/tech/easyflow/manuagent/auth/UserService.java

@@ -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;

server/src/main/java/tech/easyflow/manuagent/common/ApiError.java

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

server/src/main/java/tech/easyflow/manuagent/common/ApiException.java

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

server/src/main/java/tech/easyflow/manuagent/common/GlobalExceptionHandler.java

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

server/src/main/java/tech/easyflow/manuagent/common/TraceIdFilter.java

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

server/src/main/java/tech/easyflow/manuagent/config/AppProperties.java

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

server/src/main/java/tech/easyflow/manuagent/config/InfraConfig.java

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

server/src/main/java/tech/easyflow/manuagent/config/SecurityConfig.java

@@ -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;

server/src/main/java/tech/easyflow/manuagent/config/SkillRepositoryConfig.java

@@ -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;

server/src/main/java/tech/easyflow/manuagent/model/KeyCipher.java

@@ -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;

server/src/main/java/tech/easyflow/manuagent/model/ModelController.java

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

server/src/main/java/tech/easyflow/manuagent/model/ModelService.java

@@ -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;

server/src/main/java/tech/easyflow/manuagent/project/ProjectController.java

@@ -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;

server/src/main/java/tech/easyflow/manuagent/project/ProjectFileService.java

@@ -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;

server/src/main/java/tech/easyflow/manuagent/project/ProjectService.java

@@ -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;

server/src/main/java/tech/easyflow/manuagent/skill/SkillController.java

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

server/src/main/java/tech/easyflow/manuagent/skill/SkillPackageReader.java

@@ -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;

server/src/main/java/tech/easyflow/manuagent/skill/SkillService.java

@@ -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;

server/src/main/resources/application.yml

@@ -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:

server/src/main/resources/db/migration/V2__seed_skills.sql.conf

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