diff --git a/src/main/java/com/qiwenshare/file/api/IElasticSearchService.java b/src/main/java/com/qiwenshare/file/api/IElasticSearchService.java index be6d57a..473c3ef 100644 --- a/src/main/java/com/qiwenshare/file/api/IElasticSearchService.java +++ b/src/main/java/com/qiwenshare/file/api/IElasticSearchService.java @@ -1,8 +1,10 @@ package com.qiwenshare.file.api; import com.qiwenshare.file.config.es.FileSearch; +import org.springframework.context.annotation.Lazy; import org.springframework.data.elasticsearch.repository.ElasticsearchRepository; +@Lazy public interface IElasticSearchService extends ElasticsearchRepository { } \ No newline at end of file diff --git a/src/main/java/com/qiwenshare/file/component/FileDealComp.java b/src/main/java/com/qiwenshare/file/component/FileDealComp.java index ad487b6..c43c4d1 100644 --- a/src/main/java/com/qiwenshare/file/component/FileDealComp.java +++ b/src/main/java/com/qiwenshare/file/component/FileDealComp.java @@ -14,6 +14,8 @@ import com.qiwenshare.ufop.factory.UFOPFactory; import com.qiwenshare.ufop.util.UFOPUtils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; import javax.annotation.Resource; @@ -42,10 +44,9 @@ public class FileDealComp { IShareFileService shareFileService; @Resource IUserFileService userFileService; - @Resource - UFOPFactory ufopFactory; - @Resource + @Autowired + @Lazy private IElasticSearchService elasticSearchService; public static Executor exec = Executors.newFixedThreadPool(10); diff --git a/src/main/java/com/qiwenshare/file/controller/TaskController.java b/src/main/java/com/qiwenshare/file/controller/TaskController.java index 71d8889..a0353e9 100644 --- a/src/main/java/com/qiwenshare/file/controller/TaskController.java +++ b/src/main/java/com/qiwenshare/file/controller/TaskController.java @@ -6,6 +6,7 @@ import com.qiwenshare.file.domain.UserFile; import com.qiwenshare.file.service.UserFileService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Controller; @@ -19,6 +20,7 @@ public class TaskController { @Resource UserFileService userFileService; @Autowired + @Lazy private IElasticSearchService elasticSearchService; @Resource FileDealComp fileDealComp; diff --git a/src/main/resources/config/application.properties b/src/main/resources/config/application.properties index d66d985..13c3eda 100644 --- a/src/main/resources/config/application.properties +++ b/src/main/resources/config/application.properties @@ -1,5 +1,8 @@ server.port=8080 + +#环境切换 dev/prod spring.profiles.active=dev + eureka.client.register-with-eureka=false eureka.client.fetchRegistry=false #eureka.client.server.waitTimeInMsWhenSyncEmpty=0 @@ -127,6 +130,6 @@ jwt.payload.registerd-claims.aud = qiwenshare qiwen.file.version=1.1.2 # 当前部署外网IP,用于office预览 -deployment.host=192.168.31.158 +deployment.host=192.168.1.6