From afe89beee68f026b532c9d3132f9539f826e198b Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期一, 22 七月 2019 14:21:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 controllers/syssetcont.go |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/controllers/syssetcont.go b/controllers/syssetcont.go
index fb4aa71..ef1888c 100644
--- a/controllers/syssetcont.go
+++ b/controllers/syssetcont.go
@@ -4,6 +4,7 @@
 	"basic.com/dbapi.git"
 	"github.com/gin-gonic/gin"
 	"webserver/extend/code"
+	"webserver/extend/config"
 	"webserver/extend/util"
 )
 
@@ -147,6 +148,11 @@
 	}else {
 		resData["server_id"] = sysconf.GetServerId()
 		resData["server_name"] = sysconf.GetServerName()
+		ipv4, mask, _ := util.GetLocalIP(config.Server.NetworkAdapter)
+		gateway, _ := util.GetDefaultRoute(config.Server.NetworkAdapter)
+		resData["ip"] = ipv4
+		resData["subMask"] = mask
+		resData["gateway"] = gateway
 		// 瀛樺湪
 		util.ResponseFormat(c, code.Success, resData)
 	}

--
Gitblit v1.8.0