This is an automated email from the ASF dual-hosted git repository.
wangtao29 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozhera.git
The following commit(s) were added to refs/heads/master by this push:
new 89dbc9d8 fix: add git suffix (#615)
89dbc9d8 is described below
commit 89dbc9d886aebd380f53f926cb2a7d8f2f8a618e
Author: EricDing <[email protected]>
AuthorDate: Mon Nov 24 19:06:34 2025 +0800
fix: add git suffix (#615)
* refactor: refactor ozhera intelligence
* feat: add coder tool and git mcp
* fix: update codefix agent and tool
* fix: add git suffix
---
.../ozhera-intelligence-domain/pom.xml | 18 +++++
.../ozhera-intelligence-server/pom.xml | 46 ++++++++++-
.../src/main/resources/application.properties | 3 +-
.../resources/config/opensource-outer.properties | 3 +-
.../ozhera/intelligence/service/PromptService.java | 14 +++-
ozhera-intelligence/pom.xml | 92 +++++++++++++++++++++-
6 files changed, 169 insertions(+), 7 deletions(-)
diff --git a/ozhera-intelligence/ozhera-intelligence-domain/pom.xml
b/ozhera-intelligence/ozhera-intelligence-domain/pom.xml
index 53843913..484b8137 100644
--- a/ozhera-intelligence/ozhera-intelligence-domain/pom.xml
+++ b/ozhera-intelligence/ozhera-intelligence-domain/pom.xml
@@ -48,6 +48,24 @@
</dependencies>
<build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.11.0</version>
+ <configuration>
+ <source>21</source>
+ <target>21</target>
+ <annotationProcessorPaths>
+ <path>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>1.18.30</version>
+ </path>
+ </annotationProcessorPaths>
+ </configuration>
+ </plugin>
+ </plugins>
<resources>
<resource>
<directory>${project.basedir}/../../</directory>
diff --git a/ozhera-intelligence/ozhera-intelligence-server/pom.xml
b/ozhera-intelligence/ozhera-intelligence-server/pom.xml
index 61d46514..f5ca09ac 100644
--- a/ozhera-intelligence/ozhera-intelligence-server/pom.xml
+++ b/ozhera-intelligence/ozhera-intelligence-server/pom.xml
@@ -41,6 +41,46 @@
<artifactId>ozhera-intelligence-service</artifactId>
<version>2.2.6-SNAPSHOT</version>
</dependency>
+
+ <!-- JAXB API for JDK 11+ -->
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>3.0.1</version>
+ </dependency>
+
+ <!-- JAXB Runtime -->
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>3.0.2</version>
+ </dependency>
+
+ <!-- Jakarta Servlet API for JDK 21 -->
+ <dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>5.0.0</version>
+ </dependency>
+
+ <!-- Jakarta Annotation API -->
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>2.1.1</version>
+ </dependency>
+
+ <!-- Spring Web for RestTemplate -->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ </dependency>
+
+ <!-- Spring Boot Starter Web -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ </dependency>
</dependencies>
<build>
@@ -75,10 +115,10 @@
</configuration>
</plugin>
- <!-- <plugin>
+ <plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <version>2.7.15</version>
+ <version>${springboot.version}</version>
<configuration>
<mainClass>org.apache.ozhera.intelligence.bootstrap.IntelligenceBootStrap</mainClass>
</configuration>
@@ -89,7 +129,7 @@
</goals>
</execution>
</executions>
- </plugin>-->
+ </plugin>
</plugins>
diff --git
a/ozhera-intelligence/ozhera-intelligence-server/src/main/resources/application.properties
b/ozhera-intelligence/ozhera-intelligence-server/src/main/resources/application.properties
index 56b6c1eb..97043ec8 100644
---
a/ozhera-intelligence/ozhera-intelligence-server/src/main/resources/application.properties
+++
b/ozhera-intelligence/ozhera-intelligence-server/src/main/resources/application.properties
@@ -54,4 +54,5 @@ prometheus.api.url=${prometheus.api.url}
# Git Default Configuration
git.default.username=${git.default.username}
-git.default.token=${git.default.token}
\ No newline at end of file
+git.default.token=${git.default.token}
+git.email.suffix=${git.email.suffix}
diff --git
a/ozhera-intelligence/ozhera-intelligence-server/src/main/resources/config/opensource-outer.properties
b/ozhera-intelligence/ozhera-intelligence-server/src/main/resources/config/opensource-outer.properties
index f279dcd9..bc80007c 100644
---
a/ozhera-intelligence/ozhera-intelligence-server/src/main/resources/config/opensource-outer.properties
+++
b/ozhera-intelligence/ozhera-intelligence-server/src/main/resources/config/opensource-outer.properties
@@ -52,4 +52,5 @@ prometheus.api.url=
# Git Default Configuration
git.default.username=xxx
-git.default.token=xxx
\ No newline at end of file
+git.default.token=xxx
[email protected]
diff --git
a/ozhera-intelligence/ozhera-intelligence-service/src/main/java/org/apache/ozhera/intelligence/service/PromptService.java
b/ozhera-intelligence/ozhera-intelligence-service/src/main/java/org/apache/ozhera/intelligence/service/PromptService.java
index ac06c16e..8dc0c0af 100644
---
a/ozhera-intelligence/ozhera-intelligence-service/src/main/java/org/apache/ozhera/intelligence/service/PromptService.java
+++
b/ozhera-intelligence/ozhera-intelligence-service/src/main/java/org/apache/ozhera/intelligence/service/PromptService.java
@@ -28,6 +28,7 @@ import run.mone.hive.common.AiTemplate;
import run.mone.hive.common.MultiXmlParser;
import run.mone.hive.common.ToolDataInfo;
import run.mone.hive.configs.LLMConfig;
+import run.mone.hive.llm.CustomConfig;
import run.mone.hive.llm.LLM;
import run.mone.hive.llm.LLMProvider;
@@ -42,7 +43,18 @@ public class PromptService {
@PostConstruct
private void init() {
- llm = new
LLM(LLMConfig.builder().llmProvider(LLMProvider.valueOf(System.getenv("LLM_PROVIDER"))).build());
+ LLMProvider llmProvider =
LLMProvider.valueOf(System.getenv("LLM_PROVIDER"));
+ LLMConfig config =
LLMConfig.builder().llmProvider(llmProvider).build();
+ llm = new LLM(config);
+ // 为 MIFY_GATEWAY 设置环境变量中的配置
+ if (llmProvider == LLMProvider.MIFY_GATEWAY) {
+ config.setUrl(System.getenv("MIFY_GATEWAY_URL"));
+ config.setToken(System.getenv("MIFY_API_KEY"));
+ CustomConfig customConfig = new CustomConfig();
+ customConfig.setModel(System.getenv("MIFY_MODEL"));
+ customConfig.addCustomHeader(CustomConfig.X_MODEL_PROVIDER_ID,
System.getenv("MIFY_MODEL_PROVIDER_ID"));
+ config.setCustomConfig(customConfig);
+ }
}
/**
diff --git a/ozhera-intelligence/pom.xml b/ozhera-intelligence/pom.xml
index 65e75b04..03626c57 100644
--- a/ozhera-intelligence/pom.xml
+++ b/ozhera-intelligence/pom.xml
@@ -40,7 +40,8 @@
<properties>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
- <spring.version>5.3.29</spring.version>
+ <springboot.version>2.7.18</springboot.version>
+ <spring.version>5.3.31</spring.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- Replace it with the absolute path of your own trace-etl project.
issue#19-->
<maven.jcommonDirectory>~</maven.jcommonDirectory>
@@ -48,6 +49,31 @@
<dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-expression</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jcl</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
@@ -83,6 +109,70 @@
<artifactId>okhttp</artifactId>
<version>4.12.0</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-core</artifactId>
+ <version>9.0.83</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-el</artifactId>
+ <version>9.0.83</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>2.15.2</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>2.15.2</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>2.15.2</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-yaml</artifactId>
+ <version>2.15.2</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>jackson-datatype-jsr310</artifactId>
+ <version>2.15.2</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>2.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>io.projectreactor</groupId>
+ <artifactId>reactor-core</artifactId>
+ <version>3.7.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ <version>${springboot.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-websocket</artifactId>
+ <version>${springboot.version}</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
