yingp 5 жил өмнө
parent
commit
62611bd4ea

+ 2 - 2
uas-office-core/src/main/java/com/usoftchina/uas/office/config/RedisConfig.java

@@ -3,7 +3,7 @@ package com.usoftchina.uas.office.config;
 import com.usoftchina.uas.office.listener.UasEventListenerAdapter;
 import com.usoftchina.uas.office.listener.UasEventListenerAdapter;
 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.data.redis.connection.lettuce.LettuceConnectionFactory;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.listener.ChannelTopic;
 import org.springframework.data.redis.listener.ChannelTopic;
 import org.springframework.data.redis.listener.RedisMessageListenerContainer;
 import org.springframework.data.redis.listener.RedisMessageListenerContainer;
 
 
@@ -25,7 +25,7 @@ public class RedisConfig {
     }
     }
 
 
     @Bean
     @Bean
-    public RedisMessageListenerContainer redisMessageListenerContainer(LettuceConnectionFactory connectionFactory) {
+    public RedisMessageListenerContainer redisMessageListenerContainer(RedisConnectionFactory connectionFactory) {
         RedisMessageListenerContainer container = new RedisMessageListenerContainer();
         RedisMessageListenerContainer container = new RedisMessageListenerContainer();
         container.setConnectionFactory(connectionFactory);
         container.setConnectionFactory(connectionFactory);
         // 订阅来自uas的消息
         // 订阅来自uas的消息

+ 7 - 1
uas-office-dingtalk-server/build.gradle

@@ -1,12 +1,18 @@
 apply plugin: 'org.springframework.boot'
 apply plugin: 'org.springframework.boot'
 
 
+configurations {
+    all*.exclude group: 'io.lettuce'
+}
+
 dependencies {
 dependencies {
     compile project(':uas-office-dingtalk')
     compile project(':uas-office-dingtalk')
     compile 'org.springframework.boot:spring-boot-starter-web'
     compile 'org.springframework.boot:spring-boot-starter-web'
     compile 'org.springframework.boot:spring-boot-starter-jdbc'
     compile 'org.springframework.boot:spring-boot-starter-jdbc'
     compile 'org.springframework.boot:spring-boot-starter-security'
     compile 'org.springframework.boot:spring-boot-starter-security'
-    compile 'org.springframework.boot:spring-boot-starter-data-redis'
+    compile 'redis.clients:jedis'
+    
     compile 'com.h2database:h2'
     compile 'com.h2database:h2'
     compile "$ojdbc"
     compile "$ojdbc"
+    
     testCompile 'org.springframework.boot:spring-boot-starter-test'
     testCompile 'org.springframework.boot:spring-boot-starter-test'
 }
 }