From 3b1be358f4d8709d53901d9e16d4d1552b2d0b4f Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期六, 17 七月 2021 23:07:46 +0800
Subject: [PATCH] 合并远程分支，并处理冲突
---
java110-core/src/main/java/com/java110/core/base/controller/BaseController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/java110-core/src/main/java/com/java110/core/base/controller/BaseController.java b/java110-core/src/main/java/com/java110/core/base/controller/BaseController.java
index 6fc20b8..255598d 100755
--- a/java110-core/src/main/java/com/java110/core/base/controller/BaseController.java
+++ b/java110-core/src/main/java/com/java110/core/base/controller/BaseController.java
@@ -129,7 +129,8 @@
headers.put("IP", getIpAddr(request));
- headers.put("hostName", request.getLocalName());
+ //headers.put("hostName", request.getLocalName()); 杩欓噷瀵艰嚧閮ㄥ垎涓绘満 閫熷害姣旇緝鎱�
+ headers.put("hostName", "localhost");
headers.put("port", request.getLocalPort() + "");
//澶勭悊app-id
--
Gitblit v1.8.0