forked from zhoutaoo/SpringCloud
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit dc3dfdf
Merge pull request zhoutaoo#96 from zhoutaoo/dev
Dev To MasterFile tree
23 files changed
+113
-94
lines changed- auth
- authentication-server/src/main
- java/com/springboot/cloud/auth/authentication/provider
- resources
- db
- center
- bus/src/main/resources
- common/core/src/main/java/com/springboot/cloud/common/core/entity/vo
- demos
- consumer-feign/src/main/resources
- consumer-ribbon/src/main/resources
- producer-jpa/src/main/resources
- producer/src/main/resources
- docker-compose
- sysadmin/organization/src/main/java/com/springboot/cloud/sysadmin/organization/service
- impl
23 files changed
+113
-94
lines changedLines changed: 2 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
2 | 2 |
| |
3 | 3 |
| |
4 | 4 |
| |
5 | + | ||
5 | 6 |
| |
6 | 7 |
| |
7 | 8 |
| |
8 | 9 |
| |
10 | + | ||
9 | 11 |
| |
10 | 12 |
| |
11 | 13 |
| |
|
Lines changed: 7 additions & 3 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
13 | 13 |
| |
14 | 14 |
| |
15 | 15 |
| |
16 | - | ||
17 | 16 |
| |
18 | 17 |
| |
19 | 18 |
| |
20 | 19 |
| |
21 | 20 |
| |
22 | 21 |
| |
23 | 22 |
| |
24 | - | ||
25 | 23 |
| |
26 | 24 |
| |
27 | - | ||
28 | 25 |
| |
29 | 26 |
| |
30 | 27 |
| |
31 | 28 |
| |
32 | 29 |
| |
33 | 30 |
| |
31 | + | ||
32 | + | ||
33 | + | ||
34 | + | ||
35 | + | ||
36 | + | ||
34 | 37 |
| |
35 | 38 |
| |
36 | 39 |
| |
| |||
50 | 53 |
| |
51 | 54 |
| |
52 | 55 |
| |
56 | + |
Lines changed: 2 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
3 | 3 |
| |
4 | 4 |
| |
5 | 5 |
| |
6 | + | ||
6 | 7 |
| |
7 | 8 |
| |
8 | 9 |
| |
9 | 10 |
| |
11 | + | ||
10 | 12 |
| |
11 | 13 |
| |
12 | 14 |
| |
|
Lines changed: 6 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
41 | 41 |
| |
42 | 42 |
| |
43 | 43 |
| |
44 | + | ||
45 | + | ||
46 | + | ||
47 | + | ||
48 | + | ||
49 | + | ||
44 | 50 |
| |
45 | 51 |
| |
46 | 52 |
| |
|
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
78 | 78 |
| |
79 | 79 |
| |
80 | 80 |
| |
81 | - | ||
81 | + | ||
82 | 82 |
| |
83 | 83 |
|
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
5 | 5 |
| |
6 | 6 |
| |
7 | 7 |
| |
8 | + | ||
9 | + | ||
10 | + | ||
11 | + | ||
12 | + | ||
8 | 13 |
| |
9 | 14 |
| |
10 | 15 |
|
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
17 | 17 |
| |
18 | 18 |
| |
19 | 19 |
| |
20 | + | ||
21 | + | ||
22 | + | ||
23 | + | ||
24 | + | ||
25 | + | ||
26 | + | ||
20 | 27 |
| |
21 | 28 |
| |
22 | 29 |
| |
|
Lines changed: 4 additions & 4 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
24 | 24 |
| |
25 | 25 |
| |
26 | 26 |
| |
27 | - | ||
27 | + | ||
28 | 28 |
| |
29 | 29 |
| |
30 | 30 |
| |
31 | 31 |
| |
32 | 32 |
| |
33 | - | ||
33 | + | ||
34 | 34 |
| |
35 | 35 |
| |
36 | 36 |
| |
| |||
39 | 39 |
| |
40 | 40 |
| |
41 | 41 |
| |
42 | - | ||
42 | + | ||
43 | 43 |
| |
44 | 44 |
| |
45 | 45 |
| |
| |||
62 | 62 |
| |
63 | 63 |
| |
64 | 64 |
| |
65 | - | ||
65 | + | ||
66 | 66 |
| |
67 | 67 |
| |
68 | 68 |
| |
|
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1 | - | ||
2 | - | ||
3 | - | ||
4 | 1 |
| |
5 | - | ||
6 | - | ||
7 | - | ||
8 | - | ||
9 | - | ||
10 | - | ||
11 | - | ||
12 | - | ||
13 | - | ||
14 | - | ||
15 | 2 |
| |
16 | 3 |
| |
17 | 4 |
| |
18 | 5 |
| |
19 | 6 |
| |
20 | - | ||
21 | 7 |
| |
22 | 8 |
| |
23 | 9 |
| |
| |||
29 | 15 |
| |
30 | 16 |
| |
31 | 17 |
| |
32 | - | ||
33 | 18 |
| |
34 | 19 |
| |
35 | 20 |
| |
| |||
46 | 31 |
| |
47 | 32 |
| |
48 | 33 |
| |
34 | + | ||
35 | + | ||
36 | + | ||
37 | + | ||
38 | + | ||
39 | + | ||
49 | 40 |
| |
50 | 41 |
| |
51 | 42 |
| |
|
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1 | + | ||
2 | + | ||
3 | + | ||
4 | + | ||
5 | + | ||
6 | + | ||
7 | + | ||
8 | + | ||
9 | + | ||
10 | + | ||
11 | + | ||
12 | + | ||
13 | + | ||
14 | + | ||
15 | + | ||
16 | + | ||
17 | + | ||
18 | + |
0 commit comments