Commit d7b1a8af by linxu

集成spring cloud

parent 48e3d185
...@@ -28,10 +28,10 @@ ...@@ -28,10 +28,10 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-mongodb</artifactId> <artifactId>spring-boot-starter-data-mongodb</artifactId>
</dependency> </dependency>
<!-- <dependency>--> <dependency>
<!-- <groupId>org.springframework.cloud</groupId>--> <groupId>org.springframework.cloud</groupId>
<!-- <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>--> <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
<!-- </dependency>--> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>
...@@ -133,6 +133,16 @@ ...@@ -133,6 +133,16 @@
<systemPath>${project.basedir}/lib/auth-common-1.0.2-SNAPSHOT.jar</systemPath> <systemPath>${project.basedir}/lib/auth-common-1.0.2-SNAPSHOT.jar</systemPath>
<version>1.0.2</version> <version>1.0.2</version>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.springframework.security</groupId>-->
<!-- <artifactId>spring-security-config</artifactId>-->
<!-- <version>${spring-security.version}</version>-->
<!-- </dependency>-->
<!-- activiti end --> <!-- activiti end -->
......
package com.keymobile; package com.keymobile;
import org.activiti.spring.boot.SecurityAutoConfiguration;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import springfox.documentation.swagger2.annotations.EnableSwagger2; import springfox.documentation.swagger2.annotations.EnableSwagger2;
@EnableSwagger2 @EnableSwagger2
@SpringBootApplication @SpringBootApplication(exclude={
@EnableAutoConfiguration(exclude = {org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class, org.activiti.spring.boot.SecurityAutoConfiguration.class,
org.activiti.spring.boot.SecurityAutoConfiguration.class}) SecurityAutoConfiguration.class
})
public class ActivitiApplication extends SpringBootServletInitializer { public class ActivitiApplication extends SpringBootServletInitializer {
public static void main(String[] args) { public static void main(String[] args) {
......
...@@ -13,8 +13,8 @@ import org.springframework.security.crypto.password.PasswordEncoder; ...@@ -13,8 +13,8 @@ import org.springframework.security.crypto.password.PasswordEncoder;
import javax.sql.DataSource; import javax.sql.DataSource;
//@Configuration @Configuration
//@ComponentScan("com.keymobile.auth.common.security") @ComponentScan("com.keymobile.auth.common.security")
public class SecurityConfig extends WebSecurityConfigurerAdapter { public class SecurityConfig extends WebSecurityConfigurerAdapter {
@Autowired @Autowired
......
eureka:
client:
healthcheck:
enabled: true
registryFetchIntervalSeconds: 5
region: default
serviceUrl:
defaultZone: http://192.168.0.240:8081/eureka/
enabled: true
instance:
prefer-ip-address: false
hostname: 192.168.0.48
spring: spring:
application: application:
name: activiti name: activiti
...@@ -17,8 +30,12 @@ spring: ...@@ -17,8 +30,12 @@ spring:
max-file-size: 20Mb max-file-size: 20Mb
max-request-size: 100Mb max-request-size: 100Mb
redis: redis:
host: 127.0.0.1 host: 192.168.0.192
port: 6379 port: 6379
session:
store-type: redis
redis:
namespace: cmb_dev
activiti: activiti:
check-process-definitions: false #关闭验证自动部署 check-process-definitions: false #关闭验证自动部署
server: server:
...@@ -30,3 +47,6 @@ app: ...@@ -30,3 +47,6 @@ app:
swagger2: swagger2:
host: localhost:8110 host: localhost:8110
# host: 47.105.236.43/activiti # host: 47.105.236.43/activiti
security:
permit: true
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment