diff --git a/zteits-job/pom.xml b/zteits-job/pom.xml index 7fe0e90..9cfc6b4 100644 --- a/zteits-job/pom.xml +++ b/zteits-job/pom.xml @@ -163,6 +163,15 @@ org.springframework.security spring-security-web + + de.codecentric + spring-boot-admin-starter-client + 2.0.3 + + + org.springframework.boot + spring-boot-starter-security + diff --git a/zteits-job/src/main/java/com/zteits/job/JobApplication.java b/zteits-job/src/main/java/com/zteits/job/JobApplication.java index 8f98879..dc83a45 100644 --- a/zteits-job/src/main/java/com/zteits/job/JobApplication.java +++ b/zteits-job/src/main/java/com/zteits/job/JobApplication.java @@ -7,8 +7,11 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; +import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; @EnableScheduling @EnableAsync @@ -17,6 +20,14 @@ import org.springframework.scheduling.annotation.EnableScheduling; @EnableAutoConfiguration public class JobApplication extends SpringBootServletInitializer { + @Configuration + public static class SecurityPermitAllConfig extends WebSecurityConfigurerAdapter { + @Override + protected void configure(HttpSecurity http) throws Exception { + http.authorizeRequests().anyRequest().permitAll() + .and().csrf().disable(); + } + } @Override protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { return application.sources(JobApplication.class); diff --git a/zteits-job/src/main/java/com/zteits/job/config/session/HttpSessionConfig.java b/zteits-job/src/main/java/com/zteits/job/config/session/HttpSessionConfig.java deleted file mode 100644 index 8aa67d4..0000000 --- a/zteits-job/src/main/java/com/zteits/job/config/session/HttpSessionConfig.java +++ /dev/null @@ -1,30 +0,0 @@ -//package com.zteits.job.config.session; -// -//import org.springframework.context.annotation.Bean; -//import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession; -//import org.springframework.session.web.http.HeaderHttpSessionStrategy; -//import org.springframework.session.web.http.HttpSessionStrategy; -// -///** -// * Copyright: Copyright (c) 2017 zteits -// * -// * @ClassName: com.zteits.oauth.portal.config.session -// * @Description: -// * @version: v1.0.0 -// * @author: atao -// * @date: 2017/5/16 下午9:23 -// * Modification History: -// * Date Author Version Description -// * ---------------------------------------------------------* -// * 2017/5/16 atao v1.0.0 创建 -// */ -////maxInactiveIntervalInSeconds -//@EnableRedisHttpSession(maxInactiveIntervalInSeconds=30*24*60*60) -//public class HttpSessionConfig { -// -// @Bean -// public HttpSessionStrategy httpSessionStrategy() { -// return new HeaderHttpSessionStrategy(); -// } -// -//} diff --git a/zteits-job/src/main/resources/application.properties b/zteits-job/src/main/resources/application.properties index 1aa0b06..308bc63 100644 --- a/zteits-job/src/main/resources/application.properties +++ b/zteits-job/src/main/resources/application.properties @@ -2,12 +2,18 @@ spring.application.name=zteist-job server.port=8080 project.syscode=zteits-job #spring.profiles.active=prod +#logging.level.root=info +#logging.level.com.zteits=debug +#logging.level.com.zteits.job.mapper=error +#logging.level.org.springframework=error +#logging.path=./logs/${spring.application.name} +#logging.file=${spring.application.name}.log + +#logback-spring.xml logging.level.root=info -logging.level.com.zteits=debug -logging.level.com.zteits.job.mapper=error -logging.level.org.springframework=error logging.path=./logs/${spring.application.name} -logging.file=${spring.application.name}.log +logging.file=${logging.path}/${spring.application.name}.log +logging.config=classpath:logback-spring.xml #park-datasource park-datasource.driverClassName=com.mysql.jdbc.Driver @@ -42,9 +48,17 @@ spring.session.store-type=redis #spring.boot.admin.client.url=http://192.168.1.196:8080 -spring.boot.admin.client.url=http://localhost:8080 -spring.boot.admin.client.prefer-ip=true +#spring.boot.admin.client.url=http://localhost:8080 +#spring.boot.admin.client.prefer-ip=true +#management.endpoints.web.exposure.include=* + +#196\u73AF\u5883 +spring.boot.admin.client.url=http://192.168.1.196:8080 +#spring.boot.admin.client.url=http://localhost:8080 +spring.boot.admin.client.instance.prefer-ip=true management.endpoints.web.exposure.include=* +spring.boot.admin.client.username=zteits-admin +spring.boot.admin.client.password=ZTE1zte1 #spring.datasource.initialize=false spring.datasource.initialization-mode=never