From a6d5936afb3ced34b6d7822bec04aa354a4ebcb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Sat, 27 Oct 2018 12:42:28 +0800 Subject: [PATCH] =?UTF-8?q?:wrench:=20=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E3=80=82=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?hosts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/md/deploy.md | 2 +- docker-compose.yml | 17 +++++++++++++++++ pigx-auth/src/main/resources/bootstrap.yml | 2 +- pigx-config/src/main/resources/bootstrap.yml | 2 +- .../main/resources/config/application-dev.yml | 11 +++++------ .../src/main/resources/config/pigx-auth-dev.yml | 4 ++-- .../main/resources/config/pigx-codegen-dev.yml | 4 ++-- .../main/resources/config/pigx-daemon-dev.yml | 6 +++--- .../main/resources/config/pigx-gateway-dev.yml | 2 +- .../src/main/resources/config/pigx-upms-dev.yml | 4 ++-- .../gateway/filter/PasswordDecoderFilter.java | 2 +- ...lter.java => ValidateCodeGatewayFilter.java} | 2 +- .../pigx/gateway/handler/ImageCodeHandler.java | 4 ++-- pigx-gateway/src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- pom.xml | 2 +- 20 files changed, 46 insertions(+), 30 deletions(-) rename pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/{ImageCodeGatewayFilter.java => ValidateCodeGatewayFilter.java} (98%) diff --git a/doc/md/deploy.md b/doc/md/deploy.md index c59a790d5..cd85756e2 100644 --- a/doc/md/deploy.md +++ b/doc/md/deploy.md @@ -40,7 +40,7 @@ spring: driver-class-name: com.mysql.jdbc.Driver username: root password: lengleng - url: jdbc:mysql://mysql:3306/pigx?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false + url: jdbc:pigx-mysql://mysql:3306/pigx?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false ``` ### 四、配置本地hosts diff --git a/docker-compose.yml b/docker-compose.yml index a339addd3..541bf014b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,10 +1,18 @@ version: '2' services: + pigx-zookeeper: + image: zookeeper:3.4.13 + ports: + - 2181:2181 + restart: always + container_name: pigx-zookeeper + pigx-redis: image: redis:4.0.10 ports: - 6379:6379 restart: always + container_name: pigx-redis pigx-eureka: build: @@ -13,6 +21,7 @@ services: restart: always ports: - 1025:1025 + container_name: pigx-eureka pigx-config: links: @@ -21,6 +30,7 @@ services: context: ./ dockerfile: ./pigx-config/Dockerfile restart: always + container_name: pigx-config pigx-gateway: links: @@ -32,6 +42,7 @@ services: restart: always ports: - 9999:9999 + container_name: pigx-gateway pigx-auth: links: @@ -41,6 +52,7 @@ services: context: ./ dockerfile: ./pigx-auth/Dockerfile restart: always + container_name: pigx-auth pigx-upms: links: @@ -51,6 +63,7 @@ services: context: ./ dockerfile: ./pigx-upms/pigx-upms-biz/Dockerfile restart: always + container_name: pigx-upms pigx-monitor: links: @@ -62,6 +75,7 @@ services: restart: always ports: - 5001:5001 + container_name: pigx-monitor pigx-daemon: links: @@ -73,6 +87,7 @@ services: restart: always ports: - 5002:5002 + container_name: pigx-daemon pigx-codegen: links: @@ -82,6 +97,7 @@ services: context: ./ dockerfile: ./pigx-visual/pigx-codegen/Dockerfile restart: always + container_name: pigx-codegen pigx-tx-manager: links: @@ -94,3 +110,4 @@ services: ports: - 5004:5004 - 9998:9998 + container_name: pigx-tx-manager diff --git a/pigx-auth/src/main/resources/bootstrap.yml b/pigx-auth/src/main/resources/bootstrap.yml index aed68dfa4..4a98cab0c 100644 --- a/pigx-auth/src/main/resources/bootstrap.yml +++ b/pigx-auth/src/main/resources/bootstrap.yml @@ -20,4 +20,4 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@localhost:1025/eureka/ + defaultZone: http://pig:pig@pigx-eureka:1025/eureka/ diff --git a/pigx-config/src/main/resources/bootstrap.yml b/pigx-config/src/main/resources/bootstrap.yml index 5564b817f..b175a2426 100644 --- a/pigx-config/src/main/resources/bootstrap.yml +++ b/pigx-config/src/main/resources/bootstrap.yml @@ -19,7 +19,7 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@localhost:1025/eureka/ + defaultZone: http://pig:pig@pigx-eureka:1025/eureka/ # 暴露监控端点 management: diff --git a/pigx-config/src/main/resources/config/application-dev.yml b/pigx-config/src/main/resources/config/application-dev.yml index 6ffd458a0..c65e29081 100644 --- a/pigx-config/src/main/resources/config/application-dev.yml +++ b/pigx-config/src/main/resources/config/application-dev.yml @@ -6,7 +6,7 @@ jasypt: spring: redis: password: - host: redis + host: pigx-redis # Jackson配置 jackson: time-zone: GMT+8 @@ -78,7 +78,7 @@ mybatis-plus: swagger: title: PigX Swagger API description: 全宇宙最牛逼的Spring Cloud微服务开发脚手架 - version: 1.6.2 + version: 1.7.0 license: Powered By PigX licenseUrl: https://pig4cloud.com/ terms-of-service-url: https://pig4cloud.com/ @@ -93,12 +93,11 @@ swagger: - scope: server description: server all token-url-list: - - ${security.auth.server}/token + - http://pigx-gateway:9999/auth/oauth/token ## spring security 配置 security: - auth: - server: http://localhost:9999/auth/oauth oauth2: resource: - token-info-uri: ${security.auth.server}/check_token + loadBalanced: true + token-info-uri: http://pigx-auth/oauth/check_token diff --git a/pigx-config/src/main/resources/config/pigx-auth-dev.yml b/pigx-config/src/main/resources/config/pigx-auth-dev.yml index e4187342e..4ade36d4d 100644 --- a/pigx-config/src/main/resources/config/pigx-auth-dev.yml +++ b/pigx-config/src/main/resources/config/pigx-auth-dev.yml @@ -4,5 +4,5 @@ spring: type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.jdbc.Driver username: root - password: 123456 - url: jdbc:mysql://mysql:3306/pigx?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false + password: root + url: jdbc:mysql://pigx-mysql:3306/pigx?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false diff --git a/pigx-config/src/main/resources/config/pigx-codegen-dev.yml b/pigx-config/src/main/resources/config/pigx-codegen-dev.yml index 923770e6a..6dceea95d 100644 --- a/pigx-config/src/main/resources/config/pigx-codegen-dev.yml +++ b/pigx-config/src/main/resources/config/pigx-codegen-dev.yml @@ -12,7 +12,7 @@ spring: type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.jdbc.Driver username: root - password: 123456 - url: jdbc:mysql://mysql:3306/pigx?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false + password: root + url: jdbc:mysql://pigx-mysql:3306/pigx?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false resources: static-locations: classpath:/static/,classpath:/views/ diff --git a/pigx-config/src/main/resources/config/pigx-daemon-dev.yml b/pigx-config/src/main/resources/config/pigx-daemon-dev.yml index 5bb30138b..22f27306f 100644 --- a/pigx-config/src/main/resources/config/pigx-daemon-dev.yml +++ b/pigx-config/src/main/resources/config/pigx-daemon-dev.yml @@ -13,12 +13,12 @@ spring: type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.jdbc.Driver username: root - password: 123456 - url: jdbc:mysql://mysql:3306/pigx?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false + password: root + url: jdbc:mysql://pigx-mysql:3306/pigx?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false elasticjob: # 分布式任务协调依赖zookeeper zookeeper: - server-lists: zookeeper:2181 + server-lists: pigx-zookeeper:2181 namespace: pigx-daemon # 普通任务 simples: diff --git a/pigx-config/src/main/resources/config/pigx-gateway-dev.yml b/pigx-config/src/main/resources/config/pigx-gateway-dev.yml index f8723322b..070b53c79 100644 --- a/pigx-config/src/main/resources/config/pigx-gateway-dev.yml +++ b/pigx-config/src/main/resources/config/pigx-gateway-dev.yml @@ -11,7 +11,7 @@ spring: - Path=/auth/** filters: # 验证码处理 - - ImageCodeGatewayFilter + - ValidateCodeGatewayFilter # 前端密码解密 - PasswordDecoderFilter #UPMS 模块 diff --git a/pigx-config/src/main/resources/config/pigx-upms-dev.yml b/pigx-config/src/main/resources/config/pigx-upms-dev.yml index a4fc228dc..1f5ea33bc 100644 --- a/pigx-config/src/main/resources/config/pigx-upms-dev.yml +++ b/pigx-config/src/main/resources/config/pigx-upms-dev.yml @@ -12,8 +12,8 @@ spring: type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.jdbc.Driver username: root - password: 123456 - url: jdbc:mysql://mysql:3306/pigx?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true + password: root + url: jdbc:mysql://pigx-mysql:3306/pigx?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true # swagger相关配置,覆盖全局配置 swagger: diff --git a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/PasswordDecoderFilter.java b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/PasswordDecoderFilter.java index 4c9394c37..b7de0e1e4 100644 --- a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/PasswordDecoderFilter.java +++ b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/PasswordDecoderFilter.java @@ -65,7 +65,7 @@ public class PasswordDecoderFilter extends AbstractGatewayFilterFactory { ServerHttpRequest request = exchange.getRequest(); // 不是登录请求，直接向下执行 - if (!StrUtil.containsAnyIgnoreCase(request.getURI().getPath(), ImageCodeGatewayFilter.OAUTH_TOKEN_URL)) { + if (!StrUtil.containsAnyIgnoreCase(request.getURI().getPath(), ValidateCodeGatewayFilter.OAUTH_TOKEN_URL)) { return chain.filter(exchange); } diff --git a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/ImageCodeGatewayFilter.java b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/ValidateCodeGatewayFilter.java similarity index 98% rename from pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/ImageCodeGatewayFilter.java rename to pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/ValidateCodeGatewayFilter.java index 7ebd861a8..a32118d78 100644 --- a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/ImageCodeGatewayFilter.java +++ b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/ValidateCodeGatewayFilter.java @@ -42,7 +42,7 @@ import java.io.IOException; */ @Slf4j @Component -public class ImageCodeGatewayFilter extends AbstractGatewayFilterFactory { +public class ValidateCodeGatewayFilter extends AbstractGatewayFilterFactory { public static final String DEFAULT_CODE_KEY = "DEFAULT_CODE_KEY"; public static final String OAUTH_TOKEN_URL = "/oauth/token"; private static final String BASIC_ = "Basic "; diff --git a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/handler/ImageCodeHandler.java b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/handler/ImageCodeHandler.java index f9c8c93a4..a144ee7ac 100644 --- a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/handler/ImageCodeHandler.java +++ b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/handler/ImageCodeHandler.java @@ -18,7 +18,7 @@ package com.pig4cloud.pigx.gateway.handler; import com.google.code.kaptcha.Producer; -import com.pig4cloud.pigx.gateway.filter.ImageCodeGatewayFilter; +import com.pig4cloud.pigx.gateway.filter.ValidateCodeGatewayFilter; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.core.io.ByteArrayResource; @@ -58,7 +58,7 @@ public class ImageCodeHandler implements HandlerFunction { //保存验证码信息 String randomStr = serverRequest.queryParam("randomStr").get(); - redisTemplate.opsForValue().set(ImageCodeGatewayFilter.DEFAULT_CODE_KEY + randomStr, text, 60, TimeUnit.SECONDS); + redisTemplate.opsForValue().set(ValidateCodeGatewayFilter.DEFAULT_CODE_KEY + randomStr, text, 60, TimeUnit.SECONDS); // 转换流信息写出 FastByteArrayOutputStream os = new FastByteArrayOutputStream(); diff --git a/pigx-gateway/src/main/resources/bootstrap.yml b/pigx-gateway/src/main/resources/bootstrap.yml index aeb0ffd87..5916dfdb8 100644 --- a/pigx-gateway/src/main/resources/bootstrap.yml +++ b/pigx-gateway/src/main/resources/bootstrap.yml @@ -22,6 +22,6 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@localhost:1025/eureka/ + defaultZone: http://pig:pig@pigx-eureka:1025/eureka/ diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml b/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml index 1dbe02882..ba90e1d06 100644 --- a/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml +++ b/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml @@ -23,4 +23,4 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@localhost:1025/eureka/ + defaultZone: http://pig:pig@pigx-eureka:1025/eureka/ diff --git a/pigx-visual/pigx-codegen/src/main/resources/bootstrap.yml b/pigx-visual/pigx-codegen/src/main/resources/bootstrap.yml index 0277820e6..5d94b0eeb 100644 --- a/pigx-visual/pigx-codegen/src/main/resources/bootstrap.yml +++ b/pigx-visual/pigx-codegen/src/main/resources/bootstrap.yml @@ -20,7 +20,7 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@localhost:1025/eureka/ + defaultZone: http://pig:pig@pigx-eureka:1025/eureka/ logging: level: root: info diff --git a/pigx-visual/pigx-daemon/src/main/resources/bootstrap.yml b/pigx-visual/pigx-daemon/src/main/resources/bootstrap.yml index da9accb63..88c5cbaf0 100644 --- a/pigx-visual/pigx-daemon/src/main/resources/bootstrap.yml +++ b/pigx-visual/pigx-daemon/src/main/resources/bootstrap.yml @@ -20,4 +20,4 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@localhost:1025/eureka/ + defaultZone: http://pig:pig@pigx-eureka:1025/eureka/ diff --git a/pigx-visual/pigx-monitor/src/main/resources/bootstrap.yml b/pigx-visual/pigx-monitor/src/main/resources/bootstrap.yml index 1e29612c9..fc2891602 100644 --- a/pigx-visual/pigx-monitor/src/main/resources/bootstrap.yml +++ b/pigx-visual/pigx-monitor/src/main/resources/bootstrap.yml @@ -20,4 +20,4 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@localhost:1025/eureka/ + defaultZone: http://pig:pig@pigx-eureka:1025/eureka/ diff --git a/pigx-visual/pigx-tx-manager/src/main/resources/bootstrap.yml b/pigx-visual/pigx-tx-manager/src/main/resources/bootstrap.yml index 50f914d85..9d47a0818 100644 --- a/pigx-visual/pigx-tx-manager/src/main/resources/bootstrap.yml +++ b/pigx-visual/pigx-tx-manager/src/main/resources/bootstrap.yml @@ -20,5 +20,5 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@localhost:1025/eureka/ + defaultZone: http://pig:pig@pigx-eureka:1025/eureka/ diff --git a/pom.xml b/pom.xml index 96a4e05c6..7be3c10aa 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ https://www.pig4cloud.com - 1.6.4 + 1.7.0 2.0.6.RELEASE Finchley.SR2 Cairo-SR3