Merge remote-tracking branch 'origin/main'

Author: qing

auto-configurations/spring-ai-alibaba-autoconfigure-memory/src/main/java/com/alibaba/cloud/ai/autoconfigure/memory/redis/JedisRedisChatMemoryConnectionAutoConfiguration.java

@@ -20,11 +20,13 @@
 import com.alibaba.cloud.ai.memory.redis.JedisRedisChatMemoryRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.ssl.SslBundles;
 import org.springframework.context.annotation.Bean;
 import redis.clients.jedis.Jedis;
 
@@ -44,8 +46,8 @@ public class JedisRedisChatMemoryConnectionAutoConfiguration
 	private static final Logger logger = LoggerFactory.getLogger(JedisRedisChatMemoryConnectionAutoConfiguration.class);
 
 	public JedisRedisChatMemoryConnectionAutoConfiguration(RedisChatMemoryProperties properties,
-			RedisChatMemoryConnectionDetails connectionDetails) {
-		super(properties, connectionDetails);
+			RedisChatMemoryConnectionDetails connectionDetails, ObjectProvider<SslBundles> sslBundles) {
+		super(properties, connectionDetails, sslBundles);
 	}
 
 	@Override
@@ -65,6 +67,9 @@ protected JedisRedisChatMemoryRepository createStandaloneChatMemoryRepository(
 			.username(standaloneConfiguration.username())
 			.password(standaloneConfiguration.password())
 			.timeout(standaloneConfiguration.timeout())
+			.sslBundles(standaloneConfiguration.sslBundles())
+			.useSsl(standaloneConfiguration.ssl().isEnabled())
+			.bundle(standaloneConfiguration.ssl().getBundle())
 			.build();
 	}
 
@@ -77,6 +82,9 @@ protected JedisRedisChatMemoryRepository createClusterChatMemoryRepository(
 			.username(clusterConfiguration.username())
 			.password(clusterConfiguration.password())
 			.timeout(clusterConfiguration.timeout())
+			.sslBundles(clusterConfiguration.sslBundles())
+			.useSsl(clusterConfiguration.ssl().isEnabled())
+			.bundle(clusterConfiguration.ssl().getBundle())
 			.build();
 	}
 

auto-configurations/spring-ai-alibaba-autoconfigure-memory/src/main/java/com/alibaba/cloud/ai/autoconfigure/memory/redis/LettuceRedisChatMemoryConnectionAutoConfiguration.java

@@ -20,11 +20,13 @@
 import io.lettuce.core.RedisClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.ssl.SslBundles;
 import org.springframework.context.annotation.Bean;
 
 /**
@@ -44,8 +46,8 @@ public class LettuceRedisChatMemoryConnectionAutoConfiguration
 		.getLogger(LettuceRedisChatMemoryConnectionAutoConfiguration.class);
 
 	public LettuceRedisChatMemoryConnectionAutoConfiguration(RedisChatMemoryProperties properties,
-			RedisChatMemoryConnectionDetails connectionDetails) {
-		super(properties, connectionDetails);
+			RedisChatMemoryConnectionDetails connectionDetails, ObjectProvider<SslBundles> sslBundles) {
+		super(properties, connectionDetails, sslBundles);
 	}
 
 	@Override
@@ -65,6 +67,9 @@ protected LettuceRedisChatMemoryRepository createStandaloneChatMemoryRepository(
 			.username(standaloneConfiguration.username())
 			.password(standaloneConfiguration.password())
 			.timeout(standaloneConfiguration.timeout())
+			.sslBundles(standaloneConfiguration.sslBundles())
+			.useSsl(standaloneConfiguration.ssl().isEnabled())
+			.bundle(standaloneConfiguration.ssl().getBundle())
 			.build();
 	}
 
@@ -77,6 +82,9 @@ protected LettuceRedisChatMemoryRepository createClusterChatMemoryRepository(
 			.username(clusterConfiguration.username())
 			.password(clusterConfiguration.password())
 			.timeout(clusterConfiguration.timeout())
+			.sslBundles(clusterConfiguration.sslBundles())
+			.useSsl(clusterConfiguration.ssl().isEnabled())
+			.bundle(clusterConfiguration.ssl().getBundle())
 			.build();
 	}
 

auto-configurations/spring-ai-alibaba-autoconfigure-memory/src/main/java/com/alibaba/cloud/ai/autoconfigure/memory/redis/RedisChatMemoryClusterConfiguration.java

@@ -15,6 +15,8 @@
  */
 package com.alibaba.cloud.ai.autoconfigure.memory.redis;
 
+import org.springframework.boot.ssl.SslBundles;
+
 import java.util.List;
 
 /**
@@ -24,6 +26,6 @@
  * @since 2025/7/30 21:33
  */
 public record RedisChatMemoryClusterConfiguration(List<String> nodeAddresses, String username, String password,
-		int timeout) {
+		int timeout, RedisChatMemoryProperties.Ssl ssl, SslBundles sslBundles) {
 
 }

auto-configurations/spring-ai-alibaba-autoconfigure-memory/src/main/java/com/alibaba/cloud/ai/autoconfigure/memory/redis/RedisChatMemoryConnectionAutoConfiguration.java

@@ -16,6 +16,8 @@
 package com.alibaba.cloud.ai.autoconfigure.memory.redis;
 
 import org.springframework.ai.chat.memory.ChatMemoryRepository;
+import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.boot.ssl.SslBundles;
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
@@ -33,10 +35,13 @@ public abstract class RedisChatMemoryConnectionAutoConfiguration<T extends ChatM
 
 	private final RedisChatMemoryConnectionDetails connectionDetails;
 
+	private final SslBundles sslBundles;
+
 	public RedisChatMemoryConnectionAutoConfiguration(RedisChatMemoryProperties properties,
-			RedisChatMemoryConnectionDetails connectionDetails) {
+			RedisChatMemoryConnectionDetails connectionDetails, ObjectProvider<SslBundles> sslBundles) {
 		this.properties = properties;
 		this.connectionDetails = connectionDetails;
+		this.sslBundles = sslBundles.getIfAvailable();
 	}
 
 	/**
@@ -102,7 +107,8 @@ protected RedisChatMemoryProperties.Mode getRedisChatMemoryMode() {
 	protected final RedisChatMemoryStandaloneConfiguration getStandaloneConfiguration() {
 		RedisMemoryConnectionDetails.Standalone standalone = connectionDetails.getStandalone();
 		return new RedisChatMemoryStandaloneConfiguration(standalone.getHost(), standalone.getPort(),
-				connectionDetails.getUsername(), connectionDetails.getPassword(), properties.getTimeout());
+				connectionDetails.getUsername(), connectionDetails.getPassword(), properties.getTimeout(),
+				properties.getSsl(), sslBundles);
 	}
 
 	/**
@@ -115,7 +121,7 @@ protected final RedisChatMemoryClusterConfiguration getClusterConfiguration() {
 		}
 		List<String> nodes = getNodes(connectionDetails.getCluster());
 		return new RedisChatMemoryClusterConfiguration(nodes, connectionDetails.getUsername(),
-				connectionDetails.getPassword(), properties.getTimeout());
+				connectionDetails.getPassword(), properties.getTimeout(), properties.getSsl(), sslBundles);
 	}
 
 	/**

auto-configurations/spring-ai-alibaba-autoconfigure-memory/src/main/java/com/alibaba/cloud/ai/autoconfigure/memory/redis/RedisChatMemoryProperties.java

@@ -69,6 +69,11 @@ public class RedisChatMemoryProperties {
 	 */
 	private Mode mode;
 
+	/**
+	 * SSL properties.
+	 */
+	private final Ssl ssl = new Ssl();
+
 	public String getHost() {
 		return host;
 	}
@@ -133,6 +138,10 @@ public void setMode(Mode mode) {
 		this.mode = mode;
 	}
 
+	public Ssl getSsl() {
+		return ssl;
+	}
+
 	/**
 	 * Type of Redis client to use.
 	 */
@@ -193,4 +202,35 @@ public enum Mode {
 
 	}
 
+	public static class Ssl {
+
+		/**
+		 * Whether to enable SSL support. Enabled automatically if "bundle" is provided
+		 * unless specified otherwise.
+		 */
+		private Boolean enabled;
+
+		/**
+		 * SSL bundle name based on spring.ssl configuration.
+		 */
+		private String bundle;
+
+		public boolean isEnabled() {
+			return (this.enabled != null) ? this.enabled : this.bundle != null;
+		}
+
+		public void setEnabled(boolean enabled) {
+			this.enabled = enabled;
+		}
+
+		public String getBundle() {
+			return this.bundle;
+		}
+
+		public void setBundle(String bundle) {
+			this.bundle = bundle;
+		}
+
+	}
+
 }

auto-configurations/spring-ai-alibaba-autoconfigure-memory/src/main/java/com/alibaba/cloud/ai/autoconfigure/memory/redis/RedisChatMemoryStandaloneConfiguration.java

@@ -15,13 +15,15 @@
  */
 package com.alibaba.cloud.ai.autoconfigure.memory.redis;
 
+import org.springframework.boot.ssl.SslBundles;
+
 /**
  * Configuration for Redis Memory using Redis Standalone
  *
  * @author benym
  * @since 2025/7/30 21:32
  */
 public record RedisChatMemoryStandaloneConfiguration(String hostName, int port, String username, String password,
-		int timeout) {
+		int timeout, RedisChatMemoryProperties.Ssl ssl, SslBundles sslBundles) {
 
 }

auto-configurations/spring-ai-alibaba-autoconfigure-memory/src/main/java/com/alibaba/cloud/ai/autoconfigure/memory/redis/RedissonRedisChatMemoryConnectionAutoConfiguration.java

@@ -20,11 +20,13 @@
 import org.redisson.api.RedissonClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.ssl.SslBundles;
 import org.springframework.context.annotation.Bean;
 
 /**
@@ -44,8 +46,8 @@ public class RedissonRedisChatMemoryConnectionAutoConfiguration
 		.getLogger(RedissonRedisChatMemoryConnectionAutoConfiguration.class);
 
 	public RedissonRedisChatMemoryConnectionAutoConfiguration(RedisChatMemoryProperties properties,
-			RedisChatMemoryConnectionDetails connectionDetails) {
-		super(properties, connectionDetails);
+			RedisChatMemoryConnectionDetails connectionDetails, ObjectProvider<SslBundles> sslBundles) {
+		super(properties, connectionDetails, sslBundles);
 	}
 
 	@Override
@@ -65,6 +67,9 @@ protected RedissonRedisChatMemoryRepository createStandaloneChatMemoryRepository
 			.username(standaloneConfiguration.username())
 			.password(standaloneConfiguration.password())
 			.timeout(standaloneConfiguration.timeout())
+			.sslBundles(standaloneConfiguration.sslBundles())
+			.useSsl(standaloneConfiguration.ssl().isEnabled())
+			.bundle(standaloneConfiguration.ssl().getBundle())
 			.build();
 	}
 
@@ -77,6 +82,9 @@ protected RedissonRedisChatMemoryRepository createClusterChatMemoryRepository(
 			.username(clusterConfiguration.username())
 			.password(clusterConfiguration.password())
 			.timeout(clusterConfiguration.timeout())
+			.sslBundles(clusterConfiguration.sslBundles())
+			.useSsl(clusterConfiguration.ssl().isEnabled())
+			.bundle(clusterConfiguration.ssl().getBundle())
 			.build();
 	}
 

community/memories/spring-ai-alibaba-starter-memory-redis/README.md

@@ -80,6 +80,33 @@ spring:
           nodes: localhost:6379,localhost:6380,localhost:6381
 ```
 
+### 配置SSL
+```yaml
+# 基础spring.ssl配置(可选pem或jks配置)，参考spring.ssl原始配置
+spring:
+  ssl:
+    bundle:
+      pem:
+        myPemBundle:
+          keystore:
+            certificate: "classpath:cert.pem"
+            private-key: "classpath:key.pem"
+          truststore:
+            certificate: "classpath:cert.pem"
+  ai:
+    memory:
+      redis:
+        # Supports standalone and cluster
+        mode: standalone
+        # Supports jedis, lettuce, and redisson
+        client-type: lettuce
+        host: localhost
+        port: 6379
+        ssl:
+          enabled: true
+          bundle: myPemBundle
+```
+
 ### 完全配置-单机
 ```yaml
 spring:
@@ -122,8 +149,8 @@ public class CustomJedisRedisChatMemoryAutoConfiguration extends RedisChatMemory
 
     private static final Logger logger = LoggerFactory.getLogger(CustomJedisRedisChatMemoryAutoConfiguration.class);
 
-    public CustomJedisRedisChatMemoryAutoConfiguration(RedisChatMemoryProperties properties, RedisChatMemoryConnectionDetails connectionDetails) {
-        super(properties, connectionDetails);
+    public CustomJedisRedisChatMemoryAutoConfiguration(RedisChatMemoryProperties properties, RedisChatMemoryConnectionDetails connectionDetails, ObjectProvider<SslBundles> sslBundles) {
+        super(properties, connectionDetails, sslBundles);
     }
 
     @Bean
@@ -140,6 +167,9 @@ public class CustomJedisRedisChatMemoryAutoConfiguration extends RedisChatMemory
                 .username(standaloneConfiguration.username())
                 .password(standaloneConfiguration.password())
                 .timeout(standaloneConfiguration.timeout())
+                .sslBundles(standaloneConfiguration.sslBundles())
+                .useSsl(standaloneConfiguration.ssl().isEnabled())
+                .bundle(standaloneConfiguration.ssl().getBundle())
                 // using your JedisPoolConfig here
                 .poolConfig(new JedisPoolConfig())
                 .build();
@@ -153,6 +183,9 @@ public class CustomJedisRedisChatMemoryAutoConfiguration extends RedisChatMemory
                 .username(clusterConfiguration.username())
                 .password(clusterConfiguration.password())
                 .timeout(clusterConfiguration.timeout())
+                .sslBundles(clusterConfiguration.sslBundles())
+                .useSsl(clusterConfiguration.ssl().isEnabled())
+                .bundle(clusterConfiguration.ssl().getBundle())
                 // using your JedisPoolConfig here
                 .poolConfig(new JedisPoolConfig())
                 .build();
@@ -176,8 +209,8 @@ public class CustomLettuceRedisChatMemoryAutoConfiguration extends RedisChatMemo
 
     private static final Logger logger = LoggerFactory.getLogger(CustomLettuceRedisChatMemoryAutoConfiguration.class);
 
-    public CustomLettuceRedisChatMemoryAutoConfiguration(RedisChatMemoryProperties properties, RedisChatMemoryConnectionDetails connectionDetails) {
-        super(properties, connectionDetails);
+    public CustomLettuceRedisChatMemoryAutoConfiguration(RedisChatMemoryProperties properties, RedisChatMemoryConnectionDetails connectionDetails, ObjectProvider<SslBundles> sslBundles) {
+        super(properties, connectionDetails, sslBundles);
     }
 
     @Override
@@ -195,6 +228,9 @@ public class CustomLettuceRedisChatMemoryAutoConfiguration extends RedisChatMemo
                 .username(standaloneConfiguration.username())
                 .password(standaloneConfiguration.password())
                 .timeout(standaloneConfiguration.timeout())
+                .sslBundles(standaloneConfiguration.sslBundles())
+                .useSsl(standaloneConfiguration.ssl().isEnabled())
+                .bundle(standaloneConfiguration.ssl().getBundle())
                 // using your GenericObjectPoolConfig here
                 .poolConfig(new GenericObjectPoolConfig<>())
                 .build();
@@ -208,6 +244,9 @@ public class CustomLettuceRedisChatMemoryAutoConfiguration extends RedisChatMemo
                 .username(clusterConfiguration.username())
                 .password(clusterConfiguration.password())
                 .timeout(clusterConfiguration.timeout())
+                .sslBundles(clusterConfiguration.sslBundles())
+                .useSsl(clusterConfiguration.ssl().isEnabled())
+                .bundle(clusterConfiguration.ssl().getBundle())
                 // using your GenericObjectPoolConfig here
                 .poolConfig(new GenericObjectPoolConfig<>())
                 .build();
@@ -231,8 +270,8 @@ public class CustomRedissonRedisChatMemoryAutoConfiguration extends RedisChatMem
 
     private static final Logger logger = LoggerFactory.getLogger(CustomRedissonRedisChatMemoryAutoConfiguration.class);
 
-    public CustomRedissonRedisChatMemoryAutoConfiguration(RedisChatMemoryProperties properties, RedisChatMemoryConnectionDetails connectionDetails) {
-        super(properties, connectionDetails);
+    public CustomRedissonRedisChatMemoryAutoConfiguration(RedisChatMemoryProperties properties, RedisChatMemoryConnectionDetails connectionDetails, ObjectProvider<SslBundles> sslBundles) {
+        super(properties, connectionDetails, sslBundles);
     }
 
     @Override
@@ -250,6 +289,9 @@ public class CustomRedissonRedisChatMemoryAutoConfiguration extends RedisChatMem
                 .username(configuration.username())
                 .password(configuration.password())
                 .timeout(configuration.timeout())
+                .sslBundles(configuration.sslBundles())
+                .useSsl(configuration.ssl().isEnabled())
+                .bundle(configuration.ssl().getBundle())
                 // using your Config here
                 .redissonConfig(new Config())
                 .build();
@@ -263,6 +305,9 @@ public class CustomRedissonRedisChatMemoryAutoConfiguration extends RedisChatMem
                 .username(configuration.username())
                 .password(configuration.password())
                 .timeout(configuration.timeout())
+                .sslBundles(configuration.sslBundles())
+                .useSsl(configuration.ssl().isEnabled())
+                .bundle(configuration.ssl().getBundle())
                 // using your Config here
                 .redissonConfig(new Config())
                 .build();