Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
datacollector
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chenweisong
datacollector
Commits
d7b1a8af
Commit
d7b1a8af
authored
Mar 20, 2020
by
linxu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
集成spring cloud
parent
48e3d185
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
44 additions
and
13 deletions
+44
-13
pom.xml
pom.xml
+14
-4
ActivitiApplication.java
src/main/java/com/keymobile/ActivitiApplication.java
+5
-4
SecurityConfig.java
...n/java/com/keymobile/rest/common/conf/SecurityConfig.java
+2
-2
application-test.yml
src/main/resources/application-test.yml
+23
-3
No files found.
pom.xml
View file @
d7b1a8af
...
@@ -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 -->
...
...
src/main/java/com/keymobile/ActivitiApplication.java
View file @
d7b1a8af
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
)
{
...
...
src/main/java/com/keymobile/rest/common/conf/SecurityConfig.java
View file @
d7b1a8af
...
@@ -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
...
...
src/main/resources/application-test.yml
View file @
d7b1a8af
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
:
1
27.0.0.1
host
:
1
92.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
:
...
@@ -29,4 +46,7 @@ app:
...
@@ -29,4 +46,7 @@ app:
swagger2
:
swagger2
:
host
:
localhost:8110
host
:
localhost:8110
# host: 47.105.236.43/activiti
# host: 47.105.236.43/activiti
\ No newline at end of file
security
:
permit
:
true
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment