From 4eb97220d3d6faa7a1b7018773623552cf04820b Mon Sep 17 00:00:00 2001 From: cuixingwei <1429226085@qq.com> Date: Tue, 28 Aug 2018 21:07:56 +0800 Subject: [PATCH 01/10] Update config-client-dev.properties test --- 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..8dbf38ca0 100644 --- a/respo/config-client-dev.properties +++ b/respo/config-client-dev.properties @@ -1,5 +1,5 @@ -foo = foo version 2 +foo = foo version 4 democonfigclient.message=hello spring io # routes to serviceId From b5030841e00a0dff56d65524bc345c23444380a9 Mon Sep 17 00:00:00 2001 From: cuixingwei <1429226085@qq.com> Date: Tue, 28 Aug 2018 21:34:11 +0800 Subject: [PATCH 02/10] Update config-client-dev.properties test --- 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 8dbf38ca0..36d8a9f49 100644 --- a/respo/config-client-dev.properties +++ b/respo/config-client-dev.properties @@ -1,5 +1,5 @@ -foo = foo version 4 +foo = foo version 3 democonfigclient.message=hello spring io # routes to serviceId From 45d67a43f47e2f4edb93c492273f9fa81946e7f5 Mon Sep 17 00:00:00 2001 From: cuixingwei <1429226085@qq.com> Date: Tue, 28 Aug 2018 21:39:56 +0800 Subject: [PATCH 03/10] 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 36d8a9f49..9e0f88e7a 100644 --- a/respo/config-client-dev.properties +++ b/respo/config-client-dev.properties @@ -1,5 +1,5 @@ -foo = foo version 3 +foo = foo version 2 democonfigclient.message=hello spring io # routes to serviceId From 8fe2dde175094d9656226511c6cc1fd780497709 Mon Sep 17 00:00:00 2001 From: cuixingwei <1429226085@qq.com> Date: Fri, 7 Sep 2018 15:16:28 +0800 Subject: [PATCH 04/10] 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..62ea02e3e 100644 --- a/respo/config-client-dev.properties +++ b/respo/config-client-dev.properties @@ -1,5 +1,5 @@ -foo = foo version 2 +foo = foo version 1 democonfigclient.message=hello spring io # routes to serviceId From 9dc01ae2c55a2938aa38f83643e5597384a22cff Mon Sep 17 00:00:00 2001 From: cuixingwei <1429226085@qq.com> Date: Fri, 7 Sep 2018 16:55:25 +0800 Subject: [PATCH 05/10] 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 62ea02e3e..fba3d606b 100644 --- a/respo/config-client-dev.properties +++ b/respo/config-client-dev.properties @@ -1,5 +1,5 @@ -foo = foo version 1 +foo = foo version 12 democonfigclient.message=hello spring io # routes to serviceId From 67ca71a82376699d094990a339732e8326f31292 Mon Sep 17 00:00:00 2001 From: cuixw <1429226085@qq.com> Date: Fri, 7 Sep 2018 17:16:39 +0800 Subject: [PATCH 06/10] add msp --- msp/application-dev.yml | 21 +++++++++++++++++++++ msp/msp-auth-dev.yml | 19 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 msp/application-dev.yml create mode 100644 msp/msp-auth-dev.yml diff --git a/msp/application-dev.yml b/msp/application-dev.yml new file mode 100644 index 000000000..16d99060b --- /dev/null +++ b/msp/application-dev.yml @@ -0,0 +1,21 @@ +spring: + rabbitmq: + host: localhost + port: 5672 + username: msp + password: 123456 + datasource: + driver-class-name: com.mysql.jdbc.Driver + username: root + password: 123456 + url: jdbc:mysql://127.0.0.1:3306/msp?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false + thymeleaf: + cache: true + suffix: .html + prefix: classpath:/templates/ + servlet: + content-type: text/html + encoding: UTF-8 +demo: + name: test13 + file: wode \ No newline at end of file diff --git a/msp/msp-auth-dev.yml b/msp/msp-auth-dev.yml new file mode 100644 index 000000000..a065cd719 --- /dev/null +++ b/msp/msp-auth-dev.yml @@ -0,0 +1,19 @@ +server: + port: 8083 +spring: + datasource: + driver-class-name: com.mysql.jdbc.Driver + username: root + password: 123456 + url: jdbc:mysql://127.0.0.1:3306/msp?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false + thymeleaf: + cache: true + suffix: .html + prefix: classpath:/templates/ + servlet: + content-type: text/html + encoding: UTF-8 + security: + user: + name: msp + password: msp \ No newline at end of file From a3b1e86aede5be6d61158c10262b86ed2329cf97 Mon Sep 17 00:00:00 2001 From: cuixingwei <1429226085@qq.com> Date: Fri, 7 Sep 2018 21:43:39 +0800 Subject: [PATCH 07/10] Update application-dev.yml --- msp/application-dev.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/msp/application-dev.yml b/msp/application-dev.yml index 16d99060b..af8a09b90 100644 --- a/msp/application-dev.yml +++ b/msp/application-dev.yml @@ -17,5 +17,5 @@ spring: content-type: text/html encoding: UTF-8 demo: - name: test13 - file: wode \ No newline at end of file + name: test131 + file: wode From 453f8424da45687836393c23e08b08dbc1ba210e Mon Sep 17 00:00:00 2001 From: cuixw <1429226085@qq.com> Date: Tue, 25 Sep 2018 21:59:41 +0800 Subject: [PATCH 08/10] S --- msp/application-dev.yml | 4 ++++ msp/msp-auth-dev.yml | 11 ++++++++++- msp/msp-gateway-dev.yml | 35 ++++++++++++++++++++++++++++++++ msp/msp-zuul-dev.yml | 44 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 msp/msp-gateway-dev.yml create mode 100644 msp/msp-zuul-dev.yml diff --git a/msp/application-dev.yml b/msp/application-dev.yml index 16d99060b..0e33c5459 100644 --- a/msp/application-dev.yml +++ b/msp/application-dev.yml @@ -1,4 +1,8 @@ spring: + redis: + host: 127.0.0.1 + port: 6379 + password: 123456 rabbitmq: host: localhost port: 5672 diff --git a/msp/msp-auth-dev.yml b/msp/msp-auth-dev.yml index a065cd719..1392b5185 100644 --- a/msp/msp-auth-dev.yml +++ b/msp/msp-auth-dev.yml @@ -16,4 +16,13 @@ spring: security: user: name: msp - password: msp \ No newline at end of file + password: msp + application: + name: msp-auth +eureka: + client: + service-url: + defaultZone: http://localhost:8081/eureka + registry-fetch-interval-seconds: 10 + instance: + prefer-ip-address: true \ No newline at end of file diff --git a/msp/msp-gateway-dev.yml b/msp/msp-gateway-dev.yml new file mode 100644 index 000000000..a5dfa74a4 --- /dev/null +++ b/msp/msp-gateway-dev.yml @@ -0,0 +1,35 @@ +server: + port: 8085 +spring: + cloud: + gateway: + discovery: + locator: + enabled: true + lower-case-service-id: true + routes: + - id: msp-auth + uri: lb://msp-auth + predicates: + - Path=/auth/** + application: + name: msp-gateway +eureka: + client: + service-url: + defaultZone: http://localhost:8081/eureka + registry-fetch-interval-seconds: 10 + instance: + prefer-ip-address: true + +auth-server: http://localhost:8083 +security: + oauth2: + client: + client-id: msp-gateway + client-secret: msp-gateway + user-authorization-uri: ${auth-server}/oauth/authorize + access-token-uri: ${auth-server}/oauth/token + resource: + jwt: + key-uri: ${auth-server}/oauth/token_key \ No newline at end of file diff --git a/msp/msp-zuul-dev.yml b/msp/msp-zuul-dev.yml new file mode 100644 index 000000000..158fc84de --- /dev/null +++ b/msp/msp-zuul-dev.yml @@ -0,0 +1,44 @@ +server: + port: 8084 +spring: + datasource: + driver-class-name: com.mysql.jdbc.Driver + username: root + password: 123456 + url: jdbc:mysql://127.0.0.1:3306/msp?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false + thymeleaf: + cache: true + suffix: .html + prefix: classpath:/templates/ + servlet: + content-type: text/html + encoding: UTF-8 + security: + user: + name: msp + password: msp + application: + name: msp-zuul +zuul: + routes: + api-a: + path: /api-a/** + serviceId: msp-auth +eureka: + client: + service-url: + defaultZone: http://localhost:8081/eureka + registry-fetch-interval-seconds: 10 + instance: + prefer-ip-address: true +auth-server: http://localhost:8083 +security: + oauth2: + client: + client-id: msp-zuul + client-secret: msp-zuul + user-authorization-uri: ${auth-server}/oauth/authorize + access-token-uri: ${auth-server}/oauth/token + resource: + jwt: + key-uri: ${auth-server}/oauth/token_key \ No newline at end of file From 0800379ca1483b2f14ab42c1866ea0a838ff86a3 Mon Sep 17 00:00:00 2001 From: cuixw <1429226085@qq.com> Date: Tue, 25 Sep 2018 22:21:38 +0800 Subject: [PATCH 09/10] s --- msp/application-dev.yml | 4 ++-- msp/msp-auth-dev.yml | 9 +-------- msp/msp-gateway-dev.yml | 8 -------- msp/msp-zuul-dev.yml | 7 ------- 4 files changed, 3 insertions(+), 25 deletions(-) diff --git a/msp/application-dev.yml b/msp/application-dev.yml index 879fbd435..0e33c5459 100644 --- a/msp/application-dev.yml +++ b/msp/application-dev.yml @@ -21,5 +21,5 @@ spring: content-type: text/html encoding: UTF-8 demo: - name: test131 - file: wode + name: test13 + file: wode \ No newline at end of file diff --git a/msp/msp-auth-dev.yml b/msp/msp-auth-dev.yml index 1392b5185..1b35ef98c 100644 --- a/msp/msp-auth-dev.yml +++ b/msp/msp-auth-dev.yml @@ -18,11 +18,4 @@ spring: name: msp password: msp application: - name: msp-auth -eureka: - client: - service-url: - defaultZone: http://localhost:8081/eureka - registry-fetch-interval-seconds: 10 - instance: - prefer-ip-address: true \ No newline at end of file + name: msp-auth \ No newline at end of file diff --git a/msp/msp-gateway-dev.yml b/msp/msp-gateway-dev.yml index a5dfa74a4..518fda7ab 100644 --- a/msp/msp-gateway-dev.yml +++ b/msp/msp-gateway-dev.yml @@ -14,14 +14,6 @@ spring: - Path=/auth/** application: name: msp-gateway -eureka: - client: - service-url: - defaultZone: http://localhost:8081/eureka - registry-fetch-interval-seconds: 10 - instance: - prefer-ip-address: true - auth-server: http://localhost:8083 security: oauth2: diff --git a/msp/msp-zuul-dev.yml b/msp/msp-zuul-dev.yml index 158fc84de..70ea198bf 100644 --- a/msp/msp-zuul-dev.yml +++ b/msp/msp-zuul-dev.yml @@ -24,13 +24,6 @@ zuul: api-a: path: /api-a/** serviceId: msp-auth -eureka: - client: - service-url: - defaultZone: http://localhost:8081/eureka - registry-fetch-interval-seconds: 10 - instance: - prefer-ip-address: true auth-server: http://localhost:8083 security: oauth2: From 371a00d3beaf7673216aa66ee69ac5269cce4189 Mon Sep 17 00:00:00 2001 From: cuixw <1429226085@qq.com> Date: Thu, 11 Oct 2018 21:48:27 +0800 Subject: [PATCH 10/10] s --- application-dev.yml | 25 +++++++++++++++++++++++++ msp-auth-dev.yml | 21 +++++++++++++++++++++ msp-gateway-dev.yml | 27 +++++++++++++++++++++++++++ msp-zuul-dev.yml | 37 +++++++++++++++++++++++++++++++++++++ 4 files changed, 110 insertions(+) create mode 100644 application-dev.yml create mode 100644 msp-auth-dev.yml create mode 100644 msp-gateway-dev.yml create mode 100644 msp-zuul-dev.yml diff --git a/application-dev.yml b/application-dev.yml new file mode 100644 index 000000000..0e33c5459 --- /dev/null +++ b/application-dev.yml @@ -0,0 +1,25 @@ +spring: + redis: + host: 127.0.0.1 + port: 6379 + password: 123456 + rabbitmq: + host: localhost + port: 5672 + username: msp + password: 123456 + datasource: + driver-class-name: com.mysql.jdbc.Driver + username: root + password: 123456 + url: jdbc:mysql://127.0.0.1:3306/msp?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false + thymeleaf: + cache: true + suffix: .html + prefix: classpath:/templates/ + servlet: + content-type: text/html + encoding: UTF-8 +demo: + name: test13 + file: wode \ No newline at end of file diff --git a/msp-auth-dev.yml b/msp-auth-dev.yml new file mode 100644 index 000000000..1b35ef98c --- /dev/null +++ b/msp-auth-dev.yml @@ -0,0 +1,21 @@ +server: + port: 8083 +spring: + datasource: + driver-class-name: com.mysql.jdbc.Driver + username: root + password: 123456 + url: jdbc:mysql://127.0.0.1:3306/msp?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false + thymeleaf: + cache: true + suffix: .html + prefix: classpath:/templates/ + servlet: + content-type: text/html + encoding: UTF-8 + security: + user: + name: msp + password: msp + application: + name: msp-auth \ No newline at end of file diff --git a/msp-gateway-dev.yml b/msp-gateway-dev.yml new file mode 100644 index 000000000..518fda7ab --- /dev/null +++ b/msp-gateway-dev.yml @@ -0,0 +1,27 @@ +server: + port: 8085 +spring: + cloud: + gateway: + discovery: + locator: + enabled: true + lower-case-service-id: true + routes: + - id: msp-auth + uri: lb://msp-auth + predicates: + - Path=/auth/** + application: + name: msp-gateway +auth-server: http://localhost:8083 +security: + oauth2: + client: + client-id: msp-gateway + client-secret: msp-gateway + user-authorization-uri: ${auth-server}/oauth/authorize + access-token-uri: ${auth-server}/oauth/token + resource: + jwt: + key-uri: ${auth-server}/oauth/token_key \ No newline at end of file diff --git a/msp-zuul-dev.yml b/msp-zuul-dev.yml new file mode 100644 index 000000000..70ea198bf --- /dev/null +++ b/msp-zuul-dev.yml @@ -0,0 +1,37 @@ +server: + port: 8084 +spring: + datasource: + driver-class-name: com.mysql.jdbc.Driver + username: root + password: 123456 + url: jdbc:mysql://127.0.0.1:3306/msp?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false + thymeleaf: + cache: true + suffix: .html + prefix: classpath:/templates/ + servlet: + content-type: text/html + encoding: UTF-8 + security: + user: + name: msp + password: msp + application: + name: msp-zuul +zuul: + routes: + api-a: + path: /api-a/** + serviceId: msp-auth +auth-server: http://localhost:8083 +security: + oauth2: + client: + client-id: msp-zuul + client-secret: msp-zuul + user-authorization-uri: ${auth-server}/oauth/authorize + access-token-uri: ${auth-server}/oauth/token + resource: + jwt: + key-uri: ${auth-server}/oauth/token_key \ No newline at end of file