From c867fafddac54d8a1722874ab22023213c627f80 Mon Sep 17 00:00:00 2001
From: John <john@johng.cn>
Date: Fri, 29 Dec 2017 22:11:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=86=E6=9E=B6=E7=BB=93=E6=9E=84=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 g/g.go                   | 20 ++++++++++++++++++++
 g/net/gtcp/tcp.go        |  6 +++---
 g/net/gtcp/tcp_server.go |  2 +-
 g/net/gudp/udp.go        |  6 +++---
 g/net/gudp/udp_server.go |  2 +-
 geg/frame/mvc/main.go    |  6 +++---
 6 files changed, 31 insertions(+), 11 deletions(-)
 create mode 100644 g/g.go

diff --git a/g/g.go b/g/g.go
new file mode 100644
index 000000000..05dd30e6f
--- /dev/null
+++ b/g/g.go
@@ -0,0 +1,20 @@
+// Copyright 2017 gf Author(https://gitee.com/johng/gf). All Rights Reserved.
+//
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file,
+// You can obtain one at https://gitee.com/johng/gf.
+//
+package g
+
+import "gitee.com/johng/gf/g/net/ghttp"
+
+const HTTP = 1
+// 核心对象：Server
+// 框架支持多服务器对象，通过传入不同的name进行区分
+func HttpServer(names...string) *ghttp.Server {
+    name := "default"
+    if len(names) > 0 {
+        name = names[0]
+    }
+    return ghttp.GetServer(name)
+}
diff --git a/g/net/gtcp/tcp.go b/g/net/gtcp/tcp.go
index f1a322140..9ad2e3b62 100644
--- a/g/net/gtcp/tcp.go
+++ b/g/net/gtcp/tcp.go
@@ -12,14 +12,14 @@ import (
 )
 
 // tcp server结构体
-type gTcpServer struct {
+type Server struct {
     address   string
     listener *net.TCPListener
     handler   func (net.Conn)
 }
 
 // 创建一个tcp server对象
-func NewServer (address string, handler func (net.Conn)) *gTcpServer {
+func NewServer(address string, handler func (net.Conn)) *Server {
     tcpaddr, err := net.ResolveTCPAddr("tcp4", address)
     if err != nil {
         glog.Fatalln(err)
@@ -30,6 +30,6 @@ func NewServer (address string, handler func (net.Conn)) *gTcpServer {
         glog.Fatalln(err)
         return nil
     }
-    return &gTcpServer{ address, listen, handler}
+    return &Server{ address, listen, handler}
 }
 
diff --git a/g/net/gtcp/tcp_server.go b/g/net/gtcp/tcp_server.go
index 209a40500..3e1f9dc97 100644
--- a/g/net/gtcp/tcp_server.go
+++ b/g/net/gtcp/tcp_server.go
@@ -11,7 +11,7 @@ import (
 )
 
 // 执行监听
-func (s *gTcpServer) Run() {
+func (s *Server) Run() {
     if s == nil || s.listener == nil {
         glog.Println("start running failed: socket address bind failed")
         return
diff --git a/g/net/gudp/udp.go b/g/net/gudp/udp.go
index 4be08d6dd..b3c0ea3a1 100644
--- a/g/net/gudp/udp.go
+++ b/g/net/gudp/udp.go
@@ -12,14 +12,14 @@ import (
 )
 
 // tcp server结构体
-type gUdpServer struct {
+type Server struct {
     address   string
     listener *net.UDPConn
     handler   func (*net.UDPConn)
 }
 
 // 创建一个tcp server对象
-func NewServer (address string, handler func (*net.UDPConn)) *gUdpServer {
+func NewServer (address string, handler func (*net.UDPConn)) *Server {
     tcpaddr, err := net.ResolveUDPAddr("udp4", address)
     if err != nil {
         glog.Println(err)
@@ -30,6 +30,6 @@ func NewServer (address string, handler func (*net.UDPConn)) *gUdpServer {
         glog.Println(err)
         return nil
     }
-    return &gUdpServer{ address, listen, handler}
+    return &Server{ address, listen, handler}
 }
 
diff --git a/g/net/gudp/udp_server.go b/g/net/gudp/udp_server.go
index 2deb06e9b..18d53ffc2 100644
--- a/g/net/gudp/udp_server.go
+++ b/g/net/gudp/udp_server.go
@@ -9,7 +9,7 @@ package gudp
 import "gitee.com/johng/gf/g/os/glog"
 
 // 执行监听
-func (s *gUdpServer) Run() {
+func (s *Server) Run() {
     if s == nil || s.listener == nil {
         glog.Println("start running failed: socket address bind failed")
         return
diff --git a/geg/frame/mvc/main.go b/geg/frame/mvc/main.go
index a2696e4db..e97810368 100644
--- a/geg/frame/mvc/main.go
+++ b/geg/frame/mvc/main.go
@@ -1,11 +1,11 @@
 package main
 
 import (
-    "gitee.com/johng/gf/g/frame/ginstance"
+    "gitee.com/johng/gf/g"
     _ "gitee.com/johng/gf/geg/frame/mvc/controller/user"
 )
 
 func main() {
-    ginstance.Server().SetPort(8199)
-    ginstance.Server().Run()
+    g.HttpServer().SetPort(8199)
+    g.HttpServer().Run()
 }