From ad18a38241733c152d340cd2507c08ec66cf38d6 Mon Sep 17 00:00:00 2001
From: John <john@johng.cn>
Date: Mon, 2 Jul 2018 14:08:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=82=BB=E9=80=BCIDE=EF=BC=8C=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=9C=A8gconv=E4=B8=AD=E5=8A=A0=E8=BD=BD=E4=BA=86gin?=
 =?UTF-8?q?=E5=8C=85=E7=9A=84json=E5=8C=85=EF=BC=8C=E6=89=8B=E5=8A=A8?=
 =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E4=B8=BA=E6=A0=87=E5=87=86=E5=BA=93json?=
 =?UTF-8?q?=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TODO                  | 2 +-
 g/util/gconv/gconv.go | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/TODO b/TODO
index e37de6cb1..861470d72 100644
--- a/TODO
+++ b/TODO
@@ -11,7 +11,7 @@ Cookie&Session数据池化处理；
 ghttp.Client增加proxy特性；
 gtime增加对时区转换的封装，并简化失去转换时对类似+80500时区的支持；
 改进gf-orm的where查询功能，参考thinkphp 里的where查询语法；
-
+gproc进程间通信增加分组特性，不同的进程见可以通过进程ID以及分组名称发送/获取消息；
 
 
 DONE:
diff --git a/g/util/gconv/gconv.go b/g/util/gconv/gconv.go
index 0b2bf8233..45bc1fb30 100644
--- a/g/util/gconv/gconv.go
+++ b/g/util/gconv/gconv.go
@@ -12,10 +12,10 @@ import (
     "fmt"
     "time"
     "strconv"
-    "gitee.com/johng/gf/g/encoding/gbinary"
-    "gitee.com/johng/gf/g/util/gstr"
+    "encoding/json"
     "gitee.com/johng/gf/g/os/gtime"
-    "github.com/gin-gonic/gin/json"
+    "gitee.com/johng/gf/g/util/gstr"
+    "gitee.com/johng/gf/g/encoding/gbinary"
 )
 
 // 将变量i转换为字符串指定的类型t