diff --git a/jetlinks-standalone/pom.xml b/jetlinks-standalone/pom.xml index 57288d5c..e55fc086 100644 --- a/jetlinks-standalone/pom.xml +++ b/jetlinks-standalone/pom.xml @@ -88,13 +88,6 @@ - - - com.github.tonivade - claudb - 1.7.1 - true - io.netty diff --git a/jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/EmbeddedRedisConfiguration.java b/jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/EmbeddedRedisConfiguration.java deleted file mode 100644 index 45622745..00000000 --- a/jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/EmbeddedRedisConfiguration.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.jetlinks.community.standalone.configuration; - -import com.github.tonivade.claudb.ClauDB; -import com.github.tonivade.claudb.DBConfig; -import com.github.tonivade.resp.RespServer; -import lombok.Getter; -import lombok.Setter; -import org.springframework.boot.context.event.ApplicationPreparedEvent; -import org.springframework.context.ApplicationListener; -import org.springframework.core.Ordered; -import org.springframework.core.env.Environment; - -import java.io.File; - -public class EmbeddedRedisConfiguration implements ApplicationListener, Ordered { - - @Override - public void onApplicationEvent(ApplicationPreparedEvent event) { - Environment environment = event.getApplicationContext().getEnvironment(); - if (!environment.getProperty("spring.redis.embedded.enabled", Boolean.class, false)) { - return; - } - - String dataPath = environment.getProperty("spring.redis.embedded.data-path", "./data/redis"); - new File(dataPath).mkdirs(); - DBConfig config = new DBConfig(); - config.setPersistenceActive(true); - config.setAofFile(dataPath.concat("/jetlinks.aof")); - config.setRdbFile(dataPath.concat("/jetlinks.rdb")); - - RespServer server = ClauDB.builder() - .port(environment.getProperty("spring.redis.embedded.port", Integer.class, 6379)) - .host(environment.getProperty("spring.redis.embedded.host", "0.0.0.0")) - .config(config) - .build(); - server.start(); - - } - - @Override - public int getOrder() { - return Ordered.HIGHEST_PRECEDENCE; - } - -} \ No newline at end of file diff --git a/jetlinks-standalone/src/main/resources/META-INF/spring.factories b/jetlinks-standalone/src/main/resources/META-INF/spring.factories deleted file mode 100644 index a9d5699d..00000000 --- a/jetlinks-standalone/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.context.ApplicationListener=\ -org.jetlinks.community.standalone.configuration.EmbeddedRedisConfiguration \ No newline at end of file diff --git a/jetlinks-standalone/src/main/resources/application-embedded.yml b/jetlinks-standalone/src/main/resources/application-embedded.yml index dc2c966a..3afcc6e4 100644 --- a/jetlinks-standalone/src/main/resources/application-embedded.yml +++ b/jetlinks-standalone/src/main/resources/application-embedded.yml @@ -2,13 +2,8 @@ spring: resources: static-locations: file:./index/, file:./static/,/,classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/, classpath:/public/ redis: - embedded: - enabled: true # 使用内置的redis,不建议在生产环境中使用. - host: 127.0.0.1 - port: 6370 - data-path: ./data/redis host: 127.0.0.1 - port: 6370 + port: 6379 lettuce: pool: max-active: 1024