Skip to content

Commit 0920e85

Browse files
ZMRWEGOZMRWEGO
committed
解决冲突
2 parents f84685d + f6f3b05 commit 0920e85

File tree

216 files changed

+216
-216
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

216 files changed

+216
-216
lines changed

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2016-2020 Michael Zhang <[email protected]>
3+
Copyright (c) 2016-2021 Michael Zhang <[email protected]>
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎examples/cloud-eureka-server/src/main/java/net/devh/boot/grpc/examples/cloud/server/EurekaServerApplication.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016-2020 Michael Zhang <[email protected]>
2+
* Copyright (c) 2016-2021 Michael Zhang <[email protected]>
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
55
* documentation files (the "Software"), to deal in the Software without restriction, including without limitation the

‎examples/cloud-grpc-client/src/main/java/net/devh/boot/grpc/examples/cloud/client/CloudGrpcClientApplication.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016-2020 Michael Zhang <[email protected]>
2+
* Copyright (c) 2016-2021 Michael Zhang <[email protected]>
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
55
* documentation files (the "Software"), to deal in the Software without restriction, including without limitation the

‎examples/cloud-grpc-client/src/main/java/net/devh/boot/grpc/examples/cloud/client/GlobalClientInterceptorConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016-2020 Michael Zhang <[email protected]>
2+
* Copyright (c) 2016-2021 Michael Zhang <[email protected]>
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
55
* documentation files (the "Software"), to deal in the Software without restriction, including without limitation the

‎examples/cloud-grpc-client/src/main/java/net/devh/boot/grpc/examples/cloud/client/GrpcClientController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016-2020 Michael Zhang <[email protected]>
2+
* Copyright (c) 2016-2021 Michael Zhang <[email protected]>
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
55
* documentation files (the "Software"), to deal in the Software without restriction, including without limitation the

‎examples/cloud-grpc-client/src/main/java/net/devh/boot/grpc/examples/cloud/client/GrpcClientService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016-2020 Michael Zhang <[email protected]>
2+
* Copyright (c) 2016-2021 Michael Zhang <[email protected]>
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
55
* documentation files (the "Software"), to deal in the Software without restriction, including without limitation the

‎examples/cloud-grpc-client/src/main/java/net/devh/boot/grpc/examples/cloud/client/LogGrpcInterceptor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016-2020 Michael Zhang <[email protected]>
2+
* Copyright (c) 2016-2021 Michael Zhang <[email protected]>
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
55
* documentation files (the "Software"), to deal in the Software without restriction, including without limitation the

‎examples/cloud-grpc-server/src/main/java/net/devh/boot/grpc/examples/cloud/server/CloudGrpcServerApplication.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016-2020 Michael Zhang <[email protected]>
2+
* Copyright (c) 2016-2021 Michael Zhang <[email protected]>
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
55
* documentation files (the "Software"), to deal in the Software without restriction, including without limitation the

‎examples/cloud-grpc-server/src/main/java/net/devh/boot/grpc/examples/cloud/server/GlobalInterceptorConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016-2020 Michael Zhang <[email protected]>
2+
* Copyright (c) 2016-2021 Michael Zhang <[email protected]>
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
55
* documentation files (the "Software"), to deal in the Software without restriction, including without limitation the

‎examples/cloud-grpc-server/src/main/java/net/devh/boot/grpc/examples/cloud/server/GrpcServerService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016-2020 Michael Zhang <[email protected]>
2+
* Copyright (c) 2016-2021 Michael Zhang <[email protected]>
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
55
* documentation files (the "Software"), to deal in the Software without restriction, including without limitation the

0 commit comments

Comments
 (0)