From e65a7a9f05c3d7198d863a3575fae2ebb5fe8bfc Mon Sep 17 00:00:00 2001 From: HeroOfJava <1654401127@qq.com> Date: Thu, 8 Feb 2018 18:18:02 +0800 Subject: [PATCH 01/16] Update config-client-dev.properties --- respo/config-client-dev.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/respo/config-client-dev.properties b/respo/config-client-dev.properties index 9e0f88e7a..c99ff3902 100644 --- a/respo/config-client-dev.properties +++ b/respo/config-client-dev.properties @@ -1,5 +1,5 @@ -foo = foo version 2 +foo = foo version 22222 democonfigclient.message=hello spring io # routes to serviceId From 382dcd033f0e261a9c054db256f907669c69d19b Mon Sep 17 00:00:00 2001 From: HeroOfJava <1654401127@qq.com> Date: Thu, 8 Feb 2018 18:24:00 +0800 Subject: [PATCH 02/16] Update config-client-dev.properties --- respo/config-client-dev.properties | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/respo/config-client-dev.properties b/respo/config-client-dev.properties index c99ff3902..e2df99c33 100644 --- a/respo/config-client-dev.properties +++ b/respo/config-client-dev.properties @@ -1,5 +1,7 @@ -foo = foo version 22222 +foo = foo version + +foo2 = foo version 22222 democonfigclient.message=hello spring io # routes to serviceId From 575096828e60567f9a09d07f44a6fdf6eaf2469d Mon Sep 17 00:00:00 2001 From: HeroOfJava <1654401127@qq.com> Date: Thu, 8 Feb 2018 18:45:29 +0800 Subject: [PATCH 03/16] Delete address-dev.properties --- respo/address-dev.properties | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 respo/address-dev.properties diff --git a/respo/address-dev.properties b/respo/address-dev.properties deleted file mode 100644 index 028f539a9..000000000 --- a/respo/address-dev.properties +++ /dev/null @@ -1,7 +0,0 @@ - - -spring.rabbitmq.host=localhost -spring.rabbitmq.port=5672 -server.port=8882 -hystrix.command.default.execution.timeout.enabled=false -management.security.enabled=false From 5dc36d342fb69133dadb30af5559f69f0d1a66a0 Mon Sep 17 00:00:00 2001 From: HeroOfJava <1654401127@qq.com> Date: Thu, 8 Feb 2018 18:46:46 +0800 Subject: [PATCH 04/16] Rename config-client-dev.properties to application-dev.properties --- .../{config-client-dev.properties => application-dev.properties} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename respo/{config-client-dev.properties => application-dev.properties} (100%) diff --git a/respo/config-client-dev.properties b/respo/application-dev.properties similarity index 100% rename from respo/config-client-dev.properties rename to respo/application-dev.properties From 818d18248a89742c7c4d30d1f6b62f03a5453186 Mon Sep 17 00:00:00 2001 From: HeroOfJava <1654401127@qq.com> Date: Thu, 8 Feb 2018 18:47:06 +0800 Subject: [PATCH 05/16] Rename user-dev.properties to application-test.properties --- respo/{user-dev.properties => application-test.properties} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename respo/{user-dev.properties => application-test.properties} (100%) diff --git a/respo/user-dev.properties b/respo/application-test.properties similarity index 100% rename from respo/user-dev.properties rename to respo/application-test.properties From 648e3aff25eb4ed250e455e4f8b0615b38d85eb6 Mon Sep 17 00:00:00 2001 From: HeroOfJava <1654401127@qq.com> Date: Thu, 8 Feb 2018 18:47:40 +0800 Subject: [PATCH 06/16] Update and rename zuul-dev.properties to zuul-pre.properties --- respo/zuul-dev.properties | 14 -------------- respo/zuul-pre.properties | 4 ++++ 2 files changed, 4 insertions(+), 14 deletions(-) delete mode 100644 respo/zuul-dev.properties create mode 100644 respo/zuul-pre.properties diff --git a/respo/zuul-dev.properties b/respo/zuul-dev.properties deleted file mode 100644 index bd74a80df..000000000 --- a/respo/zuul-dev.properties +++ /dev/null @@ -1,14 +0,0 @@ - -server.port=8889 -# routes to serviceId -zuul.routes.api-a.path=/userapi/** -zuul.routes.api-a.serviceId=USER -zuul.routes.api-b.path=/addressapi/** -zuul.routes.api-b.serviceId=ADDRESS - -# routes to url -# zuul.routes.api-a-url.path=/userapi/** -# zuul.routes.api-a-url.url=http://localhost:8881/ -#eureka.client.serviceUrl.defaultZone=http://localhost:8880/eureka/ - - diff --git a/respo/zuul-pre.properties b/respo/zuul-pre.properties new file mode 100644 index 000000000..d4a93138a --- /dev/null +++ b/respo/zuul-pre.properties @@ -0,0 +1,4 @@ + +content=pre + + From 46fb2ac097a9ee3b9b3b92d8b9bffda18e28b9fc Mon Sep 17 00:00:00 2001 From: HeroOfJava <1654401127@qq.com> Date: Thu, 8 Feb 2018 18:55:33 +0800 Subject: [PATCH 07/16] Rename zuul-pre.properties to application-pre.properties --- respo/{zuul-pre.properties => application-pre.properties} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename respo/{zuul-pre.properties => application-pre.properties} (100%) diff --git a/respo/zuul-pre.properties b/respo/application-pre.properties similarity index 100% rename from respo/zuul-pre.properties rename to respo/application-pre.properties From edc71d0b62afbe6ccc7fdca401909e2b396f8854 Mon Sep 17 00:00:00 2001 From: HeroOfJava <1654401127@qq.com> Date: Thu, 8 Feb 2018 18:56:04 +0800 Subject: [PATCH 08/16] Update application-dev.properties --- respo/application-dev.properties | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/respo/application-dev.properties b/respo/application-dev.properties index e2df99c33..be7fc7820 100644 --- a/respo/application-dev.properties +++ b/respo/application-dev.properties @@ -1,13 +1,3 @@ - -foo = foo version - -foo2 = foo version 22222 -democonfigclient.message=hello spring io - -# routes to serviceId -# routes to url -# zuul.routes.api-a-url.path=/userapi/** -# zuul.routes.api-a-url.url=http://localhost:8881/ -#eureka.client.serviceUrl.defaultZone=http://localhost:8880/eureka/ +content=dev From a1a8eee92538d68e26599b2be96ed5e43125f674 Mon Sep 17 00:00:00 2001 From: HeroOfJava <1654401127@qq.com> Date: Thu, 8 Feb 2018 18:56:31 +0800 Subject: [PATCH 09/16] Update application-test.properties --- respo/application-test.properties | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/respo/application-test.properties b/respo/application-test.properties index f15f6e94c..0272d26c8 100644 --- a/respo/application-test.properties +++ b/respo/application-test.properties @@ -1,6 +1 @@ -eureka.client.serviceUrl.defaultZone=http://localhost:8880/eureka/ -spring.rabbitmq.host=localhost -spring.rabbitmq.port=5672 -hystrix.command.default.execution.timeout.enabled=false -management.security.enabled=false -server.port=8881 +content=test From 169e11b616f207e1db9f40638d941b17f971c380 Mon Sep 17 00:00:00 2001 From: HeroOfJava <1654401127@qq.com> Date: Fri, 2 Mar 2018 11:10:51 +0800 Subject: [PATCH 10/16] Rename application-dev.properties to app-dev.properties --- respo/{application-dev.properties => app-dev.properties} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename respo/{application-dev.properties => app-dev.properties} (100%) diff --git a/respo/application-dev.properties b/respo/app-dev.properties similarity index 100% rename from respo/application-dev.properties rename to respo/app-dev.properties From b3f041791be7e970b0222421372f0d182b077276 Mon Sep 17 00:00:00 2001 From: HeroOfJava <1654401127@qq.com> Date: Fri, 2 Mar 2018 11:13:35 +0800 Subject: [PATCH 11/16] Rename application-pre.properties to app-pre.properties --- respo/{application-pre.properties => app-pre.properties} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename respo/{application-pre.properties => app-pre.properties} (100%) diff --git a/respo/application-pre.properties b/respo/app-pre.properties similarity index 100% rename from respo/application-pre.properties rename to respo/app-pre.properties From 4c52ae64fd73ba74201568422d5a937ee9865511 Mon Sep 17 00:00:00 2001 From: HeroOfJava <1654401127@qq.com> Date: Fri, 2 Mar 2018 11:13:56 +0800 Subject: [PATCH 12/16] Rename application-test.properties to app-test.properties --- respo/{application-test.properties => app-test.properties} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename respo/{application-test.properties => app-test.properties} (100%) diff --git a/respo/application-test.properties b/respo/app-test.properties similarity index 100% rename from respo/application-test.properties rename to respo/app-test.properties From 7ec63961fdbc93ae23b3aae145084bf6dc307c55 Mon Sep 17 00:00:00 2001 From: HeroOfJava <1654401127@qq.com> Date: Fri, 2 Mar 2018 11:24:01 +0800 Subject: [PATCH 13/16] Rename app-dev.properties to application-dev.properties --- respo/{app-dev.properties => application-dev.properties} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename respo/{app-dev.properties => application-dev.properties} (100%) diff --git a/respo/app-dev.properties b/respo/application-dev.properties similarity index 100% rename from respo/app-dev.properties rename to respo/application-dev.properties From a47ed848bafad842fdde5d148f0c5920eaccdb6a Mon Sep 17 00:00:00 2001 From: HeroOfJava <1654401127@qq.com> Date: Fri, 2 Mar 2018 11:24:26 +0800 Subject: [PATCH 14/16] Rename app-pre.properties to application-pre.properties --- respo/{app-pre.properties => application-pre.properties} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename respo/{app-pre.properties => application-pre.properties} (100%) diff --git a/respo/app-pre.properties b/respo/application-pre.properties similarity index 100% rename from respo/app-pre.properties rename to respo/application-pre.properties From 482380155d50d12a124892f87656f3f6040f2f91 Mon Sep 17 00:00:00 2001 From: HeroOfJava <1654401127@qq.com> Date: Fri, 2 Mar 2018 11:24:49 +0800 Subject: [PATCH 15/16] Rename app-test.properties to application-test.properties --- respo/{app-test.properties => application-test.properties} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename respo/{app-test.properties => application-test.properties} (100%) diff --git a/respo/app-test.properties b/respo/application-test.properties similarity index 100% rename from respo/app-test.properties rename to respo/application-test.properties From d2a46d088b709177db3523f084d203c086ab3fe6 Mon Sep 17 00:00:00 2001 From: HeroOfJava <1654401127@qq.com> Date: Fri, 2 Mar 2018 15:34:42 +0800 Subject: [PATCH 16/16] Create application-pro.properties --- respo/application-pro.properties | 1 + 1 file changed, 1 insertion(+) create mode 100644 respo/application-pro.properties diff --git a/respo/application-pro.properties b/respo/application-pro.properties new file mode 100644 index 000000000..2a0b3dcc7 --- /dev/null +++ b/respo/application-pro.properties @@ -0,0 +1 @@ +content=pro