Merge remote-tracking branch 'origin/develop' into develop

develop
PL 4 months ago
commit 0fc74a1819

1
.gitignore vendored

@ -31,3 +31,4 @@ build/
### VS Code ### ### VS Code ###
.vscode/ .vscode/
/.vs

@ -46,7 +46,7 @@ public class SparkChatRequestParam {
public static class Message { public static class Message {
private String role; private String role;
private String content; private String content;
/** /**
* ,使, * ,使,
*/ */

@ -2,6 +2,8 @@ package cn.teammodel.config.knife;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Profile;
import springfox.documentation.builders.ApiInfoBuilder; import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors; import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors; import springfox.documentation.builders.RequestHandlerSelectors;
@ -15,7 +17,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
*/ */
@Configuration @Configuration
@EnableSwagger2 @EnableSwagger2
//@Profile({"dev", "test"}) @Profile({"dev", "test"})
public class Knife4jConfig { public class Knife4jConfig {
@Bean @Bean

@ -47,7 +47,7 @@ public class AiController {
return chatMessageService.chatCompletion(chatCompletionReqDto, null); return chatMessageService.chatCompletion(chatCompletionReqDto, null);
} }
// @PostMapping("chat/test/completion") @PostMapping("chat/test/completion")
@ApiOperation("与 spark 的流式对话") @ApiOperation("与 spark 的流式对话")
public SseEmitter testCompletion(@RequestBody @Valid ChatCompletionReqDto chatCompletionReqDto) throws IOException, InterruptedException { public SseEmitter testCompletion(@RequestBody @Valid ChatCompletionReqDto chatCompletionReqDto) throws IOException, InterruptedException {
SseEmitter sseEmitter = new SseEmitter(); SseEmitter sseEmitter = new SseEmitter();

Loading…
Cancel
Save