diff --git a/lab-auth/src/main/resources/application-dev.yml b/lab-auth/src/main/resources/application-dev.yml index fa2f530..4708a4a 100644 --- a/lab-auth/src/main/resources/application-dev.yml +++ b/lab-auth/src/main/resources/application-dev.yml @@ -1,3 +1,3 @@ #服务器端口 server: - port: 8102 + port: 8202 diff --git a/lab-ops/lab-resource/src/main/resources/application-dev.yml b/lab-ops/lab-resource/src/main/resources/application-dev.yml index a2d6fae..d630cbe 100644 --- a/lab-ops/lab-resource/src/main/resources/application-dev.yml +++ b/lab-ops/lab-resource/src/main/resources/application-dev.yml @@ -1,3 +1,3 @@ #服务器端口 server: - port: 8108 \ No newline at end of file + port: 8208 \ No newline at end of file diff --git a/lab-plugin/pom.xml b/lab-plugin/pom.xml index 5f6ac98..1cbc6e3 100644 --- a/lab-plugin/pom.xml +++ b/lab-plugin/pom.xml @@ -15,6 +15,6 @@ pom - lab-workflow + diff --git a/lab-service/lab-capital/src/main/resources/application-dev.yml b/lab-service/lab-capital/src/main/resources/application-dev.yml index 96fc066..1204b7d 100644 --- a/lab-service/lab-capital/src/main/resources/application-dev.yml +++ b/lab-service/lab-capital/src/main/resources/application-dev.yml @@ -1,3 +1,3 @@ #服务器端口 server: - port: 8107 \ No newline at end of file + port: 8207 \ No newline at end of file diff --git a/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/StorageFileServiceImpl.java b/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/StorageFileServiceImpl.java index a558c99..d359d43 100644 --- a/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/StorageFileServiceImpl.java +++ b/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/StorageFileServiceImpl.java @@ -53,7 +53,7 @@ import java.util.UUID; @Service public class StorageFileServiceImpl extends BaseServiceImpl implements IStorageFileService { - @Value("${oss.local.base-path:/lims/file}") + @Value("${oss.local.base-path}") private String basePath; private QualityStorageFileRelMapper qualityStorageFileRelMapper; diff --git a/lab-service/lab-file/src/main/resources/application-dev.yml b/lab-service/lab-file/src/main/resources/application-dev.yml index b0fa9ed..dc8d9fd 100644 --- a/lab-service/lab-file/src/main/resources/application-dev.yml +++ b/lab-service/lab-file/src/main/resources/application-dev.yml @@ -1,3 +1,3 @@ #服务器端口 server: - port: 8109 + port: 8209 diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/config/RedisToolConfig.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/config/RedisToolConfig.java index 5882480..0166ab5 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/config/RedisToolConfig.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/config/RedisToolConfig.java @@ -3,18 +3,35 @@ package org.springblade.lims.config; import lombok.RequiredArgsConstructor; import org.springblade.lims.tools.RedisUtil; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.connection.RedisStandaloneConfiguration; +import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; import org.springframework.data.redis.core.RedisTemplate; @Configuration @RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class RedisToolConfig { + @Value("${spring.redis.host}") + private String host; + + @Value("${spring.redis.port}") + private int port; + + @Value("${spring.redis.password}") + private String password; + private final RedisTemplate redisTemplate; @Bean(name = "redisUtil") public RedisUtil redisUtil() { + RedisStandaloneConfiguration redisConfig = new RedisStandaloneConfiguration(host,port); + redisConfig.setPassword(password); + LettuceConnectionFactory factory = new LettuceConnectionFactory(redisConfig); + factory.afterPropertiesSet(); + redisTemplate.setConnectionFactory(factory); return new RedisUtil(redisTemplate); } diff --git a/lab-service/lab-system/src/main/resources/application-dev.yml b/lab-service/lab-system/src/main/resources/application-dev.yml index 1185dc2..fb96b89 100644 --- a/lab-service/lab-system/src/main/resources/application-dev.yml +++ b/lab-service/lab-system/src/main/resources/application-dev.yml @@ -1,3 +1,3 @@ #服务器端口 server: - port: 8103 \ No newline at end of file + port: 8203 \ No newline at end of file diff --git a/lab-service/lab-system/target/classes/application-dev.yml b/lab-service/lab-system/target/classes/application-dev.yml deleted file mode 100644 index 284d40c..0000000 --- a/lab-service/lab-system/target/classes/application-dev.yml +++ /dev/null @@ -1,3 +0,0 @@ -#服务器端口 -server: - port: 8003 \ No newline at end of file diff --git a/lab-service/lab-user/src/main/java/org/springblade/system/user/config/RedissonConfig.java b/lab-service/lab-user/src/main/java/org/springblade/system/user/config/RedissonConfig.java index 01ea3ea..4202c2b 100644 --- a/lab-service/lab-user/src/main/java/org/springblade/system/user/config/RedissonConfig.java +++ b/lab-service/lab-user/src/main/java/org/springblade/system/user/config/RedissonConfig.java @@ -33,6 +33,7 @@ public class RedissonConfig { .setAddress("redis://" + host + ":" + port) .setDatabase(0) .setPingConnectionInterval(2000); +// config.useSingleServer().setPassword(password); config.setLockWatchdogTimeout(10000L); try{ return Redisson.create(config); diff --git a/lab-service/lab-user/src/main/resources/application-dev.yml b/lab-service/lab-user/src/main/resources/application-dev.yml index 6b8a031..31f4d8f 100644 --- a/lab-service/lab-user/src/main/resources/application-dev.yml +++ b/lab-service/lab-user/src/main/resources/application-dev.yml @@ -1,4 +1,4 @@ #服务1器端口 server: - port: 8104 + port: 8204 diff --git a/pom.xml b/pom.xml index 62007fb..be0d9d1 100644 --- a/pom.xml +++ b/pom.xml @@ -33,8 +33,8 @@ lab-gateway lab-ops lab-ops-api - lab-plugin - lab-plugin-api + + lab-service lab-service-api