From 42c0797b3b381700f9a44e51ea421f0664bc21bd Mon Sep 17 00:00:00 2001 From: liubozhi Date: Mon, 7 Apr 2025 21:32:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=A0=A1=E9=AA=8C=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/tmerclub/cloud/auth/dto/LoginCodeDTO.java | 2 +- tmerclub-auth/src/main/resources/bootstrap.yml | 14 ++++++++------ .../common/dubbo/DevProximityLoadBalance.java | 2 +- tmerclub-group/src/main/resources/bootstrap.yml | 1 + 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/tmerclub-auth/src/main/java/com/tmerclub/cloud/auth/dto/LoginCodeDTO.java b/tmerclub-auth/src/main/java/com/tmerclub/cloud/auth/dto/LoginCodeDTO.java index d8bc119..1718089 100644 --- a/tmerclub-auth/src/main/java/com/tmerclub/cloud/auth/dto/LoginCodeDTO.java +++ b/tmerclub-auth/src/main/java/com/tmerclub/cloud/auth/dto/LoginCodeDTO.java @@ -25,7 +25,7 @@ public class LoginCodeDTO implements Serializable { private String mobile; @Schema(description = "验证码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "验证码不能为空") + //TODO @NotBlank(message = "验证码不能为空") private String validCode; /** diff --git a/tmerclub-auth/src/main/resources/bootstrap.yml b/tmerclub-auth/src/main/resources/bootstrap.yml index 6a091b1..24301c1 100644 --- a/tmerclub-auth/src/main/resources/bootstrap.yml +++ b/tmerclub-auth/src/main/resources/bootstrap.yml @@ -10,7 +10,7 @@ spring: username: ${NACOS_USERNAME:nacos} password: ${NACOS_PASSWORD:BYzL!Z3C} namespace: ${NACOS_NAMESPACE:} - ip: ${HOSTIP:} + # ip: ${HOSTIP:} config: server-addr: ${spring.cloud.nacos.discovery.server-addr} file-extension: yml @@ -27,8 +27,10 @@ logging: dubbo: protocol: port: ${TMERCLUB_DUBBO_PORT:11101} - host: ${spring.cloud.nacos.discovery.ip} - registry: - address: nacos://${spring.cloud.nacos.discovery.server-addr} - parameters: - namespace: ${spring.cloud.nacos.discovery.namespace} + # host: ${spring.cloud.nacos.discovery.ip} + consumer: + loadbalance: dev + # registry: + # address: nacos://${spring.cloud.nacos.discovery.server-addr} + # parameters: + # namespace: ${spring.cloud.nacos.discovery.namespace} diff --git a/tmerclub-common/tmerclub-common-core/src/main/java/com/tmerclub/cloud/common/dubbo/DevProximityLoadBalance.java b/tmerclub-common/tmerclub-common-core/src/main/java/com/tmerclub/cloud/common/dubbo/DevProximityLoadBalance.java index 48480ef..0777459 100644 --- a/tmerclub-common/tmerclub-common-core/src/main/java/com/tmerclub/cloud/common/dubbo/DevProximityLoadBalance.java +++ b/tmerclub-common/tmerclub-common-core/src/main/java/com/tmerclub/cloud/common/dubbo/DevProximityLoadBalance.java @@ -18,7 +18,7 @@ public class DevProximityLoadBalance extends RandomLoadBalance { private final String LOCALHOST; - private static final String LOCAL_IP = "192.168.1."; + private static final String LOCAL_IP = "192.168.0."; public DevProximityLoadBalance() throws UnknownHostException { InetAddress localHost = InetAddress.getLocalHost(); diff --git a/tmerclub-group/src/main/resources/bootstrap.yml b/tmerclub-group/src/main/resources/bootstrap.yml index 475609f..7fc3f41 100644 --- a/tmerclub-group/src/main/resources/bootstrap.yml +++ b/tmerclub-group/src/main/resources/bootstrap.yml @@ -10,6 +10,7 @@ spring: username: ${NACOS_USERNAME:nacos} password: ${NACOS_PASSWORD:BYzL!Z3C} namespace: ${NACOS_NAMESPACE:} + ip: ${HOSTIP:} config: server-addr: ${spring.cloud.nacos.discovery.server-addr} file-extension: yml