diff --git a/pom.xml b/pom.xml index 00c69570..37f57495 100644 --- a/pom.xml +++ b/pom.xml @@ -32,17 +32,17 @@ 0.9.0 2.0.17 - 5.14.0 + 6.0.1 3.0.0 3.5.7 - 6.2.12 + 6.2.13 3.0.5 - 9.4.0 + 9.5.0 4.2.7.Final diff --git a/xxl-job-admin/src/test/java/com/xxl/job/adminbiz/AdminBizTest.java b/xxl-job-admin/src/test/java/com/xxl/job/openapi/AdminBizTest.java similarity index 98% rename from xxl-job-admin/src/test/java/com/xxl/job/adminbiz/AdminBizTest.java rename to xxl-job-admin/src/test/java/com/xxl/job/openapi/AdminBizTest.java index b9aa23e6..be1dc508 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/adminbiz/AdminBizTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/openapi/AdminBizTest.java @@ -1,4 +1,4 @@ -package com.xxl.job.adminbiz; +package com.xxl.job.openapi; import com.xxl.job.core.constant.RegistType; import com.xxl.job.core.openapi.AdminBiz; diff --git a/xxl-job-admin/src/test/java/com/xxl/job/executorbiz/ExecutorBizTest.java b/xxl-job-admin/src/test/java/com/xxl/job/openapi/ExecutorBizTest.java similarity index 99% rename from xxl-job-admin/src/test/java/com/xxl/job/executorbiz/ExecutorBizTest.java rename to xxl-job-admin/src/test/java/com/xxl/job/openapi/ExecutorBizTest.java index e095ac36..cdde86ef 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/executorbiz/ExecutorBizTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/openapi/ExecutorBizTest.java @@ -1,4 +1,4 @@ -package com.xxl.job.executorbiz; +package com.xxl.job.openapi; import com.xxl.job.core.constant.Const; import com.xxl.job.core.openapi.ExecutorBiz; diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-frameless/pom.xml b/xxl-job-executor-samples/xxl-job-executor-sample-frameless/pom.xml index 46010b73..f0b2ea6f 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-frameless/pom.xml +++ b/xxl-job-executor-samples/xxl-job-executor-sample-frameless/pom.xml @@ -31,6 +31,12 @@ ${junit-jupiter.version} test + diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-frameless/src/test/java/com/xxl/job/executor/sample/frameless/test/FramelessApplicationTest.java b/xxl-job-executor-samples/xxl-job-executor-sample-frameless/src/test/java/com/xxl/job/executor/sample/frameless/test/FramelessApplicationTest.java index 1f9be9a9..1446c51c 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-frameless/src/test/java/com/xxl/job/executor/sample/frameless/test/FramelessApplicationTest.java +++ b/xxl-job-executor-samples/xxl-job-executor-sample-frameless/src/test/java/com/xxl/job/executor/sample/frameless/test/FramelessApplicationTest.java @@ -1,12 +1,21 @@ package com.xxl.job.executor.sample.frameless.test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import org.junit.platform.commons.annotation.Testable; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +@Testable public class FramelessApplicationTest { + private static final Logger logger = LoggerFactory.getLogger(FramelessApplicationTest.class); @Test - public void test(){ - System.out.println("111"); + @DisplayName("test1") + public void test1(){ + logger.info("111"); + Assertions.assertNull( null); } } diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-springboot-ai/pom.xml b/xxl-job-executor-samples/xxl-job-executor-sample-springboot-ai/pom.xml index 9581fe49..01b5abef 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-springboot-ai/pom.xml +++ b/xxl-job-executor-samples/xxl-job-executor-sample-springboot-ai/pom.xml @@ -16,8 +16,8 @@ https://www.xuxueli.com/ - 1.0.3 - 1.1.9 + 1.1.0 + 1.2.0 diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-springboot-ai/src/main/java/com/xxl/job/executor/controller/IndexController.java b/xxl-job-executor-samples/xxl-job-executor-sample-springboot-ai/src/main/java/com/xxl/job/executor/controller/IndexController.java index af5f2cd9..903c3efc 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-springboot-ai/src/main/java/com/xxl/job/executor/controller/IndexController.java +++ b/xxl-job-executor-samples/xxl-job-executor-sample-springboot-ai/src/main/java/com/xxl/job/executor/controller/IndexController.java @@ -18,7 +18,7 @@ import org.springframework.ai.chat.client.advisor.MessageChatMemoryAdvisor; import org.springframework.ai.chat.client.advisor.SimpleLoggerAdvisor; import org.springframework.ai.chat.memory.MessageWindowChatMemory; import org.springframework.ai.ollama.OllamaChatModel; -import org.springframework.ai.ollama.api.OllamaOptions; +import org.springframework.ai.ollama.api.OllamaChatOptions; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; @@ -57,20 +57,20 @@ public class IndexController { */ @GetMapping("/chat/simple") @ResponseBody - public String simpleChat(@RequestParam(value = "input") String input) { + public String simpleChat(@RequestParam(value = "input", required = false, defaultValue = "介绍你自己") String input) { // build chat-client ChatClient ollamaChatClient = ChatClient .builder(ollamaChatModel) - .defaultAdvisors(MessageChatMemoryAdvisor.builder(MessageWindowChatMemory.builder().build()).build()) - .defaultAdvisors(SimpleLoggerAdvisor.builder().build()) + .defaultAdvisors(MessageChatMemoryAdvisor.builder(MessageWindowChatMemory.builder().build()).build()) // add memory + .defaultAdvisors(SimpleLoggerAdvisor.builder().build()) // add logger + .defaultOptions(OllamaChatOptions.builder().model(modle).build()) // assign model .build(); // call ollama String response = ollamaChatClient .prompt(prompt) .user(input) - .options(OllamaOptions.builder().model(modle).build()) .call() .content(); @@ -82,7 +82,7 @@ public class IndexController { * ChatClient 流式调用 */ @GetMapping("/chat/stream") - public Flux streamChat(HttpServletResponse response, @RequestParam(value = "input") String input) { + public Flux streamChat(HttpServletResponse response, @RequestParam(value = "input", required = false, defaultValue = "介绍你自己") String input) { response.setCharacterEncoding("UTF-8"); // build chat-client @@ -90,13 +90,13 @@ public class IndexController { .builder(ollamaChatModel) .defaultAdvisors(MessageChatMemoryAdvisor.builder(MessageWindowChatMemory.builder().build()).build()) .defaultAdvisors(SimpleLoggerAdvisor.builder().build()) + .defaultOptions(OllamaChatOptions.builder().model(modle).build()) .build(); // call ollama return ollamaChatClient .prompt(prompt) .user(input) - .options(OllamaOptions.builder().model(modle).build()) .stream() .content(); } diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-springboot-ai/src/main/java/com/xxl/job/executor/jobhandler/AIXxlJob.java b/xxl-job-executor-samples/xxl-job-executor-sample-springboot-ai/src/main/java/com/xxl/job/executor/jobhandler/AIXxlJob.java index bd7c6589..5ba22f89 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-springboot-ai/src/main/java/com/xxl/job/executor/jobhandler/AIXxlJob.java +++ b/xxl-job-executor-samples/xxl-job-executor-sample-springboot-ai/src/main/java/com/xxl/job/executor/jobhandler/AIXxlJob.java @@ -14,7 +14,7 @@ import org.springframework.ai.chat.client.advisor.MessageChatMemoryAdvisor; import org.springframework.ai.chat.client.advisor.SimpleLoggerAdvisor; import org.springframework.ai.chat.memory.MessageWindowChatMemory; import org.springframework.ai.ollama.OllamaChatModel; -import org.springframework.ai.ollama.api.OllamaOptions; +import org.springframework.ai.ollama.api.OllamaChatOptions; import org.springframework.stereotype.Component; import java.util.HashMap; @@ -86,13 +86,13 @@ public class AIXxlJob { .builder(ollamaChatModel) .defaultAdvisors(MessageChatMemoryAdvisor.builder(MessageWindowChatMemory.builder().build()).build()) .defaultAdvisors(SimpleLoggerAdvisor.builder().build()) + .defaultOptions(OllamaChatOptions.builder().model(ollamaParam.getModel()).build()) .build(); // call ollama String response = ollamaChatClient .prompt(ollamaParam.getPrompt()) .user(ollamaParam.getInput()) - .options(OllamaOptions.builder().model(ollamaParam.getModel()).build()) .call() .content();