From 99fdcca7d27728f9cd4d0e8816af6b0ee3f1d8e1 Mon Sep 17 00:00:00 2001 From: zhangqian Date: Mon, 13 May 2024 09:05:16 +0800 Subject: [PATCH 1/4] fix:rocketmq funtion.definition config --- .../src/main/resources/application.yml | 4 ++-- .../src/main/resources/application.yml | 4 ++-- .../src/main/resources/application.yml | 4 ++-- .../src/main/resources/application.yml | 4 ++-- .../src/main/resources/application.yml | 4 ++-- .../src/main/resources/application.yml | 4 ++-- .../rocketmq-tx-example/src/main/resources/application.yml | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-broadcast-example/rocketmq-broadcast-consumer1-example/src/main/resources/application.yml b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-broadcast-example/rocketmq-broadcast-consumer1-example/src/main/resources/application.yml index f072f91785..a136918944 100644 --- a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-broadcast-example/rocketmq-broadcast-consumer1-example/src/main/resources/application.yml +++ b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-broadcast-example/rocketmq-broadcast-consumer1-example/src/main/resources/application.yml @@ -4,9 +4,9 @@ spring: application: name: rocketmq-broadcast-consumer1-example cloud: + function: + definition: consumer; stream: - function: - definition: consumer; rocketmq: binder: name-server: localhost:9876 diff --git a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-broadcast-example/rocketmq-broadcast-consumer2-example/src/main/resources/application.yml b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-broadcast-example/rocketmq-broadcast-consumer2-example/src/main/resources/application.yml index d6a7cf42f4..e8ca8b627e 100644 --- a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-broadcast-example/rocketmq-broadcast-consumer2-example/src/main/resources/application.yml +++ b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-broadcast-example/rocketmq-broadcast-consumer2-example/src/main/resources/application.yml @@ -4,9 +4,9 @@ spring: application: name: rocketmq-broadcast-consumer2-example cloud: + function: + definition: consumer; stream: - function: - definition: consumer; rocketmq: binder: name-server: localhost:9876 diff --git a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-comprehensive-example/src/main/resources/application.yml b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-comprehensive-example/src/main/resources/application.yml index fa752afd91..c3cd43fa46 100644 --- a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-comprehensive-example/src/main/resources/application.yml +++ b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-comprehensive-example/src/main/resources/application.yml @@ -4,9 +4,9 @@ spring: application: name: rocketmq-comprehensive-example cloud: + function: + definition: producer;consumer;processor stream: - function: - definition: producer;consumer;processor rocketmq: binder: name-server: 127.0.0.1:9876 diff --git a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-delay-consume-example/src/main/resources/application.yml b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-delay-consume-example/src/main/resources/application.yml index 1fcd79b9fe..85bb488082 100644 --- a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-delay-consume-example/src/main/resources/application.yml +++ b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-delay-consume-example/src/main/resources/application.yml @@ -4,9 +4,9 @@ spring: application: name: rocketmq-delay-consume-example cloud: + function: + definition: consumer; stream: - function: - definition: consumer; rocketmq: binder: name-server: localhost:9876 diff --git a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-orderly-consume-example/src/main/resources/application.yml b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-orderly-consume-example/src/main/resources/application.yml index c14ee5d738..936f5f22f3 100644 --- a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-orderly-consume-example/src/main/resources/application.yml +++ b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-orderly-consume-example/src/main/resources/application.yml @@ -4,9 +4,9 @@ spring: application: name: rocketmq-orderly-consume-example cloud: + function: + definition: consumer; stream: - function: - definition: consumer; rocketmq: binder: name-server: localhost:9876 diff --git a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-sql-consume-example/src/main/resources/application.yml b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-sql-consume-example/src/main/resources/application.yml index b7f41e8411..bc85b8c3c5 100644 --- a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-sql-consume-example/src/main/resources/application.yml +++ b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-sql-consume-example/src/main/resources/application.yml @@ -4,9 +4,9 @@ spring: application: name: rocketmq-sql-consume-example cloud: + function: + definition: consumer; stream: - function: - definition: consumer; rocketmq: binder: name-server: localhost:9876 diff --git a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-tx-example/src/main/resources/application.yml b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-tx-example/src/main/resources/application.yml index 3e83f00ffe..f99eb87334 100644 --- a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-tx-example/src/main/resources/application.yml +++ b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-tx-example/src/main/resources/application.yml @@ -4,9 +4,9 @@ spring: application: name: rocketmq-tx-example cloud: + function: + definition: consumer; stream: - function: - definition: consumer; rocketmq: binder: name-server: localhost:9876 From bb386738257eeb9157eaa599e1c678e06e3ff261 Mon Sep 17 00:00:00 2001 From: zhangqian Date: Tue, 4 Jun 2024 15:59:37 +0800 Subject: [PATCH 2/4] Add RepetitionPenalty parameter build --- .../com/alibaba/cloud/ai/tongyi/chat/TongYiChatOptions.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-ai/src/main/java/com/alibaba/cloud/ai/tongyi/chat/TongYiChatOptions.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-ai/src/main/java/com/alibaba/cloud/ai/tongyi/chat/TongYiChatOptions.java index 1c31539e97..4409c491e5 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-ai/src/main/java/com/alibaba/cloud/ai/tongyi/chat/TongYiChatOptions.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-ai/src/main/java/com/alibaba/cloud/ai/tongyi/chat/TongYiChatOptions.java @@ -454,6 +454,11 @@ public Builder withTopK(Integer topK) { return this; } + public Builder withRepetitionPenalty(Double repetitionPenalty) { + this.options.repetitionPenalty = repetitionPenalty; + return this; + } + public TongYiChatOptions build() { return this.options; From 638412eeee8625c148ddfd728dc3a246948f5034 Mon Sep 17 00:00:00 2001 From: zhangqian Date: Tue, 4 Jun 2024 16:07:45 +0800 Subject: [PATCH 3/4] Revert changes --- .../com/alibaba/cloud/ai/tongyi/chat/TongYiChatOptions.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-ai/src/main/java/com/alibaba/cloud/ai/tongyi/chat/TongYiChatOptions.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-ai/src/main/java/com/alibaba/cloud/ai/tongyi/chat/TongYiChatOptions.java index 4409c491e5..1c31539e97 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-ai/src/main/java/com/alibaba/cloud/ai/tongyi/chat/TongYiChatOptions.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-ai/src/main/java/com/alibaba/cloud/ai/tongyi/chat/TongYiChatOptions.java @@ -454,11 +454,6 @@ public Builder withTopK(Integer topK) { return this; } - public Builder withRepetitionPenalty(Double repetitionPenalty) { - this.options.repetitionPenalty = repetitionPenalty; - return this; - } - public TongYiChatOptions build() { return this.options; From bc3effd7eefbb24f40f848aee07925e110e64a53 Mon Sep 17 00:00:00 2001 From: zhangqian9158 Date: Wed, 14 Aug 2024 09:22:24 +0800 Subject: [PATCH 4/4] rocketmq config --- .../src/main/resources/application.yml | 4 ++-- .../src/main/resources/application.yml | 4 ++-- .../src/main/resources/application.yml | 4 ++-- .../src/main/resources/application.yml | 4 ++-- .../src/main/resources/application.yml | 4 ++-- .../src/main/resources/application.yml | 4 ++-- .../rocketmq-tx-example/src/main/resources/application.yml | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-broadcast-example/rocketmq-broadcast-consumer1-example/src/main/resources/application.yml b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-broadcast-example/rocketmq-broadcast-consumer1-example/src/main/resources/application.yml index a136918944..f072f91785 100644 --- a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-broadcast-example/rocketmq-broadcast-consumer1-example/src/main/resources/application.yml +++ b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-broadcast-example/rocketmq-broadcast-consumer1-example/src/main/resources/application.yml @@ -4,9 +4,9 @@ spring: application: name: rocketmq-broadcast-consumer1-example cloud: - function: - definition: consumer; stream: + function: + definition: consumer; rocketmq: binder: name-server: localhost:9876 diff --git a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-broadcast-example/rocketmq-broadcast-consumer2-example/src/main/resources/application.yml b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-broadcast-example/rocketmq-broadcast-consumer2-example/src/main/resources/application.yml index e8ca8b627e..d6a7cf42f4 100644 --- a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-broadcast-example/rocketmq-broadcast-consumer2-example/src/main/resources/application.yml +++ b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-broadcast-example/rocketmq-broadcast-consumer2-example/src/main/resources/application.yml @@ -4,9 +4,9 @@ spring: application: name: rocketmq-broadcast-consumer2-example cloud: - function: - definition: consumer; stream: + function: + definition: consumer; rocketmq: binder: name-server: localhost:9876 diff --git a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-comprehensive-example/src/main/resources/application.yml b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-comprehensive-example/src/main/resources/application.yml index c3cd43fa46..fa752afd91 100644 --- a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-comprehensive-example/src/main/resources/application.yml +++ b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-comprehensive-example/src/main/resources/application.yml @@ -4,9 +4,9 @@ spring: application: name: rocketmq-comprehensive-example cloud: - function: - definition: producer;consumer;processor stream: + function: + definition: producer;consumer;processor rocketmq: binder: name-server: 127.0.0.1:9876 diff --git a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-delay-consume-example/src/main/resources/application.yml b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-delay-consume-example/src/main/resources/application.yml index 85bb488082..1fcd79b9fe 100644 --- a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-delay-consume-example/src/main/resources/application.yml +++ b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-delay-consume-example/src/main/resources/application.yml @@ -4,9 +4,9 @@ spring: application: name: rocketmq-delay-consume-example cloud: - function: - definition: consumer; stream: + function: + definition: consumer; rocketmq: binder: name-server: localhost:9876 diff --git a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-orderly-consume-example/src/main/resources/application.yml b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-orderly-consume-example/src/main/resources/application.yml index 936f5f22f3..c14ee5d738 100644 --- a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-orderly-consume-example/src/main/resources/application.yml +++ b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-orderly-consume-example/src/main/resources/application.yml @@ -4,9 +4,9 @@ spring: application: name: rocketmq-orderly-consume-example cloud: - function: - definition: consumer; stream: + function: + definition: consumer; rocketmq: binder: name-server: localhost:9876 diff --git a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-sql-consume-example/src/main/resources/application.yml b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-sql-consume-example/src/main/resources/application.yml index bc85b8c3c5..b7f41e8411 100644 --- a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-sql-consume-example/src/main/resources/application.yml +++ b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-sql-consume-example/src/main/resources/application.yml @@ -4,9 +4,9 @@ spring: application: name: rocketmq-sql-consume-example cloud: - function: - definition: consumer; stream: + function: + definition: consumer; rocketmq: binder: name-server: localhost:9876 diff --git a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-tx-example/src/main/resources/application.yml b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-tx-example/src/main/resources/application.yml index f99eb87334..3e83f00ffe 100644 --- a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-tx-example/src/main/resources/application.yml +++ b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-tx-example/src/main/resources/application.yml @@ -4,9 +4,9 @@ spring: application: name: rocketmq-tx-example cloud: - function: - definition: consumer; stream: + function: + definition: consumer; rocketmq: binder: name-server: localhost:9876