diff --git a/blade-auth/src/main/resources/application-dev.yml b/blade-auth/src/main/resources/application-dev.yml new file mode 100644 index 0000000..feb2ba4 --- /dev/null +++ b/blade-auth/src/main/resources/application-dev.yml @@ -0,0 +1,6 @@ +# 本机多网卡时 Nacos 易误选 169.254.*(链路本地),导致网关 Host is down +spring: + cloud: + nacos: + discovery: + ip: ${NACOS_DISCOVERY_IP:127.0.0.1} diff --git a/blade-gateway/src/main/resources/application-dev.yml b/blade-gateway/src/main/resources/application-dev.yml index b8eaf54..3d12a7a 100644 --- a/blade-gateway/src/main/resources/application-dev.yml +++ b/blade-gateway/src/main/resources/application-dev.yml @@ -5,7 +5,8 @@ blade: enabled: true #灰度版本 #version: 3.0.0 - #负载均衡优先调用的ip段 + #负载均衡优先调用的ip段(含本机局域网段,避免只剩 169.254.* 时误路由) prior-ip-pattern: - - 192.168.0.* + - 192.168.*.* + - 172.16.*.* - 127.0.0.1 diff --git a/blade-service/blade-system/src/main/resources/application-dev.yml b/blade-service/blade-system/src/main/resources/application-dev.yml new file mode 100644 index 0000000..feb2ba4 --- /dev/null +++ b/blade-service/blade-system/src/main/resources/application-dev.yml @@ -0,0 +1,6 @@ +# 本机多网卡时 Nacos 易误选 169.254.*(链路本地),导致网关 Host is down +spring: + cloud: + nacos: + discovery: + ip: ${NACOS_DISCOVERY_IP:127.0.0.1} diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ProjectApplyServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ProjectApplyServiceImpl.java index c1e759d..0d623fb 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ProjectApplyServiceImpl.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ProjectApplyServiceImpl.java @@ -257,14 +257,12 @@ public class ProjectApplyServiceImpl extends BaseServiceImpl beforeData = buildProjectChangeSnapshot(oldRecord); prepare(projectApply); copyChangeFields(oldRecord, projectApply); validateSubmit(oldRecord); validateChangeLength(oldRecord); - Map afterData = buildProjectChangeSnapshot(oldRecord); - appendProjectChangeRecord(oldRecord, CHANGE_TYPE_PROJECT, oldRecord.getChangeReason(), "saved", "已保存", beforeData, afterData); return updateById(oldRecord); } diff --git a/blade-service/blade-transport/src/main/resources/application-dev.yml b/blade-service/blade-transport/src/main/resources/application-dev.yml index ebffbff..3c8c9a4 100644 --- a/blade-service/blade-transport/src/main/resources/application-dev.yml +++ b/blade-service/blade-transport/src/main/resources/application-dev.yml @@ -8,6 +8,11 @@ spring: url: ${blade.datasource.dev.url} username: ${blade.datasource.dev.username} password: ${blade.datasource.dev.password} + cloud: + nacos: + discovery: + # 本机多网卡时避免注册 169.254.* 导致网关 Host is down + ip: ${NACOS_DISCOVERY_IP:127.0.0.1} # LBS 车辆实时定位(Authorization 与 OA 人员接口一致) thirdParty: diff --git a/doc/nacos/blade-dev.yaml b/doc/nacos/blade-dev.yaml index 744c59f..4c8551e 100644 --- a/doc/nacos/blade-dev.yaml +++ b/doc/nacos/blade-dev.yaml @@ -38,9 +38,10 @@ blade: loadbalancer: #开启配置 enabled: true - #负载均衡优先调用的ip段 + #负载均衡优先调用的ip段(含本机局域网段,避免只剩 169.254.* 时误路由) prior-ip-pattern: - - 192.168.0.* + - 192.168.*.* + - 172.16.*.* - 127.0.0.1 #通用开发生产环境数据库地址(特殊情况可在对应的子工程里配置覆盖) datasource: diff --git a/doc/nacos/blade.yaml b/doc/nacos/blade.yaml index 3265744..d73eb7d 100644 --- a/doc/nacos/blade.yaml +++ b/doc/nacos/blade.yaml @@ -22,6 +22,8 @@ spring: discovery: # 禁用云命名空间解析,防止和云平台环境变量冲突 isUseCloudNamespaceParsing: false + # 本机多网卡开发时建议固定 127.0.0.1,可用环境变量 NACOS_DISCOVERY_IP 覆盖 + ip: ${NACOS_DISCOVERY_IP:} config: # 禁用云命名空间解析,防止和云平台环境变量冲突 isUseCloudNamespaceParsing: false