修改培训管理相关接口

lab-auth/src/main/resources/application-dev.yml

@@ -1,3 +1,3 @@
 #服务器端口
 server:
-  port: 8102
+  port: 8202

lab-ops/lab-resource/src/main/resources/application-dev.yml

@@ -1,3 +1,3 @@
 #服务器端口
 server:
-  port: 8108
+  port: 8208

lab-plugin/pom.xml

@@ -15,6 +15,6 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>lab-workflow</module>
+<!--        <module>lab-workflow</module>-->
     </modules>
 </project>

lab-service/lab-capital/src/main/resources/application-dev.yml

@@ -1,3 +1,3 @@
 #服务器端口
 server:
-  port: 8107
+  port: 8207

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<StorageFileMapper, StorageFile> implements IStorageFileService {
 
-    @Value("${oss.local.base-path:/lims/file}")
+    @Value("${oss.local.base-path}")
     private String basePath;
 
     private QualityStorageFileRelMapper qualityStorageFileRelMapper;

lab-service/lab-file/src/main/resources/application-dev.yml

@@ -1,3 +1,3 @@
 #服务器端口
 server:
-  port: 8109
+  port: 8209

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);
     }
 

lab-service/lab-system/src/main/resources/application-dev.yml

@@ -1,3 +1,3 @@
 #服务器端口
 server:
-  port: 8103
+  port: 8203

lab-service/lab-system/target/classes/application-dev.yml

@@ -1,3 +0,0 @@
-#服务器端口
-server:
-  port: 8003

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);

lab-service/lab-user/src/main/resources/application-dev.yml

@@ -1,4 +1,4 @@
 #服务1器端口
 server:
-  port: 8104
+  port: 8204
 

pom.xml

@@ -33,8 +33,8 @@
         <module>lab-gateway</module>
         <module>lab-ops</module>
         <module>lab-ops-api</module>
-        <module>lab-plugin</module>
-        <module>lab-plugin-api</module>
+<!--        <module>lab-plugin</module>-->
+<!--        <module>lab-plugin-api</module>-->
         <module>lab-service</module>
         <module>lab-service-api</module>
         <!--<module>lab-monitor-api</module>-->