diff --git a/servers/boe-server-all/src/main/java/com/xboe/BoeServerAllApplication.java b/servers/boe-server-all/src/main/java/com/xboe/BoeServerAllApplication.java index d390a4c8..c1e9b951 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/BoeServerAllApplication.java +++ b/servers/boe-server-all/src/main/java/com/xboe/BoeServerAllApplication.java @@ -1,39 +1,41 @@ package com.xboe; -import java.io.File; -import java.io.IOException; - -import javax.annotation.PostConstruct; - -import org.springframework.retry.annotation.EnableRetry; -import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.system.ApplicationPid; import org.springframework.cache.annotation.EnableCaching; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.Configuration; +import org.springframework.retry.annotation.EnableRetry; +import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableScheduling; +import javax.annotation.PostConstruct; +import java.io.File; +import java.io.IOException; + @Configuration @SpringBootApplication @EnableCaching @EnableAsync @EnableRetry @EnableScheduling +@EnableDiscoveryClient +@EnableFeignClients(basePackages = {"com.boe.feign.api.*.remote", "com.xboe.api"}) public class BoeServerAllApplication { - public static void main(String[] args) { - System.setProperty("jasypt.encryptor.password","jasypt"); - SpringApplication.run(BoeServerAllApplication.class, args); - } - - @PostConstruct - private void handlePid() throws IOException { - File file = new File("application.pid"); - new ApplicationPid().write(file); - file.deleteOnExit(); - } + public static void main(String[] args) { + System.setProperty("jasypt.encryptor.password", "jasypt"); + SpringApplication.run(BoeServerAllApplication.class, args); + } + + @PostConstruct + private void handlePid() throws IOException { + File file = new File("application.pid"); + new ApplicationPid().write(file); + file.deleteOnExit(); + } - } diff --git a/servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java b/servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java index dd8e728f..71d8fa7c 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java @@ -254,7 +254,7 @@ public class ThirdApi { studyCourseVo.setCourseId(courseId); ProjectStudyDto projectStudyDto = new ProjectStudyDto(); BeanUtil.copyProperties(studyCourseVo, studyCourseVo); - projectRemoteClient.updateStudyStatus(null, projectStudyDto); + projectRemoteClient.updateStudyStatus(projectStudyDto); return new ArrayList<>(); }