🐛 修复本地无法运行的问题
This commit is contained in:
@@ -0,0 +1,6 @@
|
|||||||
|
# 本机多网卡时 Nacos 易误选 169.254.*(链路本地),导致网关 Host is down
|
||||||
|
spring:
|
||||||
|
cloud:
|
||||||
|
nacos:
|
||||||
|
discovery:
|
||||||
|
ip: ${NACOS_DISCOVERY_IP:127.0.0.1}
|
||||||
@@ -5,7 +5,8 @@ blade:
|
|||||||
enabled: true
|
enabled: true
|
||||||
#灰度版本
|
#灰度版本
|
||||||
#version: 3.0.0
|
#version: 3.0.0
|
||||||
#负载均衡优先调用的ip段
|
#负载均衡优先调用的ip段(含本机局域网段,避免只剩 169.254.* 时误路由)
|
||||||
prior-ip-pattern:
|
prior-ip-pattern:
|
||||||
- 192.168.0.*
|
- 192.168.*.*
|
||||||
|
- 172.16.*.*
|
||||||
- 127.0.0.1
|
- 127.0.0.1
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
# 本机多网卡时 Nacos 易误选 169.254.*(链路本地),导致网关 Host is down
|
||||||
|
spring:
|
||||||
|
cloud:
|
||||||
|
nacos:
|
||||||
|
discovery:
|
||||||
|
ip: ${NACOS_DISCOVERY_IP:127.0.0.1}
|
||||||
+1
-3
@@ -257,14 +257,12 @@ public class ProjectApplyServiceImpl extends BaseServiceImpl<ProjectApplyMapper,
|
|||||||
@Override
|
@Override
|
||||||
@Transactional(rollbackFor = Exception.class)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public boolean saveChange(ProjectApplyVO projectApply) {
|
public boolean saveChange(ProjectApplyVO projectApply) {
|
||||||
|
// 变更草稿仅更新业务字段,不生成变更记录;变更记录在 submitChange 时落库
|
||||||
ProjectApply oldRecord = loadChangeable(projectApply.getId());
|
ProjectApply oldRecord = loadChangeable(projectApply.getId());
|
||||||
Map<String, Object> beforeData = buildProjectChangeSnapshot(oldRecord);
|
|
||||||
prepare(projectApply);
|
prepare(projectApply);
|
||||||
copyChangeFields(oldRecord, projectApply);
|
copyChangeFields(oldRecord, projectApply);
|
||||||
validateSubmit(oldRecord);
|
validateSubmit(oldRecord);
|
||||||
validateChangeLength(oldRecord);
|
validateChangeLength(oldRecord);
|
||||||
Map<String, Object> afterData = buildProjectChangeSnapshot(oldRecord);
|
|
||||||
appendProjectChangeRecord(oldRecord, CHANGE_TYPE_PROJECT, oldRecord.getChangeReason(), "saved", "已保存", beforeData, afterData);
|
|
||||||
return updateById(oldRecord);
|
return updateById(oldRecord);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -8,6 +8,11 @@ spring:
|
|||||||
url: ${blade.datasource.dev.url}
|
url: ${blade.datasource.dev.url}
|
||||||
username: ${blade.datasource.dev.username}
|
username: ${blade.datasource.dev.username}
|
||||||
password: ${blade.datasource.dev.password}
|
password: ${blade.datasource.dev.password}
|
||||||
|
cloud:
|
||||||
|
nacos:
|
||||||
|
discovery:
|
||||||
|
# 本机多网卡时避免注册 169.254.* 导致网关 Host is down
|
||||||
|
ip: ${NACOS_DISCOVERY_IP:127.0.0.1}
|
||||||
|
|
||||||
# LBS 车辆实时定位(Authorization 与 OA 人员接口一致)
|
# LBS 车辆实时定位(Authorization 与 OA 人员接口一致)
|
||||||
thirdParty:
|
thirdParty:
|
||||||
|
|||||||
@@ -38,9 +38,10 @@ blade:
|
|||||||
loadbalancer:
|
loadbalancer:
|
||||||
#开启配置
|
#开启配置
|
||||||
enabled: true
|
enabled: true
|
||||||
#负载均衡优先调用的ip段
|
#负载均衡优先调用的ip段(含本机局域网段,避免只剩 169.254.* 时误路由)
|
||||||
prior-ip-pattern:
|
prior-ip-pattern:
|
||||||
- 192.168.0.*
|
- 192.168.*.*
|
||||||
|
- 172.16.*.*
|
||||||
- 127.0.0.1
|
- 127.0.0.1
|
||||||
#通用开发生产环境数据库地址(特殊情况可在对应的子工程里配置覆盖)
|
#通用开发生产环境数据库地址(特殊情况可在对应的子工程里配置覆盖)
|
||||||
datasource:
|
datasource:
|
||||||
|
|||||||
@@ -22,6 +22,8 @@ spring:
|
|||||||
discovery:
|
discovery:
|
||||||
# 禁用云命名空间解析,防止和云平台环境变量冲突
|
# 禁用云命名空间解析,防止和云平台环境变量冲突
|
||||||
isUseCloudNamespaceParsing: false
|
isUseCloudNamespaceParsing: false
|
||||||
|
# 本机多网卡开发时建议固定 127.0.0.1,可用环境变量 NACOS_DISCOVERY_IP 覆盖
|
||||||
|
ip: ${NACOS_DISCOVERY_IP:}
|
||||||
config:
|
config:
|
||||||
# 禁用云命名空间解析,防止和云平台环境变量冲突
|
# 禁用云命名空间解析,防止和云平台环境变量冲突
|
||||||
isUseCloudNamespaceParsing: false
|
isUseCloudNamespaceParsing: false
|
||||||
|
|||||||
Reference in New Issue
Block a user