diff --git a/contact-center/app/src/main/java/com/chatopera/cc/Application.java b/contact-center/app/src/main/java/com/chatopera/cc/Application.java index a19994dc..280e50d5 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/Application.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/Application.java @@ -29,15 +29,12 @@ import org.springframework.boot.Banner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainer; import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizer; import org.springframework.boot.web.servlet.ErrorPage; import org.springframework.boot.web.servlet.MultipartConfigFactory; import org.springframework.context.annotation.Bean; import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; -import org.springframework.jms.annotation.EnableJms; -import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.transaction.annotation.EnableTransactionManagement; import javax.servlet.MultipartConfigElement; @@ -51,16 +48,7 @@ public class Application { private static final Logger logger = LoggerFactory.getLogger(Application.class); - @Value("${web.upload-path}") - private String uploaddir; - - @Value("${spring.servlet.multipart.max-file-size}") - private String multipartMaxUpload; - - @Value("${spring.servlet.multipart.max-request-size}") - private String multipartMaxRequest; - - /** + /* * 记载模块 */ static { @@ -73,7 +61,7 @@ public class Application { // 企业聊天模块 MainContext.enableModule(Constants.CSKEFU_MODULE_ENTIM); - /** + /* * 插件组 */ // 外呼模块 @@ -94,6 +82,13 @@ public class Application { } } + @Value("${web.upload-path}") + private String uploaddir; + @Value("${spring.servlet.multipart.max-file-size}") + private String multipartMaxUpload; + @Value("${spring.servlet.multipart.max-request-size}") + private String multipartMaxRequest; + /** * Init local resources */ @@ -106,6 +101,23 @@ public class Application { } } + public static void main(String[] args) { + Application.init(); + + /* + 该APP中加载多个配置文件 + http://roufid.com/load-multiple-configuration-files-different-directories-spring-boot/ + */ + SpringApplication app = new SpringApplicationBuilder(Application.class) + .properties("spring.config.name:application,git") + .build(); + + app.setBannerMode(Banner.Mode.CONSOLE); + app.setAddCommandLineProperties(false); + app.addListeners(new AppCtxRefreshEventListener()); + MainContext.setApplicationContext(app.run(args)); + } + @Bean public MultipartConfigElement multipartConfigElement() { MultipartConfigFactory factory = new MultipartConfigFactory(); @@ -117,29 +129,9 @@ public class Application { @Bean public EmbeddedServletContainerCustomizer containerCustomizer() { - return new EmbeddedServletContainerCustomizer() { - @Override - public void customize(ConfigurableEmbeddedServletContainer container) { - ErrorPage error = new ErrorPage("/error.html"); - container.addErrorPages(error); - } + return container -> { + ErrorPage error = new ErrorPage("/error.html"); + container.addErrorPages(error); }; } - - public static void main(String[] args) { - Application.init(); - - /************************ - * 该APP中加载多个配置文件 - * http://roufid.com/load-multiple-configuration-files-different-directories-spring-boot/ - ************************/ - SpringApplication app = new SpringApplicationBuilder(Application.class) - .properties("spring.config.name:application,git") - .build(); - - app.setBannerMode(Banner.Mode.CONSOLE); - app.setAddCommandLineProperties(false); - app.addListeners(new AppCtxRefreshEventListener()); - MainContext.setApplicationContext(app.run(args)); - } }