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
32ca2f53
Commit
32ca2f53
authored
Mar 26, 2020
by
chenweisong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更新
parent
1c7b0ede
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
36 additions
and
11 deletions
+36
-11
pom.xml
pom.xml
+4
-4
ActivitiApplication.java
src/main/java/com/keymobile/ActivitiApplication.java
+5
-1
ExcelController.java
...n/java/com/keymobile/rest/controller/ExcelController.java
+0
-1
UserController.java
...in/java/com/keymobile/rest/controller/UserController.java
+3
-1
UserFeignService.java
...ain/java/com/keymobile/rest/service/UserFeignService.java
+15
-0
application-test.yml
src/main/resources/application-test.yml
+9
-4
No files found.
pom.xml
View file @
32ca2f53
...
@@ -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>
...
...
src/main/java/com/keymobile/ActivitiApplication.java
View file @
32ca2f53
...
@@ -5,10 +5,14 @@ import org.springframework.boot.SpringApplication;
...
@@ -5,10 +5,14 @@ import org.springframework.boot.SpringApplication;
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
org.springframework.cloud.client.discovery.EnableDiscoveryClient
;
import
org.springframework.cloud.openfeign.EnableFeignClients
;
import
springfox.documentation.swagger2.annotations.EnableSwagger2
;
import
springfox.documentation.swagger2.annotations.EnableSwagger2
;
@EnableSwagger2
@EnableSwagger2
@SpringBootApplication
(
exclude
={
@EnableFeignClients
//@EnableDiscoveryClient
@SpringBootApplication
(
exclude
=
{
org
.
activiti
.
spring
.
boot
.
SecurityAutoConfiguration
.
class
,
org
.
activiti
.
spring
.
boot
.
SecurityAutoConfiguration
.
class
,
SecurityAutoConfiguration
.
class
SecurityAutoConfiguration
.
class
})
})
...
...
src/main/java/com/keymobile/rest/controller/ExcelController.java
View file @
32ca2f53
...
@@ -93,6 +93,5 @@ public class ExcelController {
...
@@ -93,6 +93,5 @@ public class ExcelController {
// } else {
// } else {
return
ApiResponse
.
ok
();
return
ApiResponse
.
ok
();
// }
// }
}
}
}
}
src/main/java/com/keymobile/rest/controller/UserController.java
View file @
32ca2f53
...
@@ -14,13 +14,15 @@ import org.springframework.web.bind.annotation.*;
...
@@ -14,13 +14,15 @@ import org.springframework.web.bind.annotation.*;
import
java.util.*
;
import
java.util.*
;
@Api
(
description
=
"用户/机构/补录范围 控制器"
)
@Api
(
description
=
"用户/机构/补录范围 控制器"
)
//
@RestController
@RestController
@RequestMapping
(
path
=
"/api"
)
@RequestMapping
(
path
=
"/api"
)
public
class
UserController
{
public
class
UserController
{
@Autowired
@Autowired
private
UserService
userService
;
private
UserService
userService
;
@Autowired
@Autowired
private
UserFeignService
userFeignService
;
@Autowired
private
GroupService
groupService
;
private
GroupService
groupService
;
@Autowired
@Autowired
private
RecordScopeService
recordScopeService
;
private
RecordScopeService
recordScopeService
;
...
...
src/main/java/com/keymobile/rest/service/UserFeignService.java
0 → 100644
View file @
32ca2f53
package
com
.
keymobile
.
rest
.
service
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.web.bind.annotation.GetMapping
;
/**
* 查找spring cloud中服务名为authService的服务
*/
@FeignClient
(
value
=
"authService"
)
public
interface
UserFeignService
{
@GetMapping
(
"/authservice/orgs"
)
String
getAllOrgs
();
}
src/main/resources/application-test.yml
View file @
32ca2f53
...
@@ -11,14 +11,18 @@ eureka:
...
@@ -11,14 +11,18 @@ eureka:
prefer-ip-address
:
false
prefer-ip-address
:
false
hostname
:
192.168.0.48
hostname
:
192.168.0.48
feign
:
hystrix
:
enabled
:
true
spring
:
spring
:
application
:
application
:
name
:
activiti
name
:
activiti
jpa
:
jpa
:
show-sql
:
false
show-sql
:
false
database-platform
:
org.hibernate.dialect.MySQL5Dialect
database-platform
:
org.hibernate.dialect.MySQL5Dialect
# hibernate:
# hibernate:
# ddl-auto: update
# ddl-auto: update
datasource
:
datasource
:
url
:
jdbc:mysql://192.168.0.192:3306/cmb_dev?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
url
:
jdbc:mysql://192.168.0.192:3306/cmb_dev?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
username
:
test
username
:
test
...
@@ -31,7 +35,7 @@ spring:
...
@@ -31,7 +35,7 @@ spring:
max-request-size
:
100Mb
max-request-size
:
100Mb
redis
:
redis
:
host
:
192.168.0.192
host
:
192.168.0.192
# host: 127.0.0.1
# host: 127.0.0.1
port
:
6379
port
:
6379
session
:
session
:
store-type
:
redis
store-type
:
redis
...
@@ -46,7 +50,7 @@ app:
...
@@ -46,7 +50,7 @@ app:
active-process
:
MoreSubProcess.bpmn
active-process
:
MoreSubProcess.bpmn
swagger2
:
swagger2
:
host
:
127.0.0.1
:8110
host
:
localhost
:8110
security
:
security
:
permit
:
true
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