|
|
@ -1,23 +1,13 @@
|
|
|
|
package cokr.xit.adds;
|
|
|
|
package cokr.xit.adds;
|
|
|
|
|
|
|
|
|
|
|
|
import org.springframework.boot.SpringApplication;
|
|
|
|
import org.springframework.boot.SpringApplication;
|
|
|
|
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
|
|
|
|
|
|
|
|
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
|
|
|
|
|
|
|
import org.springframework.boot.builder.SpringApplicationBuilder;
|
|
|
|
|
|
|
|
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
|
|
|
|
|
|
|
|
import org.springframework.test.context.ContextConfiguration;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import cokr.xit.base.boot.MvcConfig2;
|
|
|
|
import cokr.xit.base.boot.XitBaseApplication;
|
|
|
|
import cokr.xit.base.boot.SecurityConfig;
|
|
|
|
|
|
|
|
import cokr.xit.foundation.boot.CommonConfig;
|
|
|
|
|
|
|
|
import cokr.xit.foundation.boot.DatasourceConfig;
|
|
|
|
|
|
|
|
import cokr.xit.foundation.boot.ServletConfig;
|
|
|
|
|
|
|
|
import cokr.xit.foundation.boot.TransactionConfig;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@SpringBootApplication
|
|
|
|
// @SpringBootApplication
|
|
|
|
@ImportAutoConfiguration({CommonConfig.class, ServletConfig.class, MvcConfig2.class, DatasourceConfig.class, TransactionConfig.class, SecurityConfig.class})
|
|
|
|
// @ImportAutoConfiguration({CommonConfig.class, ServletConfig.class, MvcConfig2.class, DatasourceConfig.class, TransactionConfig.class, SecurityConfig.class})
|
|
|
|
@ContextConfiguration({"classpath:spring/context-*.xml"})
|
|
|
|
// @ContextConfiguration({"classpath:spring/context-*.xml"})
|
|
|
|
public class XitBootApplication extends SpringBootServletInitializer {
|
|
|
|
public class XitBootApplication extends XitBaseApplication {
|
|
|
|
public static void main(String[] args) {
|
|
|
|
public static void main(String[] args) {
|
|
|
|
SpringApplication.run(XitBootApplication.class, args);
|
|
|
|
SpringApplication.run(XitBootApplication.class, args);
|
|
|
|
|
|
|
|
|
|
|
@ -30,8 +20,8 @@ public class XitBootApplication extends SpringBootServletInitializer {
|
|
|
|
// application.run(args);
|
|
|
|
// application.run(args);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
// @Override
|
|
|
|
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
|
|
|
|
// protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
|
|
|
|
return application.sources(XitBootApplication.class);
|
|
|
|
// return application.sources(XitBootApplication.class);
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
}
|
|
|
|
}
|
|
|
|