From 9e6ca907bbf284793c353df4cd9f2d4fca350cc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Thu, 26 Jul 2018 19:18:13 +0800 Subject: [PATCH] =?UTF-8?q?:recycle:=20=E9=87=8D=E6=9E=84=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pigx-auth/src/main/resources/bootstrap.yml | 2 +- .../core/exception/ValidateCodeException.java | 3 ++ pigx-config/src/main/resources/bootstrap.yml | 2 +- .../main/resources/config/application-dev.yml | 2 +- .../main/resources/config/pigx-upms-dev.yml | 6 +-- pigx-eureka/src/main/resources/bootstrap.yml | 10 +--- pigx-gateway/pom.xml | 6 +-- .../gateway/exception/CheckedException.java | 47 ------------------- .../exception/ValidateCodeException.java | 25 ---------- .../filter/ImageCodeGatewayFilter.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 +- 14 files changed, 20 insertions(+), 95 deletions(-) delete mode 100644 pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/exception/CheckedException.java delete mode 100644 pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/exception/ValidateCodeException.java 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-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/exception/ValidateCodeException.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/exception/ValidateCodeException.java index db5bb10da..ea5767f43 100644 --- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/exception/ValidateCodeException.java +++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/exception/ValidateCodeException.java @@ -26,6 +26,9 @@ package com.pig4cloud.pigx.common.core.exception; public class ValidateCodeException extends Exception { private static final long serialVersionUID = -7285211528095468156L; + public ValidateCodeException() { + } + public ValidateCodeException(String msg) { super(msg); } 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 5e8f77d89..190aa9c23 100644 --- a/pigx-config/src/main/resources/config/application-dev.yml +++ b/pigx-config/src/main/resources/config/application-dev.yml @@ -2,7 +2,7 @@ spring: redis: password: - host: localhost + host: pigx-redis # 暴露监控端点 management: endpoints: 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 1ff1f4723..59cbba439 100644 --- a/pigx-config/src/main/resources/config/pigx-upms-dev.yml +++ b/pigx-config/src/main/resources/config/pigx-upms-dev.yml @@ -2,11 +2,11 @@ security: oauth2: client: - client-id: pig - client-secret: pig + client-id: pigx + client-secret: pigx scope: server resource: - token-info-uri: http://localhost:9999/auth/oauth/check_token + token-info-uri: http://pigx-gateway:9999/auth/oauth/check_token # 数据源 spring: diff --git a/pigx-eureka/src/main/resources/bootstrap.yml b/pigx-eureka/src/main/resources/bootstrap.yml index 4c30a62af..e933fbe80 100644 --- a/pigx-eureka/src/main/resources/bootstrap.yml +++ b/pigx-eureka/src/main/resources/bootstrap.yml @@ -8,21 +8,15 @@ spring: password: pig application: name: pigx-eureka - boot: - admin: - client: - url: http://localhost:5001 - instance: - name: PIGX-EUREKA # docker-compose部署时候 hostname 换成pigx-eureka # 类似的 redis 使用pigx-redis ,gateway 换成 pigx-gateway eureka: instance: - hostname: localhost + hostname: pigx-eureka prefer-ip-address: true client: - register-with-eureka: false + register-with-eureka: true fetch-registry: false service-url: defaultZone: http://pig:pig@${eureka.instance.hostname}:${server.port}/eureka/ diff --git a/pigx-gateway/pom.xml b/pigx-gateway/pom.xml index 437e7e34d..bec78b588 100644 --- a/pigx-gateway/pom.xml +++ b/pigx-gateway/pom.xml @@ -56,9 +56,9 @@ - cn.hutool - hutool-all - ${hutool.version} + com.pig4cloud + pigx-common-core + ${pigx.version} diff --git a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/exception/CheckedException.java b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/exception/CheckedException.java deleted file mode 100644 index 214174dc2..000000000 --- a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/exception/CheckedException.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ - -package com.pig4cloud.pigx.gateway.exception; - -/** - * @author lengleng - * @date 2018年07月22日 - * 异常包装类 - */ -public class CheckedException extends Exception { - - private static final long serialVersionUID = 1L; - - public CheckedException() { - } - - public CheckedException(String message) { - super(message); - } - - public CheckedException(Throwable cause) { - super(cause); - } - - public CheckedException(String message, Throwable cause) { - super(message, cause); - } - - public CheckedException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) { - super(message, cause, enableSuppression, writableStackTrace); - } -} diff --git a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/exception/ValidateCodeException.java b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/exception/ValidateCodeException.java deleted file mode 100644 index a86375ac3..000000000 --- a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/exception/ValidateCodeException.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ - -package com.pig4cloud.pigx.gateway.exception; - -/** - * @author lengleng - */ -public class ValidateCodeException extends Exception { - -} 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/ImageCodeGatewayFilter.java index 33f798076..ee7bcefe5 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/ImageCodeGatewayFilter.java @@ -20,9 +20,9 @@ package com.pig4cloud.pigx.gateway.filter; import cn.hutool.core.codec.Base64; import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.util.StrUtil; +import com.pig4cloud.pigx.common.core.exception.CheckedException; +import com.pig4cloud.pigx.common.core.exception.ValidateCodeException; import com.pig4cloud.pigx.gateway.config.FilterIgnorePropertiesConfig; -import com.pig4cloud.pigx.gateway.exception.CheckedException; -import com.pig4cloud.pigx.gateway.exception.ValidateCodeException; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cloud.gateway.filter.GatewayFilter; 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-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/