rename mysql driver from 'mysql' to 'gf-mysql' to avoid multiple imports error

Merge pull request #115 from touzijiao/master

.travis.yml

@@ -10,25 +10,29 @@ branches:
   - develop
 
 env:
-  - GO111MODULE=on
+- GO111MODULE=on
 
 services:
-  - mysql
+- mysql
+- redis-server
+
+addons:
+  hosts:
+  - local
 
 before_install:
-  - pwd
+- pwd
 
 install:
-  - pwd
+- cat /etc/hosts
 
 script:
-  - cd g
-  - GOARCH=386 go test -v ./...
-  - GOARCH=amd64 go test -v ./... -race -coverprofile=coverage.txt -covermode=atomic
-
+- cd g
+- GOARCH=386 go test -v ./...
+- GOARCH=amd64 go test -v ./... -race -coverprofile=coverage.txt -covermode=atomic
 
 after_success:
-  - bash <(curl -s https://codecov.io/bash)
+- bash <(curl -s https://codecov.io/bash)
 
 
 

README.MD

@@ -4,17 +4,15 @@
 [![Go Doc](https://godoc.org/github.com/gogf/gf?status.svg)](https://godoc.org/github.com/gogf/gf) 
 [![Build Status](https://travis-ci.org/gogf/gf.svg?branch=master)](https://travis-ci.org/gogf/gf) 
 [![Go Report](https://goreportcard.com/badge/github.com/gogf/gf)](https://goreportcard.com/report/github.com/gogf/gf) 
-[![Documents](https://img.shields.io/badge/docs-100%25-green.svg)](https://goframe.org) 
+[![Code Coverage](https://codecov.io/gh/gogf/gf/branch/master/graph/badge.svg)](https://codecov.io/gh/gogf/gf/branch/master)
+[![Production Ready](https://img.shields.io/badge/production-ready-blue.svg)](https://github.com/gogf/gf)
 [![License](https://img.shields.io/github/license/gogf/gf.svg?style=flat)](https://github.com/gogf/gf)
-[![Language](https://img.shields.io/badge/language-go-blue.svg)](https://github.com/gogf/gf)
-[![Release](https://img.shields.io/github/release/gogf/gf.svg?style=flat)](https://github.com/gogf/gf/releases)
 
 <!--
-[![Code Coverage](https://codecov.io/gh/gogf/gf/branch/master/graph/badge.svg)](https://codecov.io/gh/gogf/gf)
-[![Code Helper](https://www.codetriage.com/gogf/gf/badges/users.svg)](https://www.codetriage.com/gogf/gf) 
---> 
+GoFrame is a modular, loose-coupled, production-ready and most-powerful application development framework of golang. Providing a series of core components and dozens of practical modules, such as: cache, logging, containers, timer, validator, database orm, etc. Supporting web server integrated with router, cookie, session, logger, configure, template, https, hooks, rewrites and many more features. 
+-->
 
-`GF(GoFrame)` is a modular, loose-coupled and production-ready application development framework written in Go. Providing a series of core components and dozens of practical modules, such as: cache, logging, array/queue/set/map, timer/timing tasks, file/memory lock, object pool, validator, database ORM, etc. Supporting web server with graceful server, hot updates, multi-domain, multi-port, multi-service, HTTP/HTTPS, dynamic/hook routing, rewrite rules and many more features. 
+`GF(GoFrame)` is a modular, loose-coupled, production-ready and most-powerful application development framework of golang. Providing a series of core components and dozens of practical modules, such as: memcache, configure, validator, logging, array/queue/set/map containers, timer/timing tasks, file/memory lock, object pool, database ORM, etc. Supporting web server integrated with router, cookie, session, logger, template, https, hooks, rewrites and many more features. 
 
 # Installation
 ```
@@ -32,7 +30,7 @@ golang version >= 1.9.2
 
 # Documentation
 
-* [GoDoc](https://godoc.org/github.com/gogf/gf)
+* [APIDoc](https://godoc.org/github.com/gogf/gf)
 * [中文文档](https://goframe.org)
 
 # Architecture
@@ -66,42 +64,39 @@ func main() {
 
 `GF` is licensed under the [MIT License](LICENSE), 100% free and open-source, forever.
 
-# Contributors(TOP 10)
 
-<a href="https://gitee.com/johng" target="_blank" title="John"><img src="https://gitee.com/uploads/27/1309327_johng.png?1530630243" width="60" align="left"></a>
+# Contributors
 
-<a href="https://gitee.com/wenzi1" target="_blank" title="蚊子"><img src="https://images.gitee.com/uploads/22/1923122_wenzi1.png" width="60" align="left"></a>
-
-<a href="https://gitee.com/zseeker" target="_blank" title="zseeker"><img src="https://goframe.org/images/contributors/zseeker.png" width="60" align="left"></a>
-
-<a href="https://gitee.com/ymrjqyy" target="_blank" title="一墨染尽青衣颜"><img src="https://images.gitee.com/uploads/27/876827_ymrjqyy.png" width="60" align="left"></a>
-
-<a href="https://github.com/chenyang351" target="_blank" title="chenyang351"><img src="https://avatars1.githubusercontent.com/u/30063958?s=60&v=4" width="60" align="left"></a>
-
-<a href="https://gitee.com/wxkj" target="_blank" title="wxkj"><img src="https://gitee.com/uploads/56/91356_wxkj.png" width="60" align="left"></a>
-
-<a href="https://github.com/wxkj001" target="_blank" title="3wxkj001
-"><img src="https://avatars0.githubusercontent.com/u/7794279?s=60&v=4" width="60" align="left"></a>
-
-<a href="https://gitee.com/zhangjinfu" target="_blank" title="张金富"><img src="https://images.gitee.com/uploads/63/356163_zhangjinfu.png" width="60" align="left"></a>
-
-<a href="https://gitee.com/garfieldkwong" target="_blank" title="GarfieldKwong"><img src="https://goframe.org/images/contributors/garfieldkwong.png" width="60" align="left"></a>
-
-<a href="https://gitee.com/qq1054000800" target="_blank" title="hello"><img src="https://gitee.com/uploads/9/2209_qq1054000800.jpg" width="60" align="left"></a>
-
-<br /><br /><br />
+- [aloncn](https://github.com/aloncn)
+- [chenyang351](https://github.com/chenyang351)
+- [garfieldkwong](https://gitee.com/garfieldkwong)
+- [hailaz](https://gitee.com/hailaz)
+- [johng](https://johng.cn)
+- [jroam](https://github.com/jroam)
+- [pibigstar](https://github.com/pibigstar)
+- [qq1054000800](https://gitee.com/qq1054000800)
+- [qq976739120](https://github.com/qq976739120)
+- [touzijiao](https://github.com/touzijiao)
+- [wenzi1](https://gitee.com/wenzi1)
+- [wxkj001](https://github.com/wxkj001)
+- [ymrjqyy](https://gitee.com/ymrjqyy)
+- [youyixiao](https://github.com/youyixiao)
+- [zhangjinfu](https://gitee.com/zhangjinfu)
+- [zhaopengme](https://github.com/zhaopengme)
+- [zseeker](https://gitee.com/zseeker)
 
 # Donators
 
-<a href="https://gitee.com/tiangenglan" target="_blank" title="zhuhuan12"><img src="https://images.gitee.com/uploads/99/1167099_tiangenglan.png" width="60" align="left"></a>
-
-<a href="https://gitee.com/zhuhuan12" target="_blank" title="zhuhuan12"><img src="https://gitee.com/uploads/39/751839_zhuhuan12.png" width="60" align="left"></a>
-
-<a href="https://gitee.com/zfan_codes" target="_blank" title="范钟"><img src="https://images.gitee.com/uploads/32/2044832_zfan_codes.png" width="60" align="left"></a>
-
-<a href="https://gitee.com/hailaz" target="_blank" title="HaiLaz"><img src="https://gitee.com/uploads/87/1273187_hailaz.png" width="60" align="left"></a>
-
-<a href="https://gitee.com/mg91" target="_blank" title="mg91"><img src="https://images.gitee.com/uploads/30/1410930_mg91.png" width="60" align="left"></a>
+- [flyke-xu](https://gitee.com/flyke-xu)
+- [hailaz](https://gitee.com/hailaz)
+- [ireadx](https://github.com/ireadx)
+- [mg91](https://gitee.com/mg91)
+- [pibigstar](https://github.com/pibigstar)
+- [tiangenglan](https://gitee.com/tiangenglan)
+- [wxkj](https://gitee.com/wxkj)
+- [zhuhuan12](https://gitee.com/zhuhuan12)
+- [zfan_codes](https://gitee.com/zfan_codes)
+
 
 
 

README_ZH.MD

@@ -4,15 +4,9 @@
 [![Go Doc](https://godoc.org/github.com/gogf/gf?status.svg)](https://godoc.org/github.com/gogf/gf) 
 [![Build Status](https://travis-ci.org/gogf/gf.svg?branch=master)](https://travis-ci.org/gogf/gf) 
 [![Go Report](https://goreportcard.com/badge/github.com/gogf/gf)](https://goreportcard.com/report/github.com/gogf/gf) 
-[![Documents](https://img.shields.io/badge/docs-100%25-green.svg)](https://goframe.org) 
+[![Code Coverage](https://codecov.io/gh/gogf/gf/branch/master/graph/badge.svg)](https://codecov.io/gh/gogf/gf/branch/master)
+[![Production Ready](https://img.shields.io/badge/production-ready-blue.svg)](https://github.com/gogf/gf)
 [![License](https://img.shields.io/github/license/gogf/gf.svg?style=flat)](https://github.com/gogf/gf)
-[![Language](https://img.shields.io/badge/language-go-blue.svg)](https://github.com/gogf/gf)
-[![Release](https://img.shields.io/github/release/gogf/gf.svg?style=flat)](https://github.com/gogf/gf/releases)
-
-<!--
-[![Code Coverage](https://codecov.io/gh/gogf/gf/branch/master/graph/badge.svg)](https://codecov.io/gh/gogf/gf)
-[![Code Helper](https://www.codetriage.com/gogf/gf/badges/users.svg)](https://www.codetriage.com/gogf/gf) 
---> 
 
 `GF(Go Frame)`是一款模块化、松耦合、生产级Go应用开发框架。提供了常用的核心开发组件，如：缓存、日志、文件、时间、队列、数组、集合、字符串、定时器、命令行、文件锁、内存锁、对象池、连接池、数据校验、数据编码、文件监控、定时任务、数据库ORM、TCP/UDP组件、进程管理/通信、
 并发安全容器等等。并提供了Web服务开发的系列核心组件，如：Router、Cookie、Session、服务注册、配置管理、模板引擎等等，支持热重启、热更新、多域名、多端口、多服务、HTTPS、Rewrite等特性。
@@ -36,7 +30,6 @@ go get -u github.com/gogf/gf
 ```
 require github.com/gogf/gf latest
 ```
-> 如果您是从旧版本`1.x`升级到`1.5.0`那么请参考：[1.x升级到1.5.0](https://goframe.org/upgradeto150)
 
 # 限制
 ```shell
@@ -90,30 +83,35 @@ func main() {
 <img src="https://goframe.org/images/donate.png" width="300"/>
 </a>
 
-# 贡献者(TOP 10)
+# 贡献者
 
-<a href="https://gitee.com/johng" target="_blank" title="John"><img src="https://gitee.com/uploads/27/1309327_johng.png" width="60" align="left"></a>
-<a href="https://gitee.com/wenzi1" target="_blank" title="蚊子"><img src="https://images.gitee.com/uploads/22/1923122_wenzi1.png" width="60" align="left"></a>
-<a href="https://gitee.com/zseeker" target="_blank" title="zseeker"><img src="https://goframe.org/images/contributors/zseeker.png" width="60" align="left"></a>
-<a href="https://gitee.com/ymrjqyy" target="_blank" title="一墨染尽青衣颜"><img src="https://images.gitee.com/uploads/27/876827_ymrjqyy.png" width="60" align="left"></a>
-<a href="https://github.com/chenyang351" target="_blank" title="chenyang351"><img src="https://avatars1.githubusercontent.com/u/30063958?s=60&v=4" width="60" align="left"></a>
-<a href="https://gitee.com/wxkj" target="_blank" title="wxkj"><img src="https://gitee.com/uploads/56/91356_wxkj.png" width="60" align="left"></a>
-<a href="https://github.com/wxkj001" target="_blank" title="3wxkj001
-"><img src="https://avatars0.githubusercontent.com/u/7794279?s=60&v=4" width="60" align="left"></a>
-<a href="https://gitee.com/zhangjinfu" target="_blank" title="张金富"><img src="https://images.gitee.com/uploads/63/356163_zhangjinfu.png" width="60" align="left"></a>
-<a href="https://gitee.com/garfieldkwong" target="_blank" title="GarfieldKwong"><img src="https://goframe.org/images/contributors/garfieldkwong.png" width="60" align="left"></a>
-<a href="https://gitee.com/qq1054000800" target="_blank" title="hello"><img src="https://gitee.com/uploads/9/2209_qq1054000800.jpg" width="60" align="left"></a>
-
-<br /><br /><br />
+- [aloncn](https://github.com/aloncn)
+- [chenyang351](https://github.com/chenyang351)
+- [garfieldkwong](https://gitee.com/garfieldkwong)
+- [hailaz](https://gitee.com/hailaz)
+- [johng](https://johng.cn)
+- [jroam](https://github.com/jroam)
+- [pibigstar](https://github.com/pibigstar)
+- [qq1054000800](https://gitee.com/qq1054000800)
+- [qq976739120](https://github.com/qq976739120)
+- [touzijiao](https://github.com/touzijiao)
+- [wenzi1](https://gitee.com/wenzi1)
+- [wxkj001](https://github.com/wxkj001)
+- [ymrjqyy](https://gitee.com/ymrjqyy)
+- [youyixiao](https://github.com/youyixiao)
+- [zhangjinfu](https://gitee.com/zhangjinfu)
+- [zhaopengme](https://github.com/zhaopengme)
+- [zseeker](https://gitee.com/zseeker)
 
 # 捐赠者
 
-<a href="https://gitee.com/tiangenglan" target="_blank" title="zhuhuan12"><img src="https://images.gitee.com/uploads/99/1167099_tiangenglan.png" width="60" align="left"></a>
+- [flyke-xu](https://gitee.com/flyke-xu)
+- [hailaz](https://gitee.com/hailaz)
+- [ireadx](https://github.com/ireadx)
+- [mg91](https://gitee.com/mg91)
+- [pibigstar](https://github.com/pibigstar)
+- [tiangenglan](https://gitee.com/tiangenglan)
+- [wxkj](https://gitee.com/wxkj)
+- [zhuhuan12](https://gitee.com/zhuhuan12)
+- [zfan_codes](https://gitee.com/zfan_codes)
 
-<a href="https://gitee.com/zhuhuan12" target="_blank" title="zhuhuan12"><img src="https://gitee.com/uploads/39/751839_zhuhuan12.png" width="60" align="left"></a>
-
-<a href="https://gitee.com/zfan_codes" target="_blank" title="范钟"><img src="https://images.gitee.com/uploads/32/2044832_zfan_codes.png" width="60" align="left"></a>
-
-<a href="https://gitee.com/hailaz" target="_blank" title="HaiLaz"><img src="https://gitee.com/uploads/87/1273187_hailaz.png" width="60" align="left"></a>
-
-<a href="https://gitee.com/mg91" target="_blank" title="mg91"><img src="https://images.gitee.com/uploads/30/1410930_mg91.png" width="60" align="left"></a>

RELEASE.MD

@@ -1,3 +1,51 @@
+# `v1.6.0` (2019-04-09)
+
+## 新功能/改进
+1. `gcron`定时任务模块增加运行日志记录功能：https://goframe.org/os/gcron/index
+1. `gredis`增加全局分组配置功能，并增加更多的配置选项`maxIdle/maxActive/idleTimeout/maxConnLifetime`：https://goframe.org/database/gredis/index
+1. `gcfg`模块增加更多的默认配置文件检索路径，并且增加全局分组配置特性，增加`Instance`单例方法：https://goframe.org/os/gcfg/index
+1. `gview`模块增加更多的默认配置文件检索路径，并且增加`Instance`单例方法：https://goframe.org/os/gview/index
+1. `ghttp`模块新功能及改进：
+    - 新增`CORS`HTTP(S)跨域请求特性: https://goframe.org/net/ghttp/cors
+    - 增加`TLSConfig`配置功能；
+    - 去掉路由注册方法的`error`返回值，当产生注册错误时直接终端打印错误/输出到日志文件；
+    - 增加在`HTTP Code 302`跳转时的`Set-Cookie`支持；
+    - 增加对`SESSION ID`的安全性检查；
+    - 增加对基于`HTTPS`的`WebSocket`支持（`WSS`）：https://goframe.org/net/ghttp/websocket/index
+    - `Request`对象增加`Error`方法，用于输出自定义错误信息到`WebServer`错误日志中；
+    - 其他一些改进；
+1. `gdb`模块新功能及改进：
+    - 新增`Instance`单例管理方法；
+    - 新增`Structs/Scan`链式操作方法，`gdb.DB/TX`新增`GetStructs/GetScan`方法，用于结果集`struct`/`slice`映射转换：https://goframe.org/database/gdb/chaining
+    - 新增`Safe`链式操作方法（默认非并发安全），用于链式安全控制：https://goframe.org/database/gdb/chaining
+    - `Where`链式操作方法改进：
+        - 方法支持任意的`string/map/slice/struct/*struct`类型；
+        - 逻辑调整，当链式操作中存在多个`Where`方法调用时，自动转换为`And`条件；
+        - 支持`slice`条件参数，常用在`SELECT IN`查询中，例如：`Where("uid IN(?)", g.Slice{1,2,3})`；
+        - 支持在`map`类型条件参数的`key`中传递条件，例如：`Where(g.Map{"uid>?", uid})`；
+1. `gconv`及`gvalid`模块改进并去掉对私有`struct`方法属性的转换/校验；
+1. `gconv.Map`转换方法新增对`json tag`: `-`, `omitempty`的支持: https://goframe.org/util/gconv/map
+1. `gstr`模块新增 `ReplaceI/ReplaceIByArray/ReplaceIByMap`大小写非敏感替换方法；
+1. `gutil`模块增加`IsEmpty`方法，用于判断给定变量是否为空（整型0, 布尔false, slice/map长度为0, 其他为nil的情况，判断为空），并增加快捷方法`g.IsEmpty`；
+1. `gutil`模块增加`Export`方法，用于导出返回格式化打印的变量内容字符串，并增加快捷方法`g.Export`；
+1. `gspath`增加缓存及非缓存检索检索方法`Search`/`SearchWithCache`；
+1. `gjson`模块增加默认的`UseNumber`功能支持；
+1. `gmap`增加`SetIfNotExistFunc/SetIfNotExistFuncLock`方法；
+1. 迁移`greuseport`模块到新的仓库：https://github.com/gogf/greuseport
+1. 大量的单元测试完善；
+
+## Bug Fix
+1. 修复`gqueue`模块的资源竞争问题；
+1. 修复`gconv.GTime`转换失败问题；
+1. 修复`gconv.String`在转换`int`参数时字节溢出问题；
+1. 修复`ghttp.Request`的`HTTP Basic Auth`校验问题；
+1. 修复`gxml`针对于非`UTF-8`编码内容转换的并发安全问题；
+1. 修复`gtime`部分`Format`（`G`&`j`）格式失效问题；
+1. 修复`gudp.Conn`对象的`RemoteAddr`获取客户端连接地址方法问题；
+1. 修复`gmap/gcache`模块的`GetOrSetFuncLock`方法，增加对回调方法返回值的`nil`判断，只有非nil返回值才会被保存；
+
+
+
 # `v1.5.8` (2019-02-28)
 
 ## 新特性

TODO.MD

@@ -1,23 +1,16 @@
 # ON THE WAY
 1. 增加图形验证码支持，至少支持数字和英文字母；
-1. 增加热编译工具，提高开发环境的开发/测试效率（媲美PHP开发效率）；
-1. 增加可选择性的orm tag特性，用以数据表记录与struct对象转换的键名属性映射；
-1. ghttp.Response增加输出内容后自动退出当前请求机制，不需要用户手动return，参考beego如何实现；
 1. Cookie&Session数据池化处理；
 1. ghttp.Client增加proxy特性；
 1. gtime增加对时区转换的封装，并简化失去转换时对类似+80500时区的支持；
 1. orm增加sqlite对Save方法的支持(去掉触发器语句);
 1. ghttp.Server增加Ip访问控制功能(DenyIps&AllowIps)；
-1. ghttp路由功能增加分组路由特性；
 1. ghttp增加返回数据压缩机制；
 1. gview中的template标签失效问题；
-1. gfile文件stat信息使用gfsnotify进行缓存更新改进；
 1. ghttp.Server增加proxy功能特性，本地proxy和远程proxy，本地即将路由规则映射；远程即反向代理；
 1. gjson对大json数据的解析效率问题；
 1. ghttp增加route name特性，并同时支持backend和template(提供内置函数)引用，可以通过RedirectRoute方法给定route name和路由参数跳转到指定的路由地址上；
-1. ghttp.Client自动Close机制；
 1. gvalid校验支持当第一个规则失败后便不再校验后续的规则，最好做成链式操作；
-1. 检查ghttp.Server超时问题；
 1. gvalid增加支持对[]rune的长度校验(一个中文占3个字节)；
 1. ghttp.Request增加对输入参数的自动HtmlEncode机制；
 1. 常量命名风格根据golint进行修改；
@@ -36,27 +29,22 @@
     - https://github.com/Masterminds/sprig
 1. gform参考 https://gohouse.github.io/gorose/dist/index.html 进行改进
 1. gtcp提供简便的包发送/接收方法(SendPkg/RecvPkg)以解决常见的TCP通信粘包问题，并完善文档（参考：https://www.cnblogs.com/kex1n/p/6502002.html）；
-1. gfile对于文件的读写强行使用了gfpool，在某些场景下不合适，需要考虑剥离开，并为开发者提供单独的指针池文件操作特性；
 1. 路由增加不区分大小写得匹配方式；
-1. str_ireplace: http://php.net/manual/en/function.str-ireplace.php
-1. strpos/stripos/strrpos/strripos: http://php.net/manual/en/function.stripos.php
 1. 改进WebServer获取POST参数处理逻辑，当提交非form数据时，例如json数据，针对某些方法可以直接解析；
 1. WebServer增加可选择的路由覆盖配置，默认情况下不覆盖；
-1. gkafka这个包比较重，未来从框架中剥离出来；
 1. grpool性能压测结果变慢的问题；
 1. 增加jumplist的数据结构容器；
 1. DelayQueue/PriorityQueue；
-1. gconv针对struct的转换增加json tag支持，gconv.Map默认也支持json tag, 完善开发文档；
-1. 增加SO_REUSEPORT的支持；
 1. 权限管理模块；
 1. 从ghttp中剥离SESSION功能构成单独的模块gsession；
 1. 改进gproc进程间通信处理逻辑，提高稳定性，以应对进程间大批量的数据发送/接收；
-1. gdb的Data方法支持struct参数传入；
-1. gfcache依旧使用gcache作为缓存控制对象，不要使用gmap；
-1. 增加对ghttp路由注册的{.struct}/{.method}单元测试；
-1. 更新跨域请求CORS相关功能文档；
-
-
+1. ghttp的热重启的本地进程端口监听，在不使用该特性时默认关闭掉；
+1. gtcp增加对TLS加密通信的支持；
+1. 添加Save/Replace/BatchSave/BatchReplace方法对sqlite数据库的支持；
+1. 添加sqlite数据库的单元测试用例；
+1. gredis增加cluster支持；
+1. gset.Add/Remove/Contains方法增加批量操作支持；
+1. gmlock增加手动清理机制：当内存锁不再使用时，由调用端决定是否清理内存锁；
 
 # DONE
 1.  gconv完善针对不同类型的判断，例如：尽量减少sprintf("%v", xxx)来执行string类型的转换；
@@ -115,4 +103,19 @@
 1. gform对于MySQL字段类型为datetime类型的时区问题分析；
 1. 改进证书打开失败时的WebServer错误提示，前置HOOK校验后关闭后续的HOOK逻辑执行；
 1. 目前WebServer的HOOK是按照优先级执行的，需要增加覆盖特性；
-
+1. 更新跨域请求CORS相关功能文档；
+1. ghttp.Response增加输出内容后自动退出当前请求机制，不需要用户手动return，参考beego如何实现；
+1. gcfg包目前允许添加重复的目录路径，需要在SetPath/AddPath时判断重复性，不能添加重复的路径；
+1. gdb执行数据写入时，如果参数为struct/[]struct，自动映射与表字段对应关系，不再使用gconv标签标识；
+1. gdb的Data方法支持struct参数传入；
+1. gfcache依旧使用gcache作为缓存控制对象，不要使用gmap；
+1. 增加对ghttp路由注册的{.struct}/{.method}单元测试；
+1. gconv针对struct的转换增加json tag支持，gconv.Map默认也支持json tag, 完善开发文档；
+1. 增加SO_REUSEPORT的支持；
+1. gkafka这个包比较重，未来从框架中剥离出来；
+1. str_ireplace: http://php.net/manual/en/function.str-ireplace.php
+1. strpos/stripos/strrpos/strripos: http://php.net/manual/en/function.stripos.php
+1. gfile对于文件的读写强行使用了gfpool，在某些场景下不合适，需要考虑剥离开，并为开发者提供单独的指针池文件操作特性；
+1. ghttp.Client自动Close机制；
+1. ghttp路由功能增加分组路由特性；
+1. 增加可选择性的orm tag特性，用以数据表记录与struct对象转换的键名属性映射；

g/container/garray/garray.go

@@ -4,8 +4,6 @@
 // If a copy of the MIT was not distributed with this file,
 // You can obtain one at https://github.com/gogf/gf.
 
-// Package garray provides kinds of concurrent-safe(alternative) arrays.
-//
-// 并发安全数组.
+// Package garray provides concurrent-safe/unsafe arrays.
 package garray
 

g/container/garray/garray_func.go

@@ -6,3 +6,15 @@
 
 package garray
 
+
+type apiSliceInterface interface {
+    Slice() []interface{}
+}
+
+type apiSliceInt interface {
+    Slice() []int
+}
+
+type apiSliceString interface {
+    Slice() []string
+}

g/container/garray/garray_normal_int.go

@@ -7,33 +7,30 @@
 package garray
 
 import (
-    "github.com/gogf/gf/g/internal/rwmutex"
+    "bytes"
+	"fmt"
+	"github.com/gogf/gf/g/internal/rwmutex"
     "github.com/gogf/gf/g/util/gconv"
     "github.com/gogf/gf/g/util/grand"
     "math"
     "sort"
-    "strings"
 )
 
 type IntArray struct {
-	mu    *rwmutex.RWMutex // 互斥锁
-	array []int            // 底层数组
+	mu    *rwmutex.RWMutex
+	array []int
 }
 
-// Create an empty array.
-// The param <unsafe> used to specify whether using array with un-concurrent-safety,
-// which is false in default, means concurrent-safe in default.
-//
-// 创建一个空的数组对象，参数unsafe用于指定是否用于非并发安全场景，默认为false，表示并发安全。
+// NewIntArray creates and returns an empty array.
+// The param <unsafe> used to specify whether using array in un-concurrent-safety,
+// which is false in default.
 func NewIntArray(unsafe...bool) *IntArray {
 	return NewIntArraySize(0, 0, unsafe...)
 }
 
-// Create an array with given size and cap.
+// NewIntArraySize create and returns an array with given size and cap.
 // The param <unsafe> used to specify whether using array with un-concurrent-safety,
-// which is false in default, means concurrent-safe in default.
-//
-// 创建一个指定大小的数组对象，参数unsafe用于指定是否用于非并发安全场景，默认为false，表示并发安全。
+// which is false in default.
 func NewIntArraySize(size int, cap int, unsafe...bool) *IntArray {
     return &IntArray{
         mu    : rwmutex.New(unsafe...),
@@ -41,11 +38,9 @@ func NewIntArraySize(size int, cap int, unsafe...bool) *IntArray {
     }
 }
 
-// Create an array with given slice <array>.
+// NewIntArrayFrom creates and returns an array with given slice <array>.
 // The param <unsafe> used to specify whether using array with un-concurrent-safety,
-// which is false in default, means concurrent-safe in default.
-//
-// 通过给定的slice变量创建数组对象，参数unsafe用于指定是否用于非并发安全场景，默认为false，表示并发安全。
+// which is false in default.
 func NewIntArrayFrom(array []int, unsafe...bool) *IntArray {
 	return &IntArray{
         mu    : rwmutex.New(unsafe...),
@@ -53,9 +48,20 @@ func NewIntArrayFrom(array []int, unsafe...bool) *IntArray {
     }
 }
 
-// Get value by index.
-//
-// 获取指定索引的数据项, 调用方注意判断数组边界。
+// NewIntArrayFromCopy creates and returns an array from a copy of given slice <array>.
+// The param <unsafe> used to specify whether using array with un-concurrent-safety,
+// which is false in default.
+func NewIntArrayFromCopy(array []int, unsafe...bool) *IntArray {
+    newArray := make([]int, len(array))
+    copy(newArray, array)
+    return &IntArray{
+        mu    : rwmutex.New(unsafe...),
+        array : newArray,
+    }
+}
+
+// Get returns the value of the specified index,
+// the caller should notice the boundary of the array.
 func (a *IntArray) Get(index int) int {
 	a.mu.RLock()
 	defer a.mu.RUnlock()
@@ -63,9 +69,7 @@ func (a *IntArray) Get(index int) int {
 	return value
 }
 
-// Set value by index.
-//
-// 设置指定索引的数据项, 调用方注意判断数组边界。
+// Set sets value to specified index.
 func (a *IntArray) Set(index int, value int) *IntArray {
 	a.mu.Lock()
 	defer a.mu.Unlock()
@@ -73,9 +77,7 @@ func (a *IntArray) Set(index int, value int) *IntArray {
 	return a
 }
 
-// Set the underlying slice array with the given <array> param.
-//
-// 设置底层数组变量.
+// SetArray sets the underlying slice array with the given <array>.
 func (a *IntArray) SetArray(array []int) *IntArray {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -83,9 +85,7 @@ func (a *IntArray) SetArray(array []int) *IntArray {
     return a
 }
 
-// Replace the array items by given <array> from the beginning of array.
-//
-// 使用指定数组替换到对应的索引元素值.
+// Replace replaces the array items by given <array> from the beginning of array.
 func (a *IntArray) Replace(array []int) *IntArray {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -99,9 +99,7 @@ func (a *IntArray) Replace(array []int) *IntArray {
     return a
 }
 
-// Calculate the sum of values in an array.
-//
-// 对数组中的元素项求和。
+// Sum returns the sum of values in an array.
 func (a *IntArray) Sum() (sum int) {
     a.mu.RLock()
     defer a.mu.RUnlock()
@@ -111,11 +109,9 @@ func (a *IntArray) Sum() (sum int) {
     return
 }
 
-// Sort the array in increasing order.
+// Sort sorts the array in increasing order.
 // The param <reverse> controls whether sort
 // in increasing order(default) or decreasing order
-//
-// 将数组排序(默认从低到高).
 func (a *IntArray) Sort(reverse...bool) *IntArray {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -132,9 +128,7 @@ func (a *IntArray) Sort(reverse...bool) *IntArray {
     return a
 }
 
-// Sort the array by custom function <less>.
-//
-// 使用自定义的排序函数将数组重新排序.
+// SortFunc sorts the array by custom function <less>.
 func (a *IntArray) SortFunc(less func(v1, v2 int) bool) *IntArray {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -144,9 +138,7 @@ func (a *IntArray) SortFunc(less func(v1, v2 int) bool) *IntArray {
     return a
 }
 
-// Insert the <value> to the front of <index>.
-//
-// 在当前索引位置前插入一个数据项, 调用方注意判断数组边界。
+// InsertBefore inserts the <value> to the front of <index>.
 func (a *IntArray) InsertBefore(index int, value int) *IntArray {
 	a.mu.Lock()
 	defer a.mu.Unlock()
@@ -156,9 +148,7 @@ func (a *IntArray) InsertBefore(index int, value int) *IntArray {
     return a
 }
 
-// Insert the <value> to the back of <index>.
-//
-// 在当前索引位置前插入一个数据项, 调用方注意判断数组边界。
+// InsertAfter inserts the <value> to the back of <index>.
 func (a *IntArray) InsertAfter(index int, value int) *IntArray {
 	a.mu.Lock()
 	defer a.mu.Unlock()
@@ -168,13 +158,11 @@ func (a *IntArray) InsertAfter(index int, value int) *IntArray {
     return a
 }
 
-// Remove an item by index.
-//
-// 删除指定索引的数据项, 调用方注意判断数组边界。
+// Remove removes an item by index.
 func (a *IntArray) Remove(index int) int {
 	a.mu.Lock()
 	defer a.mu.Unlock()
-	// 边界删除判断，以提高删除效率
+	// Determine array boundaries when deleting to improve deletion efficiency.
 	if index == 0 {
 		value  := a.array[0]
 		a.array = a.array[1 : ]
@@ -184,15 +172,15 @@ func (a *IntArray) Remove(index int) int {
 		a.array = a.array[: index]
 		return value
 	}
-	// 如果非边界删除，会涉及到数组创建，那么删除的效率差一些
+	// If it is a non-boundary delete,
+	// it will involve the creation of an array,
+	// then the deletion is less efficient.
 	value  := a.array[index]
 	a.array = append(a.array[ : index], a.array[index + 1 : ]...)
 	return value
 }
 
-// Push new items to the beginning of array.
-//
-// 将数据项添加到数组的最左端(索引为0)。
+// PushLeft pushes one or multiple items to the beginning of array.
 func (a *IntArray) PushLeft(value...int) *IntArray {
     a.mu.Lock()
     a.array = append(value, a.array...)
@@ -200,9 +188,8 @@ func (a *IntArray) PushLeft(value...int) *IntArray {
     return a
 }
 
-// Push new items to the end of array.
-//
-// 将数据项添加到数组的最右端(索引为length - 1), 等于: Append。
+// PushRight pushes one or multiple items to the end of array.
+// It equals to Append.
 func (a *IntArray) PushRight(value...int) *IntArray {
     a.mu.Lock()
     a.array = append(a.array, value...)
@@ -210,9 +197,7 @@ func (a *IntArray) PushRight(value...int) *IntArray {
     return a
 }
 
-// Pop an item from the beginning of array.
-//
-// 将最左端(索引为0)的数据项移出数组，并返回该数据项。
+// PopLeft pops and returns an item from the beginning of array.
 func (a *IntArray) PopLeft() int {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -221,9 +206,7 @@ func (a *IntArray) PopLeft() int {
     return value
 }
 
-// Pop an item from the end of array.
-//
-// 将最右端(索引为length - 1)的数据项移出数组，并返回该数据项。
+// PopRight pops and returns an item from the end of array.
 func (a *IntArray) PopRight() int {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -233,16 +216,28 @@ func (a *IntArray) PopRight() int {
     return value
 }
 
-// Pop an random item from array.
-//
-// 随机将一个数据项移出数组，并返回该数据项。
+// PopRand randomly pops and return an item out of array.
 func (a *IntArray) PopRand() int {
     return a.Remove(grand.Intn(len(a.array)))
 }
 
-// Pop <size> items from the beginning of array.
-//
-// 将最左端(首部)的size个数据项移出数组，并返回该数据项。
+// PopRands randomly pops and returns <size> items out of array.
+func (a *IntArray) PopRands(size int) []int {
+    a.mu.Lock()
+    defer a.mu.Unlock()
+    if size > len(a.array) {
+        size = len(a.array)
+    }
+    array := make([]int, size)
+    for i := 0; i < size; i++ {
+        index   := grand.Intn(len(a.array))
+        array[i] = a.array[index]
+        a.array  = append(a.array[ : index], a.array[index + 1 : ]...)
+    }
+    return array
+}
+
+// PopLefts pops and returns <size> items from the beginning of array.
 func (a *IntArray) PopLefts(size int) []int {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -255,9 +250,7 @@ func (a *IntArray) PopLefts(size int) []int {
     return value
 }
 
-// Pop <size> items from the end of array.
-//
-// 将最右端(尾部)的size个数据项移出数组，并返回该数据项
+// PopRights pops and returns <size> items from the end of array.
 func (a *IntArray) PopRights(size int) []int {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -270,11 +263,9 @@ func (a *IntArray) PopRights(size int) []int {
     return value
 }
 
-// Get items by range, returns array[start:end].
-// Be aware that, if in concurrent-safe usage, it returns a copy of slice;
+// Range picks and returns items by range, like array[start:end].
+// Notice, if in concurrent-safe usage, it returns a copy of slice;
 // else a pointer to the underlying data.
-//
-// 将最右端(尾部)的size个数据项移出数组，并返回该数据项
 func (a *IntArray) Range(start, end int) []int {
     a.mu.RLock()
     defer a.mu.RUnlock()
@@ -301,8 +292,6 @@ func (a *IntArray) Range(start, end int) []int {
 }
 
 // See PushRight.
-//
-// 追加数据项, 等于: PushRight。
 func (a *IntArray) Append(value...int) *IntArray {
 	a.mu.Lock()
 	a.array = append(a.array, value...)
@@ -310,9 +299,7 @@ func (a *IntArray) Append(value...int) *IntArray {
     return a
 }
 
-// Get the length of array.
-//
-// 数组长度。
+// Len returns the length of array.
 func (a *IntArray) Len() int {
 	a.mu.RLock()
 	length := len(a.array)
@@ -320,11 +307,9 @@ func (a *IntArray) Len() int {
 	return length
 }
 
-// Get the underlying data of array.
-// Be aware that, if in concurrent-safe usage, it returns a copy of slice;
+// Slice returns the underlying data of array.
+// Notice, if in concurrent-safe usage, it returns a copy of slice;
 // else a pointer to the underlying data.
-//
-// 返回原始数据数组.
 func (a *IntArray) Slice() []int {
 	array := ([]int)(nil)
 	if a.mu.IsSafe() {
@@ -338,9 +323,7 @@ func (a *IntArray) Slice() []int {
 	return array
 }
 
-// Return a new array, which is a copy of current array.
-//
-// 克隆当前数组，返回当前数组的一个拷贝。
+// Clone returns a new array, which is a copy of current array.
 func (a *IntArray) Clone() (newArray *IntArray) {
     a.mu.RLock()
     array := make([]int, len(a.array))
@@ -349,9 +332,7 @@ func (a *IntArray) Clone() (newArray *IntArray) {
     return NewIntArrayFrom(array, !a.mu.IsSafe())
 }
 
-// Clear array.
-//
-// 清空数据数组。
+// Clear deletes all items of current array.
 func (a *IntArray) Clear() *IntArray {
 	a.mu.Lock()
 	if len(a.array) > 0 {
@@ -361,17 +342,13 @@ func (a *IntArray) Clear() *IntArray {
     return a
 }
 
-// Check whether a value exists in the array.
-//
-// 查找指定数值是否存在。
+// Contains checks whether a value exists in the array.
 func (a *IntArray) Contains(value int) bool {
     return a.Search(value) != -1
 }
 
-
-// Search array by <value>, returns the index of <value>, returns -1 if not exists.
-//
-// 查找指定数值的索引位置，返回索引位置，如果查找不到则返回-1。
+// Search searches array by <value>, returns the index of <value>,
+// or returns -1 if not exists.
 func (a *IntArray) Search(value int) int {
 	if len(a.array) == 0 {
 		return -1
@@ -389,9 +366,7 @@ func (a *IntArray) Search(value int) int {
 	return result
 }
 
-// Unique the array, clear repeated values.
-//
-// 清理数组中重复的元素项。
+// Unique uniques the array, clear repeated items.
 func (a *IntArray) Unique() *IntArray {
 	a.mu.Lock()
 	for i := 0; i < len(a.array) - 1; i++ {
@@ -405,44 +380,42 @@ func (a *IntArray) Unique() *IntArray {
 	return a
 }
 
-// Lock writing by callback function f.
-//
-// 使用自定义方法执行加锁修改操作。
+// LockFunc locks writing by callback function <f>.
 func (a *IntArray) LockFunc(f func(array []int)) *IntArray {
-	a.mu.Lock(true)
-	defer a.mu.Unlock(true)
+	a.mu.Lock()
+	defer a.mu.Unlock()
 	f(a.array)
     return a
 }
 
-// Lock reading by callback function f.
-//
-// 使用自定义方法执行加锁读取操作。
+// RLockFunc locks reading by callback function <f>.
 func (a *IntArray) RLockFunc(f func(array []int)) *IntArray {
-	a.mu.RLock(true)
-	defer a.mu.RUnlock(true)
+	a.mu.RLock()
+	defer a.mu.RUnlock()
 	f(a.array)
     return a
 }
 
-// Merge two arrays.
-//
-// 合并两个数组.
-func (a *IntArray) Merge(array *IntArray) *IntArray {
-    a.mu.Lock()
-    defer a.mu.Unlock()
-    if a != array {
-        array.mu.RLock()
-        defer array.mu.RUnlock()
+// Merge merges <array> into current array.
+// The parameter <array> can be any garray or slice type.
+// The difference between Merge and Append is Append supports only specified slice type,
+// but Merge supports more parameter types.
+func (a *IntArray) Merge(array interface{}) *IntArray {
+    switch v := array.(type) {
+        case *Array:             a.Append(gconv.Ints(v.Slice())...)
+        case *IntArray:          a.Append(gconv.Ints(v.Slice())...)
+        case *StringArray:       a.Append(gconv.Ints(v.Slice())...)
+        case *SortedArray:       a.Append(gconv.Ints(v.Slice())...)
+        case *SortedIntArray:    a.Append(gconv.Ints(v.Slice())...)
+        case *SortedStringArray: a.Append(gconv.Ints(v.Slice())...)
+        default:
+            a.Append(gconv.Ints(array)...)
     }
-    a.array = append(a.array, array.array...)
     return a
 }
 
-// Fills an array with num entries of the value of the value parameter,
-// keys starting at the startIndex parameter.
-//
-// 用value参数的值将数组填充num个条目，位置由startIndex参数指定的开始。
+// Fill fills an array with num entries of the value <value>,
+// keys starting at the <startIndex> parameter.
 func (a *IntArray) Fill(startIndex int, num int, value int) *IntArray {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -459,10 +432,9 @@ func (a *IntArray) Fill(startIndex int, num int, value int) *IntArray {
     return a
 }
 
-// Chunks an array into arrays with size elements.
+// Chunk splits an array into multiple arrays,
+// the size of each array is determined by <size>.
 // The last chunk may contain less than size elements.
-//
-// 将一个数组分割成多个数组，其中每个数组的单元数目由size决定。最后一个数组的单元数目可能会少于size个。
 func (a *IntArray) Chunk(size int) [][]int {
     if size < 1 {
         return nil
@@ -483,14 +455,10 @@ func (a *IntArray) Chunk(size int) [][]int {
     return n
 }
 
-// Pad array to the specified length with a value.
+// Pad pads array to the specified length with <value>.
 // If size is positive then the array is padded on the right, or negative on the left.
-// If the absolute value of size is less than or equal to the length of the array
+// If the absolute value of <size> is less than or equal to the length of the array
 // then no padding takes place.
-//
-// 返回数组的一个拷贝，并用value将其填补到size指定的长度。
-// 如果size为正数，则填补到数组的右侧，如果为负数则从左侧开始填补。
-// 如果size的绝对值小于或等于数组的长度则没有任何填补。
 func (a *IntArray) Pad(size int, value int) *IntArray {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -514,12 +482,9 @@ func (a *IntArray) Pad(size int, value int) *IntArray {
     return a
 }
 
-// Extract a slice of the array(If in concurrent safe usage,
-// it returns a copy of the slice; else a pointer).
-// It returns the sequence of elements from the array array as specified
-// by the offset and length parameters.
-//
-// 返回根据offset和size参数所指定的数组中的一段序列。
+// SubSlice returns a slice of elements from the array as specified
+// by the <offset> and <size> parameters.
+// If in concurrent safe usage, it returns a copy of the slice; else a pointer.
 func (a *IntArray) SubSlice(offset, size int) []int {
     a.mu.RLock()
     defer a.mu.RUnlock()
@@ -538,11 +503,15 @@ func (a *IntArray) SubSlice(offset, size int) []int {
     }
 }
 
-// Picks one or more random entries out of an array(a copy),
-// and returns the key (or keys) of the random entries.
-//
-// 从数组中随机取出size个元素项，构成slice返回。
-func (a *IntArray) Rand(size int) []int {
+// Rand randomly returns one item from array(no deleting).
+func (a *IntArray) Rand() int {
+    a.mu.RLock()
+    defer a.mu.RUnlock()
+    return a.array[grand.Intn(len(a.array))]
+}
+
+// Rands randomly returns <size> items from array(no deleting).
+func (a *IntArray) Rands(size int) []int {
     a.mu.RLock()
     defer a.mu.RUnlock()
     if size > len(a.array) {
@@ -558,9 +527,7 @@ func (a *IntArray) Rand(size int) []int {
     return n
 }
 
-// Randomly shuffles the array.
-//
-// 随机打乱当前数组。
+// Shuffle randomly shuffles the array.
 func (a *IntArray) Shuffle() *IntArray {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -570,9 +537,7 @@ func (a *IntArray) Shuffle() *IntArray {
     return a
 }
 
-// Make array with elements in reverse order.
-//
-// 将当前数组反转。
+// Reverse makes array with elements in reverse order.
 func (a *IntArray) Reverse() *IntArray {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -582,11 +547,34 @@ func (a *IntArray) Reverse() *IntArray {
     return a
 }
 
-// Join array elements with a string.
-//
-// 使用glue字符串串连当前数组的元素项，构造成新的字符串返回。
+// Join joins array elements with a string <glue>.
 func (a *IntArray) Join(glue string) string {
     a.mu.RLock()
     defer a.mu.RUnlock()
-    return strings.Join(gconv.Strings(a.array), glue)
+    buffer := bytes.NewBuffer(nil)
+    for k, v := range a.array {
+        buffer.WriteString(gconv.String(v))
+        if k != len(a.array) - 1 {
+            buffer.WriteString(glue)
+        }
+    }
+    return buffer.String()
+}
+
+// CountValues counts the number of occurrences of all values in the array.
+func (a *IntArray) CountValues() map[int]int {
+	m := make(map[int]int)
+	a.mu.RLock()
+	defer a.mu.RUnlock()
+	for _, v := range a.array {
+		m[v]++
+	}
+	return m
+}
+
+// String returns current array as a string.
+func (a *IntArray) String() string {
+	a.mu.RLock()
+	defer a.mu.RUnlock()
+	return fmt.Sprint(a.array)
 }

g/container/garray/garray_normal_interface.go

@@ -7,40 +7,35 @@
 package garray
 
 import (
+    "bytes"
+    "fmt"
     "github.com/gogf/gf/g/internal/rwmutex"
     "github.com/gogf/gf/g/util/gconv"
     "github.com/gogf/gf/g/util/grand"
     "math"
     "sort"
-    "strings"
 )
 
 type Array struct {
-    mu    *rwmutex.RWMutex  // 互斥锁
-    array []interface{}     // 底层数组
+    mu    *rwmutex.RWMutex
+    array []interface{}
 }
 
-// Create an empty array.
-// The param <unsafe> used to specify whether using array with un-concurrent-safety,
-// which is false in default, means concurrent-safe in default.
-//
-// 创建一个空的数组对象，参数unsafe用于指定是否用于非并发安全场景，默认为false，表示并发安全。
+// New creates and returns an empty array.
+// The param <unsafe> used to specify whether using array in un-concurrent-safety,
+// which is false in default.
 func New(unsafe...bool) *Array {
     return NewArraySize(0, 0, unsafe...)
 }
 
 // See New.
-//
-// 同New方法。
 func NewArray(unsafe...bool) *Array {
     return NewArraySize(0, 0, unsafe...)
 }
 
-// Create an array with given size and cap.
+// NewArraySize create and returns an array with given size and cap.
 // The param <unsafe> used to specify whether using array with un-concurrent-safety,
-// which is false in default, means concurrent-safe in default.
-//
-// 创建一个指定大小的数组对象，参数unsafe用于指定是否用于非并发安全场景，默认为false，表示并发安全。
+// which is false in default.
 func NewArraySize(size int, cap int, unsafe...bool) *Array {
     return &Array{
         mu    : rwmutex.New(unsafe...),
@@ -48,11 +43,19 @@ func NewArraySize(size int, cap int, unsafe...bool) *Array {
     }
 }
 
-// Create an array with given slice <array>.
+// See NewArrayFrom.
+func NewFrom(array []interface{}, unsafe...bool) *Array {
+    return NewArrayFrom(array, unsafe...)
+}
+
+// See NewArrayFromCopy.
+func NewFromCopy(array []interface{}, unsafe...bool) *Array {
+    return NewArrayFromCopy(array, unsafe...)
+}
+
+// NewArrayFrom creates and returns an array with given slice <array>.
 // The param <unsafe> used to specify whether using array with un-concurrent-safety,
-// which is false in default, means concurrent-safe in default.
-//
-// 通过给定的slice变量创建数组对象，参数unsafe用于指定是否用于非并发安全场景，默认为false，表示并发安全。
+// which is false in default.
 func NewArrayFrom(array []interface{}, unsafe...bool) *Array {
     return &Array{
         mu    : rwmutex.New(unsafe...),
@@ -60,9 +63,20 @@ func NewArrayFrom(array []interface{}, unsafe...bool) *Array {
     }
 }
 
-// Get value by index.
-//
-// 获取指定索引的数据项, 调用方注意判断数组边界
+// NewArrayFromCopy creates and returns an array from a copy of given slice <array>.
+// The param <unsafe> used to specify whether using array with un-concurrent-safety,
+// which is false in default.
+func NewArrayFromCopy(array []interface{}, unsafe...bool) *Array {
+    newArray := make([]interface{}, len(array))
+    copy(newArray, array)
+    return &Array{
+        mu    : rwmutex.New(unsafe...),
+        array : newArray,
+    }
+}
+
+// Get returns the value of the specified index,
+// the caller should notice the boundary of the array.
 func (a *Array) Get(index int) interface{} {
     a.mu.RLock()
     defer a.mu.RUnlock()
@@ -70,9 +84,7 @@ func (a *Array) Get(index int) interface{} {
     return value
 }
 
-// Set value by index.
-//
-// 设置指定索引的数据项, 调用方注意判断数组边界
+// Set sets value to specified index.
 func (a *Array) Set(index int, value interface{}) *Array {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -80,9 +92,7 @@ func (a *Array) Set(index int, value interface{}) *Array {
     return a
 }
 
-// Set the underlying slice array with the given <array> param.
-//
-// 设置底层数组变量.
+// SetArray sets the underlying slice array with the given <array>.
 func (a *Array) SetArray(array []interface{}) *Array {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -90,9 +100,7 @@ func (a *Array) SetArray(array []interface{}) *Array {
     return a
 }
 
-// Replace the array items by given <array> from the beginning of array.
-//
-// 使用指定数组替换到对应的索引元素值.
+// Replace replaces the array items by given <array> from the beginning of array.
 func (a *Array) Replace(array []interface{}) *Array {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -106,9 +114,7 @@ func (a *Array) Replace(array []interface{}) *Array {
     return a
 }
 
-// Calculate the sum of values in an array.
-//
-// 对数组中的元素项求和(将元素值转换为int类型后叠加)。
+// Sum returns the sum of values in an array.
 func (a *Array) Sum() (sum int) {
     a.mu.RLock()
     defer a.mu.RUnlock()
@@ -118,9 +124,7 @@ func (a *Array) Sum() (sum int) {
     return
 }
 
-// Sort the array by custom function <less>.
-//
-// 使用自定义的排序函数将数组重新排序.
+// SortFunc sorts the array by custom function <less>.
 func (a *Array) SortFunc(less func(v1, v2 interface{}) bool) *Array {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -130,9 +134,7 @@ func (a *Array) SortFunc(less func(v1, v2 interface{}) bool) *Array {
     return a
 }
 
-// Insert the <value> to the front of <index>.
-//
-// 在当前索引位置前插入一个数据项, 调用方注意判断数组边界。
+// InsertBefore inserts the <value> to the front of <index>.
 func (a *Array) InsertBefore(index int, value interface{}) *Array {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -142,9 +144,7 @@ func (a *Array) InsertBefore(index int, value interface{}) *Array {
     return a
 }
 
-// Insert the <value> to the back of <index>.
-//
-// 在当前索引位置前插入一个数据项, 调用方注意判断数组边界。
+// InsertAfter inserts the <value> to the back of <index>.
 func (a *Array) InsertAfter(index int, value interface{}) *Array {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -154,13 +154,11 @@ func (a *Array) InsertAfter(index int, value interface{}) *Array {
     return a
 }
 
-// Remove an item by index.
-//
-// 删除指定索引的数据项, 调用方注意判断数组边界。
+// Remove removes an item by index.
 func (a *Array) Remove(index int) interface{} {
     a.mu.Lock()
     defer a.mu.Unlock()
-    // 边界删除判断，以提高删除效率
+	// Determine array boundaries when deleting to improve deletion efficiency。
     if index == 0 {
         value  := a.array[0]
         a.array = a.array[1 : ]
@@ -170,15 +168,15 @@ func (a *Array) Remove(index int) interface{} {
         a.array = a.array[: index]
         return value
     }
-    // 如果非边界删除，会涉及到数组创建，那么删除的效率差一些
+	// If it is a non-boundary delete,
+	// it will involve the creation of an array,
+	// then the deletion is less efficient.
     value  := a.array[index]
     a.array = append(a.array[ : index], a.array[index + 1 : ]...)
     return value
 }
 
-// Push new items to the beginning of array.
-//
-// 将数据项添加到数组的最左端(索引为0)。
+// PushLeft pushes one or multiple items to the beginning of array.
 func (a *Array) PushLeft(value...interface{}) *Array {
     a.mu.Lock()
     a.array = append(value, a.array...)
@@ -186,9 +184,8 @@ func (a *Array) PushLeft(value...interface{}) *Array {
     return a
 }
 
-// Push new items to the end of array.
-//
-// 将数据项添加到数组的最右端(索引为length - 1), 等于: Append。
+// PushRight pushes one or multiple items to the end of array.
+// It equals to Append.
 func (a *Array) PushRight(value...interface{}) *Array {
     a.mu.Lock()
     a.array = append(a.array, value...)
@@ -196,16 +193,28 @@ func (a *Array) PushRight(value...interface{}) *Array {
     return a
 }
 
-// Pop an random item from array.
-//
-// 随机将一个数据项移出数组，并返回该数据项。
+// PopRand randomly pops and return an item out of array.
 func (a *Array) PopRand() interface{} {
     return a.Remove(grand.Intn(len(a.array)))
 }
 
-// Pop an item from the beginning of array.
-//
-// 将最左端(索引为0)的数据项移出数组，并返回该数据项。
+// PopRands randomly pops and returns <size> items out of array.
+func (a *Array) PopRands(size int) []interface{} {
+    a.mu.Lock()
+    defer a.mu.Unlock()
+    if size > len(a.array) {
+        size = len(a.array)
+    }
+    array := make([]interface{}, size)
+    for i := 0; i < size; i++ {
+        index   := grand.Intn(len(a.array))
+        array[i] = a.array[index]
+        a.array  = append(a.array[ : index], a.array[index + 1 : ]...)
+    }
+    return array
+}
+
+// PopLeft pops and returns an item from the beginning of array.
 func (a *Array) PopLeft() interface{} {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -214,9 +223,7 @@ func (a *Array) PopLeft() interface{} {
     return value
 }
 
-// Pop an item from the end of array.
-//
-// 将最右端(索引为length - 1)的数据项移出数组，并返回该数据项。
+// PopRight pops and returns an item from the end of array.
 func (a *Array) PopRight() interface{} {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -226,9 +233,7 @@ func (a *Array) PopRight() interface{} {
     return value
 }
 
-// Pop <size> items from the beginning of array.
-//
-// 将最左端(首部)的size个数据项移出数组，并返回该数据项
+// PopLefts pops and returns <size> items from the beginning of array.
 func (a *Array) PopLefts(size int) []interface{} {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -241,9 +246,7 @@ func (a *Array) PopLefts(size int) []interface{} {
     return value
 }
 
-// Pop <size> items from the end of array.
-//
-// 将最右端(尾部)的size个数据项移出数组，并返回该数据项
+// PopRights pops and returns <size> items from the end of array.
 func (a *Array) PopRights(size int) []interface{} {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -256,11 +259,9 @@ func (a *Array) PopRights(size int) []interface{} {
     return value
 }
 
-// Get items by range, returns array[start:end].
-// Be aware that, if in concurrent-safe usage, it returns a copy of slice;
+// Range picks and returns items by range, like array[start:end].
+// Notice, if in concurrent-safe usage, it returns a copy of slice;
 // else a pointer to the underlying data.
-//
-// 将最右端(尾部)的size个数据项移出数组，并返回该数据项
 func (a *Array) Range(start, end int) []interface{} {
     a.mu.RLock()
     defer a.mu.RUnlock()
@@ -287,16 +288,12 @@ func (a *Array) Range(start, end int) []interface{} {
 }
 
 // See PushRight.
-//
-// 追加数据项, 等于: PushRight。
 func (a *Array) Append(value...interface{}) *Array {
     a.PushRight(value...)
     return a
 }
 
-// Get the length of array.
-//
-// 数组长度。
+// Len returns the length of array.
 func (a *Array) Len() int {
     a.mu.RLock()
     length := len(a.array)
@@ -304,11 +301,9 @@ func (a *Array) Len() int {
     return length
 }
 
-// Get the underlying data of array.
-// Be aware that, if in concurrent-safe usage, it returns a copy of slice;
+// Slice returns the underlying data of array.
+// Notice, if in concurrent-safe usage, it returns a copy of slice;
 // else a pointer to the underlying data.
-//
-// 返回原始数据数组.
 func (a *Array) Slice() []interface{} {
     array := ([]interface{})(nil)
     if a.mu.IsSafe() {
@@ -322,9 +317,7 @@ func (a *Array) Slice() []interface{} {
     return array
 }
 
-// Return a new array, which is a copy of current array.
-//
-// 克隆当前数组，返回当前数组的一个拷贝。
+// Clone returns a new array, which is a copy of current array.
 func (a *Array) Clone() (newArray *Array) {
     a.mu.RLock()
     array := make([]interface{}, len(a.array))
@@ -333,9 +326,7 @@ func (a *Array) Clone() (newArray *Array) {
     return NewArrayFrom(array, !a.mu.IsSafe())
 }
 
-// Clear array.
-//
-// 清空数据数组
+// Clear deletes all items of current array.
 func (a *Array) Clear() *Array {
     a.mu.Lock()
     if len(a.array) > 0 {
@@ -345,16 +336,13 @@ func (a *Array) Clear() *Array {
     return a
 }
 
-// Check whether a value exists in the array.
-//
-// 查找指定数值是否存在
+// Contains checks whether a value exists in the array.
 func (a *Array) Contains(value interface{}) bool {
     return a.Search(value) != -1
 }
 
-// Search array by <value>, returns the index of <value>, returns -1 if not exists.
-//
-// 查找指定数值的索引位置，返回索引位置，如果查找不到则返回-1
+// Search searches array by <value>, returns the index of <value>,
+// or returns -1 if not exists.
 func (a *Array) Search(value interface{}) int {
     if len(a.array) == 0 {
         return -1
@@ -372,9 +360,7 @@ func (a *Array) Search(value interface{}) int {
     return result
 }
 
-// Unique the array, clear repeated values.
-//
-// 清理数组中重复的元素项
+// Unique uniques the array, clear repeated items.
 func (a *Array) Unique() *Array {
     a.mu.Lock()
     for i := 0; i < len(a.array) - 1; i++ {
@@ -388,44 +374,42 @@ func (a *Array) Unique() *Array {
     return a
 }
 
-// Lock writing by callback function f.
-//
-// 使用自定义方法执行加锁修改操作
+// LockFunc locks writing by callback function <f>.
 func (a *Array) LockFunc(f func(array []interface{})) *Array {
-    a.mu.Lock(true)
-    defer a.mu.Unlock(true)
-    f(a.array)
-    return a
-}
-
-// Lock reading by callback function f.
-//
-// 使用自定义方法执行加锁读取操作
-func (a *Array) RLockFunc(f func(array []interface{})) *Array {
-    a.mu.RLock(true)
-    defer a.mu.RUnlock(true)
-    f(a.array)
-    return a
-}
-
-// Merge two arrays.
-//
-// 合并两个数组.
-func (a *Array) Merge(array *Array) *Array {
     a.mu.Lock()
     defer a.mu.Unlock()
-    if a != array {
-        array.mu.RLock()
-        defer array.mu.RUnlock()
-    }
-    a.array = append(a.array, array.array...)
+    f(a.array)
     return a
 }
 
-// Fills an array with num entries of the value of the value parameter,
-// keys starting at the start_index parameter.
-//
-// 用value参数的值将数组填充num个条目，位置由startIndex参数指定的开始。
+// RLockFunc locks reading by callback function <f>.
+func (a *Array) RLockFunc(f func(array []interface{})) *Array {
+    a.mu.RLock()
+    defer a.mu.RUnlock()
+    f(a.array)
+    return a
+}
+
+// Merge merges <array> into current array.
+// The parameter <array> can be any garray or slice type.
+// The difference between Merge and Append is Append supports only specified slice type,
+// but Merge supports more parameter types.
+func (a *Array) Merge(array interface{}) *Array {
+    switch v := array.(type) {
+        case *Array:             a.Append(gconv.Interfaces(v.Slice())...)
+        case *IntArray:          a.Append(gconv.Interfaces(v.Slice())...)
+        case *StringArray:       a.Append(gconv.Interfaces(v.Slice())...)
+        case *SortedArray:       a.Append(gconv.Interfaces(v.Slice())...)
+        case *SortedIntArray:    a.Append(gconv.Interfaces(v.Slice())...)
+        case *SortedStringArray: a.Append(gconv.Interfaces(v.Slice())...)
+        default:
+            a.Append(gconv.Interfaces(array)...)
+    }
+    return a
+}
+
+// Fill fills an array with num entries of the value <value>,
+// keys starting at the <startIndex> parameter.
 func (a *Array) Fill(startIndex int, num int, value interface{}) *Array {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -442,10 +426,9 @@ func (a *Array) Fill(startIndex int, num int, value interface{}) *Array {
     return a
 }
 
-// Chunks an array into arrays with size elements.
+// Chunk splits an array into multiple arrays,
+// the size of each array is determined by <size>.
 // The last chunk may contain less than size elements.
-//
-// 将一个数组分割成多个数组，其中每个数组的单元数目由size决定。最后一个数组的单元数目可能会少于size个。
 func (a *Array) Chunk(size int) [][]interface{} {
     if size < 1 {
         return nil
@@ -466,15 +449,10 @@ func (a *Array) Chunk(size int) [][]interface{} {
     return n
 }
 
-// Pad array to the specified length with a value.
-// If size is positive then the array is padded on the right,
-// if it's negative then on the left.
-// If the absolute value of size is less than or equal to the length of the array
+// Pad pads array to the specified length with <value>.
+// If size is positive then the array is padded on the right, or negative on the left.
+// If the absolute value of <size> is less than or equal to the length of the array
 // then no padding takes place.
-//
-// 返回数组的一个拷贝，并用value将其填补到size指定的长度。
-// 如果size为正数，则填补到数组的右侧，如果为负数则从左侧开始填补。
-// 如果size的绝对值小于或等于数组的长度则没有任何填补。
 func (a *Array) Pad(size int, val interface{}) *Array {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -498,10 +476,9 @@ func (a *Array) Pad(size int, val interface{}) *Array {
     return a
 }
 
-// Extract a slice of the array(If in concurrent safe usage, it returns a copy of the slice; else a pointer).
-// It returns the sequence of elements from the array array as specified by the offset and length parameters.
-//
-// 返回根据offset和size参数所指定的数组中的一段序列。
+// SubSlice returns a slice of elements from the array as specified
+// by the <offset> and <size> parameters.
+// If in concurrent safe usage, it returns a copy of the slice; else a pointer.
 func (a *Array) SubSlice(offset, size int) []interface{} {
     a.mu.RLock()
     defer a.mu.RUnlock()
@@ -520,11 +497,15 @@ func (a *Array) SubSlice(offset, size int) []interface{} {
     }
 }
 
-// Picks one or more random entries out of an array(a copy),
-// and returns the key (or keys) of the random entries.
-//
-// 从数组中随机取出size个元素项，构成slice返回。
-func (a *Array) Rand(size int) []interface{} {
+// Rand randomly returns one item from array(no deleting).
+func (a *Array) Rand() interface{} {
+    a.mu.RLock()
+    defer a.mu.RUnlock()
+    return a.array[grand.Intn(len(a.array))]
+}
+
+// Rands randomly returns <size> items from array(no deleting).
+func (a *Array) Rands(size int) []interface{} {
     a.mu.RLock()
     defer a.mu.RUnlock()
     if size > len(a.array) {
@@ -540,9 +521,7 @@ func (a *Array) Rand(size int) []interface{} {
     return n
 }
 
-// Randomly shuffles the array.
-//
-// 随机打乱当前数组。
+// Shuffle randomly shuffles the array.
 func (a *Array) Shuffle() *Array {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -552,9 +531,7 @@ func (a *Array) Shuffle() *Array {
     return a
 }
 
-// Make array with elements in reverse order.
-//
-// 将当前数组反转。
+// Reverse makes array with elements in reverse order.
 func (a *Array) Reverse() *Array {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -564,18 +541,21 @@ func (a *Array) Reverse() *Array {
     return a
 }
 
-// Join array elements with a string.
-//
-// 使用glue字符串串连当前数组的元素项，构造成新的字符串返回。
+// Join joins array elements with a string <glue>.
 func (a *Array) Join(glue string) string {
     a.mu.RLock()
     defer a.mu.RUnlock()
-    return strings.Join(gconv.Strings(a.array), glue)
+    buffer := bytes.NewBuffer(nil)
+    for k, v := range a.array {
+        buffer.WriteString(gconv.String(v))
+        if k != len(a.array) - 1 {
+            buffer.WriteString(glue)
+        }
+    }
+    return buffer.String()
 }
 
-// Counts all the values of an array.
-//
-// 统计数组中所有的值出现的次数.
+// CountValues counts the number of occurrences of all values in the array.
 func (a *Array) CountValues() map[interface{}]int {
     m := make(map[interface{}]int)
     a.mu.RLock()
@@ -584,4 +564,11 @@ func (a *Array) CountValues() map[interface{}]int {
         m[v]++
     }
     return m
+}
+
+// String returns current array as a string.
+func (a *Array) String() string {
+    a.mu.RLock()
+    defer a.mu.RUnlock()
+    return fmt.Sprint(a.array)
 }

g/container/garray/garray_normal_string.go

@@ -7,7 +7,9 @@
 package garray
 
 import (
-    "github.com/gogf/gf/g/internal/rwmutex"
+    "bytes"
+	"fmt"
+	"github.com/gogf/gf/g/internal/rwmutex"
     "github.com/gogf/gf/g/util/gconv"
     "github.com/gogf/gf/g/util/grand"
     "math"
@@ -16,24 +18,20 @@ import (
 )
 
 type StringArray struct {
-	mu    *rwmutex.RWMutex // 互斥锁
-	array []string         // 底层数组
+	mu    *rwmutex.RWMutex
+	array []string
 }
 
-// Create an empty array.
-// The param <unsafe> used to specify whether using array with un-concurrent-safety,
-// which is false in default, means concurrent-safe in default.
-//
-// 创建一个空的数组对象，参数unsafe用于指定是否用于非并发安全场景，默认为false，表示并发安全。
+// NewStringArray creates and returns an empty array.
+// The param <unsafe> used to specify whether using array in un-concurrent-safety,
+// which is false in default.
 func NewStringArray(unsafe...bool) *StringArray {
     return NewStringArraySize(0, 0, unsafe...)
 }
 
-// Create an array with given size and cap.
+// NewStringArraySize create and returns an array with given size and cap.
 // The param <unsafe> used to specify whether using array with un-concurrent-safety,
-// which is false in default, means concurrent-safe in default.
-//
-// 创建一个指定大小的数组对象，参数unsafe用于指定是否用于非并发安全场景，默认为false，表示并发安全。
+// which is false in default.
 func NewStringArraySize(size int, cap int, unsafe...bool) *StringArray {
     return &StringArray{
         mu    : rwmutex.New(unsafe...),
@@ -41,11 +39,9 @@ func NewStringArraySize(size int, cap int, unsafe...bool) *StringArray {
     }
 }
 
-// Create an array with given slice <array>.
+// NewStringArrayFrom creates and returns an array with given slice <array>.
 // The param <unsafe> used to specify whether using array with un-concurrent-safety,
-// which is false in default, means concurrent-safe in default.
-//
-// 通过给定的slice变量创建数组对象，参数unsafe用于指定是否用于非并发安全场景，默认为false，表示并发安全。
+// which is false in default.
 func NewStringArrayFrom(array []string, unsafe...bool) *StringArray {
 	return &StringArray {
 		mu    : rwmutex.New(unsafe...),
@@ -53,9 +49,20 @@ func NewStringArrayFrom(array []string, unsafe...bool) *StringArray {
 	}
 }
 
-// Get value by index.
-//
-// 获取指定索引的数据项, 调用方注意判断数组边界。
+// NewStringArrayFromCopy creates and returns an array from a copy of given slice <array>.
+// The param <unsafe> used to specify whether using array with un-concurrent-safety,
+// which is false in default.
+func NewStringArrayFromCopy(array []string, unsafe...bool) *StringArray {
+    newArray := make([]string, len(array))
+    copy(newArray, array)
+    return &StringArray{
+        mu    : rwmutex.New(unsafe...),
+        array : newArray,
+    }
+}
+
+// Get returns the value of the specified index,
+// the caller should notice the boundary of the array.
 func (a *StringArray) Get(index int) string {
 	a.mu.RLock()
 	defer a.mu.RUnlock()
@@ -63,9 +70,7 @@ func (a *StringArray) Get(index int) string {
 	return value
 }
 
-// Set value by index.
-//
-// 设置指定索引的数据项, 调用方注意判断数组边界。
+// Set sets value to specified index.
 func (a *StringArray) Set(index int, value string) *StringArray {
 	a.mu.Lock()
 	defer a.mu.Unlock()
@@ -73,9 +78,7 @@ func (a *StringArray) Set(index int, value string) *StringArray {
     return a
 }
 
-// Set the underlying slice array with the given <array> param.
-//
-// 设置底层数组变量.
+// SetArray sets the underlying slice array with the given <array>.
 func (a *StringArray) SetArray(array []string) *StringArray {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -83,9 +86,7 @@ func (a *StringArray) SetArray(array []string) *StringArray {
     return a
 }
 
-// Replace the array items by given <array> from the beginning of array.
-//
-// 使用指定数组替换到对应的索引元素值.
+// Replace replaces the array items by given <array> from the beginning of array.
 func (a *StringArray) Replace(array []string) *StringArray {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -99,9 +100,7 @@ func (a *StringArray) Replace(array []string) *StringArray {
     return a
 }
 
-// Calculate the sum of values in an array.
-//
-// 对数组中的元素项求和(将元素值转换为int类型后叠加)。
+// Sum returns the sum of values in an array.
 func (a *StringArray) Sum() (sum int) {
     a.mu.RLock()
     defer a.mu.RUnlock()
@@ -111,11 +110,9 @@ func (a *StringArray) Sum() (sum int) {
     return
 }
 
-// Sort the array in increasing order.
+// Sort sorts the array in increasing order.
 // The param <reverse> controls whether sort
 // in increasing order(default) or decreasing order
-//
-// 将数组排序(默认从低到高).
 func (a *StringArray) Sort(reverse...bool) *StringArray {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -132,9 +129,7 @@ func (a *StringArray) Sort(reverse...bool) *StringArray {
     return a
 }
 
-// Sort the array by custom function <less>.
-//
-// 使用自定义的排序函数将数组重新排序.
+// SortFunc sorts the array by custom function <less>.
 func (a *StringArray) SortFunc(less func(v1, v2 string) bool) *StringArray {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -144,9 +139,7 @@ func (a *StringArray) SortFunc(less func(v1, v2 string) bool) *StringArray {
     return a
 }
 
-// Insert the <value> to the front of <index>.
-//
-// 在当前索引位置前插入一个数据项, 调用方注意判断数组边界。
+// InsertBefore inserts the <value> to the front of <index>.
 func (a *StringArray) InsertBefore(index int, value string) *StringArray {
 	a.mu.Lock()
 	defer a.mu.Unlock()
@@ -156,9 +149,7 @@ func (a *StringArray) InsertBefore(index int, value string) *StringArray {
     return a
 }
 
-// Insert the <value> to the back of <index>.
-//
-// 在当前索引位置前插入一个数据项, 调用方注意判断数组边界。
+// InsertAfter inserts the <value> to the back of <index>.
 func (a *StringArray) InsertAfter(index int, value string) *StringArray {
 	a.mu.Lock()
 	defer a.mu.Unlock()
@@ -168,13 +159,11 @@ func (a *StringArray) InsertAfter(index int, value string) *StringArray {
     return a
 }
 
-// Remove an item by index.
-//
-// 删除指定索引的数据项, 调用方注意判断数组边界。
+// Remove removes an item by index.
 func (a *StringArray) Remove(index int) string {
 	a.mu.Lock()
 	defer a.mu.Unlock()
-	// 边界删除判断，以提高删除效率
+	// Determine array boundaries when deleting to improve deletion efficiency。
 	if index == 0 {
 		value  := a.array[0]
 		a.array = a.array[1 : ]
@@ -184,15 +173,15 @@ func (a *StringArray) Remove(index int) string {
 		a.array = a.array[: index]
 		return value
 	}
-	// 如果非边界删除，会涉及到数组创建，那么删除的效率差一些
+	// If it is a non-boundary delete,
+	// it will involve the creation of an array,
+	// then the deletion is less efficient.
 	value  := a.array[index]
 	a.array = append(a.array[ : index], a.array[index + 1 : ]...)
 	return value
 }
 
-// Push new items to the beginning of array.
-//
-// 将数据项添加到数组的最左端(索引为0)。
+// PushLeft pushes one or multiple items to the beginning of array.
 func (a *StringArray) PushLeft(value...string) *StringArray {
     a.mu.Lock()
     a.array = append(value, a.array...)
@@ -200,9 +189,8 @@ func (a *StringArray) PushLeft(value...string) *StringArray {
     return a
 }
 
-// Push new items to the end of array.
-//
-// 将数据项添加到数组的最右端(索引为length - 1), 等于: Append。
+// PushRight pushes one or multiple items to the end of array.
+// It equals to Append.
 func (a *StringArray) PushRight(value...string) *StringArray {
     a.mu.Lock()
     a.array = append(a.array, value...)
@@ -210,9 +198,7 @@ func (a *StringArray) PushRight(value...string) *StringArray {
     return a
 }
 
-// Pop an item from the beginning of array.
-//
-// 将最左端(索引为0)的数据项移出数组，并返回该数据项。
+// PopLeft pops and returns an item from the beginning of array.
 func (a *StringArray) PopLeft() string {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -221,9 +207,7 @@ func (a *StringArray) PopLeft() string {
     return value
 }
 
-// Pop an item from the end of array.
-//
-// 将最右端(索引为length - 1)的数据项移出数组，并返回该数据项。
+// PopRight pops and returns an item from the end of array.
 func (a *StringArray) PopRight() string {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -233,16 +217,28 @@ func (a *StringArray) PopRight() string {
     return value
 }
 
-// Pop an random item from array.
-//
-// 随机将一个数据项移出数组，并返回该数据项。
+// PopRand randomly pops and return an item out of array.
 func (a *StringArray) PopRand() string {
     return a.Remove(grand.Intn(len(a.array)))
 }
 
-// Pop <size> items from the beginning of array.
-//
-// 将最左端(首部)的size个数据项移出数组，并返回该数据项
+// PopRands randomly pops and returns <size> items out of array.
+func (a *StringArray) PopRands(size int) []string {
+    a.mu.Lock()
+    defer a.mu.Unlock()
+    if size > len(a.array) {
+        size = len(a.array)
+    }
+    array := make([]string, size)
+    for i := 0; i < size; i++ {
+        index   := grand.Intn(len(a.array))
+        array[i] = a.array[index]
+        a.array  = append(a.array[ : index], a.array[index + 1 : ]...)
+    }
+    return array
+}
+
+// PopLefts pops and returns <size> items from the beginning of array.
 func (a *StringArray) PopLefts(size int) []string {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -255,9 +251,7 @@ func (a *StringArray) PopLefts(size int) []string {
     return value
 }
 
-// Pop <size> items from the end of array.
-//
-// 将最右端(尾部)的size个数据项移出数组，并返回该数据项
+// PopRights pops and returns <size> items from the end of array.
 func (a *StringArray) PopRights(size int) []string {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -270,11 +264,9 @@ func (a *StringArray) PopRights(size int) []string {
     return value
 }
 
-// Get items by range, returns array[start:end].
-// Be aware that, if in concurrent-safe usage, it returns a copy of slice;
+// Range picks and returns items by range, like array[start:end].
+// Notice, if in concurrent-safe usage, it returns a copy of slice;
 // else a pointer to the underlying data.
-//
-// 将最右端(尾部)的size个数据项移出数组，并返回该数据项
 func (a *StringArray) Range(start, end int) []string {
     a.mu.RLock()
     defer a.mu.RUnlock()
@@ -301,8 +293,6 @@ func (a *StringArray) Range(start, end int) []string {
 }
 
 // See PushRight.
-//
-// 追加数据项, 等于: PushRight。
 func (a *StringArray) Append(value...string) *StringArray {
 	a.mu.Lock()
 	a.array = append(a.array, value...)
@@ -310,9 +300,7 @@ func (a *StringArray) Append(value...string) *StringArray {
     return a
 }
 
-// Get the length of array.
-//
-// 数组长度。
+// Len returns the length of array.
 func (a *StringArray) Len() int {
 	a.mu.RLock()
 	length := len(a.array)
@@ -320,11 +308,9 @@ func (a *StringArray) Len() int {
 	return length
 }
 
-// Get the underlying data of array.
-// Be aware that, if in concurrent-safe usage, it returns a copy of slice;
+// Slice returns the underlying data of array.
+// Notice, if in concurrent-safe usage, it returns a copy of slice;
 // else a pointer to the underlying data.
-//
-// 返回原始数据数组.
 func (a *StringArray) Slice() []string {
 	array := ([]string)(nil)
 	if a.mu.IsSafe() {
@@ -338,9 +324,7 @@ func (a *StringArray) Slice() []string {
 	return array
 }
 
-// Return a new array, which is a copy of current array.
-//
-// 克隆当前数组，返回当前数组的一个拷贝。
+// Clone returns a new array, which is a copy of current array.
 func (a *StringArray) Clone() (newArray *StringArray) {
     a.mu.RLock()
     array := make([]string, len(a.array))
@@ -349,9 +333,7 @@ func (a *StringArray) Clone() (newArray *StringArray) {
     return NewStringArrayFrom(array, !a.mu.IsSafe())
 }
 
-// Clear array.
-//
-// 清空数据数组。
+// Clear deletes all items of current array.
 func (a *StringArray) Clear() *StringArray {
     a.mu.Lock()
     if len(a.array) > 0 {
@@ -361,16 +343,13 @@ func (a *StringArray) Clear() *StringArray {
     return a
 }
 
-// Check whether a value exists in the array.
-//
-// 查找指定数值是否存在。
+// Contains checks whether a value exists in the array.
 func (a *StringArray) Contains(value string) bool {
     return a.Search(value) != -1
 }
 
-// Search array by <value>, returns the index of <value>, returns -1 if not exists.
-//
-// 查找指定数值的索引位置，返回索引位置，如果查找不到则返回-1。
+// Search searches array by <value>, returns the index of <value>,
+// or returns -1 if not exists.
 func (a *StringArray) Search(value string) int {
 	if len(a.array) == 0 {
 		return -1
@@ -387,9 +366,7 @@ func (a *StringArray) Search(value string) int {
 	return result
 }
 
-// Unique the array, clear repeated values.
-//
-// 清理数组中重复的元素项。
+// Unique uniques the array, clear repeated items.
 func (a *StringArray) Unique() *StringArray {
 	a.mu.Lock()
 	for i := 0; i < len(a.array) - 1; i++ {
@@ -403,44 +380,42 @@ func (a *StringArray) Unique() *StringArray {
 	return a
 }
 
-// Lock writing by callback function f.
-//
-// 使用自定义方法执行加锁修改操作。
+// LockFunc locks writing by callback function <f>.
 func (a *StringArray) LockFunc(f func(array []string)) *StringArray {
-	a.mu.Lock(true)
-	defer a.mu.Unlock(true)
+	a.mu.Lock()
+	defer a.mu.Unlock()
 	f(a.array)
     return a
 }
 
-// Lock reading by callback function f.
-//
-// 使用自定义方法执行加锁读取操作。
+// RLockFunc locks reading by callback function <f>.
 func (a *StringArray) RLockFunc(f func(array []string)) *StringArray {
-	a.mu.RLock(true)
-	defer a.mu.RUnlock(true)
+	a.mu.RLock()
+	defer a.mu.RUnlock()
 	f(a.array)
     return a
 }
 
-// Merge two arrays.
-//
-// 合并两个数组.
-func (a *StringArray) Merge(array *StringArray) *StringArray {
-    a.mu.Lock()
-    defer a.mu.Unlock()
-    if a != array {
-        array.mu.RLock()
-        defer array.mu.RUnlock()
+// Merge merges <array> into current array.
+// The parameter <array> can be any garray or slice type.
+// The difference between Merge and Append is Append supports only specified slice type,
+// but Merge supports more parameter types.
+func (a *StringArray) Merge(array interface{}) *StringArray {
+    switch v := array.(type) {
+        case *Array:             a.Append(gconv.Strings(v.Slice())...)
+        case *IntArray:          a.Append(gconv.Strings(v.Slice())...)
+        case *StringArray:       a.Append(gconv.Strings(v.Slice())...)
+        case *SortedArray:       a.Append(gconv.Strings(v.Slice())...)
+        case *SortedIntArray:    a.Append(gconv.Strings(v.Slice())...)
+        case *SortedStringArray: a.Append(gconv.Strings(v.Slice())...)
+        default:
+            a.Append(gconv.Strings(array)...)
     }
-    a.array = append(a.array, array.array...)
     return a
 }
 
-// Fills an array with num entries of the value of the value parameter,
-// keys starting at the start_index parameter.
-//
-// 用value参数的值将数组填充num个条目，位置由startIndex参数指定的开始。
+// Fill fills an array with num entries of the value <value>,
+// keys starting at the <startIndex> parameter.
 func (a *StringArray) Fill(startIndex int, num int, value string) *StringArray {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -457,10 +432,9 @@ func (a *StringArray) Fill(startIndex int, num int, value string) *StringArray {
     return a
 }
 
-// Chunks an array into arrays with size elements.
+// Chunk splits an array into multiple arrays,
+// the size of each array is determined by <size>.
 // The last chunk may contain less than size elements.
-//
-// 将一个数组分割成多个数组，其中每个数组的单元数目由size决定。最后一个数组的单元数目可能会少于size个。
 func (a *StringArray) Chunk(size int) [][]string {
     if size < 1 {
         return nil
@@ -481,15 +455,10 @@ func (a *StringArray) Chunk(size int) [][]string {
     return n
 }
 
-// Pad array to the specified length with a value.
-// If size is positive then the array is padded on the right,
-// if it's negative then on the left.
-// If the absolute value of size is less than or equal to the length of the array
+// Pad pads array to the specified length with <value>.
+// If size is positive then the array is padded on the right, or negative on the left.
+// If the absolute value of <size> is less than or equal to the length of the array
 // then no padding takes place.
-//
-// 返回数组的一个拷贝，并用value将其填补到size指定的长度。
-// 如果size为正数，则填补到数组的右侧，如果为负数则从左侧开始填补。
-// 如果size的绝对值小于或等于数组的长度则没有任何填补。
 func (a *StringArray) Pad(size int, value string) *StringArray {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -513,12 +482,9 @@ func (a *StringArray) Pad(size int, value string) *StringArray {
     return a
 }
 
-// Extract a slice of the array(If in concurrent safe usage,
-// it returns a copy of the slice; else a pointer).
-// It returns the sequence of elements from the array array as specified
-// by the offset and length parameters.
-//
-// 返回根据offset和size参数所指定的数组中的一段序列。
+// SubSlice returns a slice of elements from the array as specified
+// by the <offset> and <size> parameters.
+// If in concurrent safe usage, it returns a copy of the slice; else a pointer.
 func (a *StringArray) SubSlice(offset, size int) []string {
     a.mu.RLock()
     defer a.mu.RUnlock()
@@ -537,11 +503,15 @@ func (a *StringArray) SubSlice(offset, size int) []string {
     }
 }
 
-// Picks one or more random entries out of an array(a copy),
-// and returns the key (or keys) of the random entries.
-//
-// 从数组中随机取出size个元素项，构成slice返回。
-func (a *StringArray) Rand(size int) []string {
+// Rand randomly returns one item from array(no deleting).
+func (a *StringArray) Rand() string {
+    a.mu.RLock()
+    defer a.mu.RUnlock()
+    return a.array[grand.Intn(len(a.array))]
+}
+
+// Rands randomly returns <size> items from array(no deleting).
+func (a *StringArray) Rands(size int) []string {
     a.mu.RLock()
     defer a.mu.RUnlock()
     if size > len(a.array) {
@@ -557,9 +527,7 @@ func (a *StringArray) Rand(size int) []string {
     return n
 }
 
-// Randomly shuffles the array.
-//
-// 随机打乱当前数组。
+// Shuffle randomly shuffles the array.
 func (a *StringArray) Shuffle() *StringArray {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -569,9 +537,7 @@ func (a *StringArray) Shuffle() *StringArray {
     return a
 }
 
-// Make array with elements in reverse order.
-//
-// 将当前数组反转。
+// Reverse makes array with elements in reverse order.
 func (a *StringArray) Reverse() *StringArray {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -581,12 +547,34 @@ func (a *StringArray) Reverse() *StringArray {
     return a
 }
 
-// Join array elements with a string.
-//
-// 使用glue字符串串连当前数组的元素项，构造成新的字符串返回。
+// Join joins array elements with a string <glue>.
 func (a *StringArray) Join(glue string) string {
     a.mu.RLock()
     defer a.mu.RUnlock()
-    return strings.Join(a.array, glue)
+    buffer := bytes.NewBuffer(nil)
+    for k, v := range a.array {
+        buffer.WriteString(gconv.String(v))
+        if k != len(a.array) - 1 {
+            buffer.WriteString(glue)
+        }
+    }
+    return buffer.String()
 }
 
+// CountValues counts the number of occurrences of all values in the array.
+func (a *StringArray) CountValues() map[string]int {
+	m := make(map[string]int)
+	a.mu.RLock()
+	defer a.mu.RUnlock()
+	for _, v := range a.array {
+		m[v]++
+	}
+	return m
+}
+
+// String returns current array as a string.
+func (a *StringArray) String() string {
+	a.mu.RLock()
+	defer a.mu.RUnlock()
+	return fmt.Sprint(a.array)
+}

g/container/garray/garray_sorted_int.go

@@ -7,37 +7,34 @@
 package garray
 
 import (
-    "github.com/gogf/gf/g/container/gtype"
+    "bytes"
+	"fmt"
+	"github.com/gogf/gf/g/container/gtype"
     "github.com/gogf/gf/g/internal/rwmutex"
     "github.com/gogf/gf/g/util/gconv"
     "github.com/gogf/gf/g/util/grand"
     "math"
     "sort"
-    "strings"
 )
 
-// 默认按照从小到大进行排序
+// It's using increasing order in default.
 type SortedIntArray struct {
-    mu          *rwmutex.RWMutex     // 互斥锁
-    array       []int                // 底层数组
-    unique      *gtype.Bool          // 是否要求不能重复(默认false)
-    compareFunc func(v1, v2 int) int // 比较函数，返回值 -1: v1 < v2；0: v1 == v2；1: v1 > v2
+    mu          *rwmutex.RWMutex
+    array       []int
+    unique      *gtype.Bool          // Whether enable unique feature(false)
+    compareFunc func(v1, v2 int) int // Comparison function(it returns -1: v1 < v2; 0: v1 == v2; 1: v1 > v2)
 }
 
-// Create an empty sorted array.
-// The param <unsafe> used to specify whether using array with un-concurrent-safety,
-// which is false in default, means concurrent-safe in default.
-//
-// 创建一个空的排序数组对象，参数unsafe用于指定是否用于非并发安全场景，默认为false，表示并发安全。
+// NewSortedIntArray creates and returns an empty sorted array.
+// The param <unsafe> used to specify whether using array in un-concurrent-safety,
+// which is false in default.
 func NewSortedIntArray(unsafe...bool) *SortedIntArray {
     return NewSortedIntArraySize(0, unsafe...)
 }
 
-// Create a sorted array with given size and cap.
+// NewSortedIntArraySize create and returns an sorted array with given size and cap.
 // The param <unsafe> used to specify whether using array with un-concurrent-safety,
-// which is false in default, means concurrent-safe in default.
-//
-// 创建一个指定大小的排序数组对象，参数unsafe用于指定是否用于非并发安全场景，默认为false，表示并发安全。
+// which is false in default.
 func NewSortedIntArraySize(cap int, unsafe...bool) *SortedIntArray {
     return &SortedIntArray {
         mu          : rwmutex.New(unsafe...),
@@ -55,11 +52,9 @@ func NewSortedIntArraySize(cap int, unsafe...bool) *SortedIntArray {
     }
 }
 
-// Create an array with given slice <array>.
+// NewIntArrayFrom creates and returns an sorted array with given slice <array>.
 // The param <unsafe> used to specify whether using array with un-concurrent-safety,
-// which is false in default, means concurrent-safe in default.
-//
-// 通过给定的slice变量创建排序数组对象，参数unsafe用于指定是否用于非并发安全场景，默认为false，表示并发安全。
+// which is false in default.
 func NewSortedIntArrayFrom(array []int, unsafe...bool) *SortedIntArray {
     a := NewSortedIntArraySize(0, unsafe...)
     a.array = array
@@ -67,9 +62,19 @@ func NewSortedIntArrayFrom(array []int, unsafe...bool) *SortedIntArray {
     return a
 }
 
-// Set the underlying slice array with the given <array> param.
-//
-// 设置底层数组变量.
+// NewSortedIntArrayFromCopy creates and returns an sorted array from a copy of given slice <array>.
+// The param <unsafe> used to specify whether using array with un-concurrent-safety,
+// which is false in default.
+func NewSortedIntArrayFromCopy(array []int, unsafe...bool) *SortedIntArray {
+    newArray := make([]int, len(array))
+    copy(newArray, array)
+    return &SortedIntArray{
+        mu    : rwmutex.New(unsafe...),
+        array : newArray,
+    }
+}
+
+// SetArray sets the underlying slice array with the given <array>.
 func (a *SortedIntArray) SetArray(array []int) *SortedIntArray {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -78,9 +83,9 @@ func (a *SortedIntArray) SetArray(array []int) *SortedIntArray {
     return a
 }
 
-// Sort the array in increasing order.
-//
-// 将数组排序(默认从低到高).
+// Sort sorts the array in increasing order.
+// The param <reverse> controls whether sort
+// in increasing order(default) or decreasing order.
 func (a *SortedIntArray) Sort() *SortedIntArray {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -88,9 +93,7 @@ func (a *SortedIntArray) Sort() *SortedIntArray {
     return a
 }
 
-// And values to sorted array, the array always keeps sorted.
-//
-// 添加数据项.
+// Add adds one or multiple values to sorted array, the array always keeps sorted.
 func (a *SortedIntArray) Add(values...int) *SortedIntArray {
     if len(values) == 0 {
         return a
@@ -106,7 +109,6 @@ func (a *SortedIntArray) Add(values...int) *SortedIntArray {
             a.array = append(a.array, value)
             continue
         }
-        // 加到指定索引后面
         if cmp > 0 {
             index++
         }
@@ -117,9 +119,8 @@ func (a *SortedIntArray) Add(values...int) *SortedIntArray {
     return a
 }
 
-// Get value by index.
-//
-// 获取指定索引的数据项, 调用方注意判断数组边界。
+// Get returns the value of the specified index,
+// the caller should notice the boundary of the array.
 func (a *SortedIntArray) Get(index int) int {
     a.mu.RLock()
     defer a.mu.RUnlock()
@@ -127,13 +128,11 @@ func (a *SortedIntArray) Get(index int) int {
     return value
 }
 
-// Remove an item by index.
-//
-// 删除指定索引的数据项, 调用方注意判断数组边界。
+// Remove removes an item by index.
 func (a *SortedIntArray) Remove(index int) int {
     a.mu.Lock()
     defer a.mu.Unlock()
-    // 边界删除判断，以提高删除效率
+	// Determine array boundaries when deleting to improve deletion efficiency.
     if index == 0 {
         value  := a.array[0]
         a.array = a.array[1 : ]
@@ -143,15 +142,15 @@ func (a *SortedIntArray) Remove(index int) int {
         a.array = a.array[: index]
         return value
     }
-    // 如果非边界删除，会涉及到数组创建，那么删除的效率差一些
+	// If it is a non-boundary delete,
+	// it will involve the creation of an array,
+	// then the deletion is less efficient.
     value  := a.array[index]
     a.array = append(a.array[ : index], a.array[index + 1 : ]...)
     return value
 }
 
-// Push new items to the beginning of array.
-//
-// 将数据项添加到数组的最左端(索引为0)。
+// PopLeft pops and returns an item from the beginning of array.
 func (a *SortedIntArray) PopLeft() int {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -160,9 +159,7 @@ func (a *SortedIntArray) PopLeft() int {
     return value
 }
 
-// Push new items to the end of array.
-//
-// 将数据项添加到数组的最右端(索引为length - 1)。
+// PopRight pops and returns an item from the end of array.
 func (a *SortedIntArray) PopRight() int {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -172,16 +169,28 @@ func (a *SortedIntArray) PopRight() int {
     return value
 }
 
-// Pop an random item from array.
-//
-// 随机将一个数据项移出数组，并返回该数据项。
+// PopRand randomly pops and return an item out of array.
 func (a *SortedIntArray) PopRand() int {
     return a.Remove(grand.Intn(len(a.array)))
 }
 
-// Pop <size> items from the beginning of array.
-//
-// 将最左端(首部)的size个数据项移出数组，并返回该数据项
+// PopRands randomly pops and returns <size> items out of array.
+func (a *SortedIntArray) PopRands(size int) []int {
+    a.mu.Lock()
+    defer a.mu.Unlock()
+    if size > len(a.array) {
+        size = len(a.array)
+    }
+    array := make([]int, size)
+    for i := 0; i < size; i++ {
+        index   := grand.Intn(len(a.array))
+        array[i] = a.array[index]
+        a.array  = append(a.array[ : index], a.array[index + 1 : ]...)
+    }
+    return array
+}
+
+// PopLefts pops and returns <size> items from the beginning of array.
 func (a *SortedIntArray) PopLefts(size int) []int {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -194,9 +203,7 @@ func (a *SortedIntArray) PopLefts(size int) []int {
     return value
 }
 
-// Pop <size> items from the end of array.
-//
-// 将最右端(尾部)的size个数据项移出数组，并返回该数据项
+// PopRights pops and returns <size> items from the end of array.
 func (a *SortedIntArray) PopRights(size int) []int {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -209,11 +216,9 @@ func (a *SortedIntArray) PopRights(size int) []int {
     return value
 }
 
-// Get items by range, returns array[start:end].
-// Be aware that, if in concurrent-safe usage, it returns a copy of slice;
+// Range picks and returns items by range, like array[start:end].
+// Notice, if in concurrent-safe usage, it returns a copy of slice;
 // else a pointer to the underlying data.
-//
-// 将最右端(尾部)的size个数据项移出数组，并返回该数据项
 func (a *SortedIntArray) Range(start, end int) []int {
     a.mu.RLock()
     defer a.mu.RUnlock()
@@ -239,9 +244,7 @@ func (a *SortedIntArray) Range(start, end int) []int {
     return array
 }
 
-// Get the length of array.
-//
-// 数组长度。
+// Len returns the length of array.
 func (a *SortedIntArray) Len() int {
     a.mu.RLock()
     length := len(a.array)
@@ -249,9 +252,7 @@ func (a *SortedIntArray) Len() int {
     return length
 }
 
-// Calculate the sum of values in an array.
-//
-// 对数组中的元素项求和。
+// Sum returns the sum of values in an array.
 func (a *SortedIntArray) Sum() (sum int) {
     a.mu.RLock()
     defer a.mu.RUnlock()
@@ -261,11 +262,9 @@ func (a *SortedIntArray) Sum() (sum int) {
     return
 }
 
-// Get the underlying data of array.
-// Be aware that, if in concurrent-safe usage, it returns a copy of slice;
+// Slice returns the underlying data of array.
+// Notice, if in concurrent-safe usage, it returns a copy of slice;
 // else a pointer to the underlying data.
-//
-// 返回原始数据数组.
 func (a *SortedIntArray) Slice() []int {
     array := ([]int)(nil)
     if a.mu.IsSafe() {
@@ -279,24 +278,19 @@ func (a *SortedIntArray) Slice() []int {
     return array
 }
 
-// Check whether a value exists in the array.
-//
-// 查找指定数值是否存在。
+// Contains checks whether a value exists in the array.
 func (a *SortedIntArray) Contains(value int) bool {
     return a.Search(value) == 0
 }
 
-// Search array by <value>, returns the index of <value>, returns -1 if not exists.
-//
-// 查找指定数值的索引位置，返回索引位置，如果查找不到则返回-1。
+// Search searches array by <value>, returns the index of <value>,
+// or returns -1 if not exists.
 func (a *SortedIntArray) Search(value int) (index int) {
     index, _ = a.binSearch(value, true)
     return
 }
 
 // Binary search.
-//
-// 二分查找.
 func (a *SortedIntArray) binSearch(value int, lock bool) (index int, result int) {
     if len(a.array) == 0 {
         return -1, -2
@@ -322,11 +316,9 @@ func (a *SortedIntArray) binSearch(value int, lock bool) (index int, result int)
     return mid, cmp
 }
 
-// Set unique mark to the array,
+// SetUnique sets unique mark to the array,
 // which means it does not contain any repeated items.
 // It also do unique check, remove all repeated items.
-//
-// 设置是否允许数组唯一.
 func (a *SortedIntArray) SetUnique(unique bool) *SortedIntArray {
     oldUnique := a.unique.Val()
     a.unique.Set(unique)
@@ -336,9 +328,7 @@ func (a *SortedIntArray) SetUnique(unique bool) *SortedIntArray {
     return a
 }
 
-// Do unique check, remove all repeated items.
-//
-// 清理数组中重复的元素项.
+// Unique uniques the array, clear repeated items.
 func (a *SortedIntArray) Unique() *SortedIntArray {
     a.mu.Lock()
     i := 0
@@ -356,9 +346,7 @@ func (a *SortedIntArray) Unique() *SortedIntArray {
     return a
 }
 
-// Return a new array, which is a copy of current array.
-//
-// 克隆当前数组，返回当前数组的一个拷贝。
+// Clone returns a new array, which is a copy of current array.
 func (a *SortedIntArray) Clone() (newArray *SortedIntArray) {
     a.mu.RLock()
     array := make([]int, len(a.array))
@@ -367,9 +355,7 @@ func (a *SortedIntArray) Clone() (newArray *SortedIntArray) {
     return NewSortedIntArrayFrom(array, !a.mu.IsSafe())
 }
 
-// Clear array.
-//
-// 清空数据数组。
+// Clear deletes all items of current array.
 func (a *SortedIntArray) Clear() *SortedIntArray {
     a.mu.Lock()
     if len(a.array) > 0 {
@@ -379,45 +365,43 @@ func (a *SortedIntArray) Clear() *SortedIntArray {
     return a
 }
 
-// Lock writing by callback function f.
-//
-// 使用自定义方法执行加锁修改操作。
+// LockFunc locks writing by callback function <f>.
 func (a *SortedIntArray) LockFunc(f func(array []int)) *SortedIntArray {
-    a.mu.Lock(true)
-    defer a.mu.Unlock(true)
-    f(a.array)
-    return a
-}
-
-// Lock reading by callback function f.
-//
-// 使用自定义方法执行加锁读取操作。
-func (a *SortedIntArray) RLockFunc(f func(array []int)) *SortedIntArray {
-    a.mu.RLock(true)
-    defer a.mu.RUnlock(true)
-    f(a.array)
-    return a
-}
-
-// Merge two arrays.
-//
-// 合并两个数组.
-func (a *SortedIntArray) Merge(array *SortedIntArray) *SortedIntArray {
     a.mu.Lock()
     defer a.mu.Unlock()
-    if a != array {
-        array.mu.RLock()
-        defer array.mu.RUnlock()
-    }
-    a.array = append(a.array, array.array...)
-    sort.Ints(a.array)
+    f(a.array)
     return a
 }
 
-// Chunks an array into arrays with size elements.
+// RLockFunc locks reading by callback function <f>.
+func (a *SortedIntArray) RLockFunc(f func(array []int)) *SortedIntArray {
+    a.mu.RLock()
+    defer a.mu.RUnlock()
+    f(a.array)
+    return a
+}
+
+// Merge merges <array> into current array.
+// The parameter <array> can be any garray or slice type.
+// The difference between Merge and Append is Append supports only specified slice type,
+// but Merge supports more parameter types.
+func (a *SortedIntArray) Merge(array interface{}) *SortedIntArray {
+    switch v := array.(type) {
+        case *Array:             a.Add(gconv.Ints(v.Slice())...)
+        case *IntArray:          a.Add(gconv.Ints(v.Slice())...)
+        case *StringArray:       a.Add(gconv.Ints(v.Slice())...)
+        case *SortedArray:       a.Add(gconv.Ints(v.Slice())...)
+        case *SortedIntArray:    a.Add(gconv.Ints(v.Slice())...)
+        case *SortedStringArray: a.Add(gconv.Ints(v.Slice())...)
+        default:
+            a.Add(gconv.Ints(array)...)
+    }
+    return a
+}
+
+// Chunk splits an array into multiple arrays,
+// the size of each array is determined by <size>.
 // The last chunk may contain less than size elements.
-//
-// 将一个数组分割成多个数组，其中每个数组的单元数目由size决定。最后一个数组的单元数目可能会少于size个。
 func (a *SortedIntArray) Chunk(size int) [][]int {
     if size < 1 {
         return nil
@@ -438,12 +422,9 @@ func (a *SortedIntArray) Chunk(size int) [][]int {
     return n
 }
 
-// Extract a slice of the array(If in concurrent safe usage,
-// it returns a copy of the slice; else a pointer).
-// It returns the sequence of elements from the array array as specified
-// by the offset and length parameters.
-//
-// 返回根据offset和size参数所指定的数组中的一段序列。
+// SubSlice returns a slice of elements from the array as specified
+// by the <offset> and <size> parameters.
+// If in concurrent safe usage, it returns a copy of the slice; else a pointer.
 func (a *SortedIntArray) SubSlice(offset, size int) []int {
     a.mu.RLock()
     defer a.mu.RUnlock()
@@ -462,11 +443,15 @@ func (a *SortedIntArray) SubSlice(offset, size int) []int {
     }
 }
 
-// Picks one or more random entries out of an array(a copy),
-// and returns the key (or keys) of the random entries.
-//
-// 从数组中随机取出size个元素项，构成slice返回。
-func (a *SortedIntArray) Rand(size int) []int {
+// Rand randomly returns one item from array(no deleting).
+func (a *SortedIntArray) Rand() int {
+    a.mu.RLock()
+    defer a.mu.RUnlock()
+    return a.array[grand.Intn(len(a.array))]
+}
+
+// Rands randomly returns <size> items from array(no deleting).
+func (a *SortedIntArray) Rands(size int) []int {
     a.mu.RLock()
     defer a.mu.RUnlock()
     if size > len(a.array) {
@@ -482,11 +467,34 @@ func (a *SortedIntArray) Rand(size int) []int {
     return n
 }
 
-// Join array elements with a string.
-//
-// 使用glue字符串串连当前数组的元素项，构造成新的字符串返回。
+// Join joins array elements with a string <glue>.
 func (a *SortedIntArray) Join(glue string) string {
     a.mu.RLock()
     defer a.mu.RUnlock()
-    return strings.Join(gconv.Strings(a.array), glue)
+    buffer := bytes.NewBuffer(nil)
+    for k, v := range a.array {
+        buffer.WriteString(gconv.String(v))
+        if k != len(a.array) - 1 {
+            buffer.WriteString(glue)
+        }
+    }
+    return buffer.String()
+}
+
+// CountValues counts the number of occurrences of all values in the array.
+func (a *SortedIntArray) CountValues() map[int]int {
+	m := make(map[int]int)
+	a.mu.RLock()
+	defer a.mu.RUnlock()
+	for _, v := range a.array {
+		m[v]++
+	}
+	return m
+}
+
+// String returns current array as a string.
+func (a *SortedIntArray) String() string {
+	a.mu.RLock()
+	defer a.mu.RUnlock()
+	return fmt.Sprint(a.array)
 }

g/container/garray/garray_sorted_interface.go

@@ -7,45 +7,37 @@
 package garray
 
 import (
-    "github.com/gogf/gf/g/container/gtype"
+    "bytes"
+	"fmt"
+	"github.com/gogf/gf/g/container/gtype"
     "github.com/gogf/gf/g/internal/rwmutex"
     "github.com/gogf/gf/g/util/gconv"
     "github.com/gogf/gf/g/util/grand"
     "math"
     "sort"
-    "strings"
 )
 
-// 默认按照从小到大进行排序
+// It's using increasing order in default.
 type SortedArray struct {
-    mu          *rwmutex.RWMutex             // 互斥锁
-    array       []interface{}                // 底层数组
-    unique      *gtype.Bool                  // 是否要求不能重复
-    compareFunc func(v1, v2 interface{}) int // 比较函数，返回值 -1: v1 < v2；0: v1 == v2；1: v1 > v2
+    mu          *rwmutex.RWMutex
+    array       []interface{}
+    unique      *gtype.Bool                  // Whether enable unique feature(false)
+    compareFunc func(v1, v2 interface{}) int // Comparison function(it returns -1: v1 < v2; 0: v1 == v2; 1: v1 > v2)
 }
 
-// Create an empty sorted array.
-// The param <unsafe> used to specify whether using array with un-concurrent-safety,
-// which is false in default, means concurrent-safe in default.
+// NewSortedArray creates and returns an empty sorted array.
+// The param <unsafe> used to specify whether using array with un-concurrent-safety, which is false in default.
 // The param <compareFunc> used to compare values to sort in array,
 // if it returns value < 0, means v1 < v2;
 // if it returns value = 0, means v1 = v2;
 // if it returns value > 0, means v1 > v2;
-//
-// 创建一个空的排序数组对象，参数unsafe用于指定是否用于非并发安全场景，默认为false，表示并发安全。
-// 参数compareFunc用于指定排序方法：
-// 如果返回值 < 0, 表示 v1 < v2;
-// 如果返回值 = 0, 表示 v1 = v2;
-// 如果返回值 > 0, 表示 v1 > v2;
 func NewSortedArray(compareFunc func(v1, v2 interface{}) int, unsafe...bool) *SortedArray {
     return NewSortedArraySize(0, compareFunc, unsafe...)
 }
 
-// Create a sorted array with given size and cap.
+// NewSortedArraySize create and returns an sorted array with given size and cap.
 // The param <unsafe> used to specify whether using array with un-concurrent-safety,
-// which is false in default, means concurrent-safe in default.
-//
-// 创建一个指定大小的排序数组对象，参数unsafe用于指定是否用于非并发安全场景，默认为false，表示并发安全。
+// which is false in default.
 func NewSortedArraySize(cap int, compareFunc func(v1, v2 interface{}) int, unsafe...bool) *SortedArray {
     return &SortedArray{
         mu          : rwmutex.New(unsafe...),
@@ -55,11 +47,9 @@ func NewSortedArraySize(cap int, compareFunc func(v1, v2 interface{}) int, unsaf
     }
 }
 
-// Create an array with given slice <array>.
+// NewSortedArrayFrom creates and returns an sorted array with given slice <array>.
 // The param <unsafe> used to specify whether using array with un-concurrent-safety,
-// which is false in default, means concurrent-safe in default.
-//
-// 通过给定的slice变量创建排序数组对象，参数unsafe用于指定是否用于非并发安全场景，默认为false，表示并发安全。
+// which is false in default.
 func NewSortedArrayFrom(array []interface{}, compareFunc func(v1, v2 interface{}) int, unsafe...bool) *SortedArray {
     a := NewSortedArraySize(0, compareFunc, unsafe...)
     a.array = array
@@ -69,9 +59,19 @@ func NewSortedArrayFrom(array []interface{}, compareFunc func(v1, v2 interface{}
     return a
 }
 
-// Set the underlying slice array with the given <array> param.
-//
-// 设置底层数组变量.
+// NewSortedArrayFromCopy creates and returns an sorted array from a copy of given slice <array>.
+// The param <unsafe> used to specify whether using array with un-concurrent-safety,
+// which is false in default.
+func NewSortedArrayFromCopy(array []interface{}, unsafe...bool) *SortedArray {
+    newArray := make([]interface{}, len(array))
+    copy(newArray, array)
+    return &SortedArray{
+        mu    : rwmutex.New(unsafe...),
+        array : newArray,
+    }
+}
+
+// SetArray sets the underlying slice array with the given <array>.
 func (a *SortedArray) SetArray(array []interface{}) *SortedArray {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -82,9 +82,9 @@ func (a *SortedArray) SetArray(array []interface{}) *SortedArray {
     return a
 }
 
-// Sort the array by comparing function.
-//
-// 将数组按照比较方法进行排序.
+// Sort sorts the array in increasing order.
+// The param <reverse> controls whether sort
+// in increasing order(default) or decreasing order
 func (a *SortedArray) Sort() *SortedArray {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -94,9 +94,7 @@ func (a *SortedArray) Sort() *SortedArray {
     return a
 }
 
-// And values to sorted array, the array always keeps sorted.
-//
-// 添加数据项.
+// Add adds one or multiple values to sorted array, the array always keeps sorted.
 func (a *SortedArray) Add(values...interface{}) *SortedArray {
     if len(values) == 0 {
         return a
@@ -112,7 +110,6 @@ func (a *SortedArray) Add(values...interface{}) *SortedArray {
             a.array = append(a.array, value)
             continue
         }
-        // 加到指定索引后面
         if cmp > 0 {
             index++
         }
@@ -123,9 +120,8 @@ func (a *SortedArray) Add(values...interface{}) *SortedArray {
     return a
 }
 
-// Get value by index.
-//
-// 获取指定索引的数据项, 调用方注意判断数组边界。
+// Get returns the value of the specified index,
+// the caller should notice the boundary of the array.
 func (a *SortedArray) Get(index int) interface{} {
     a.mu.RLock()
     defer a.mu.RUnlock()
@@ -133,13 +129,11 @@ func (a *SortedArray) Get(index int) interface{} {
     return value
 }
 
-// Remove an item by index.
-//
-// 删除指定索引的数据项, 调用方注意判断数组边界。
+// Remove removes an item by index.
 func (a *SortedArray) Remove(index int) interface{} {
     a.mu.Lock()
     defer a.mu.Unlock()
-    // 边界删除判断，以提高删除效率
+	// Determine array boundaries when deleting to improve deletion efficiency.
     if index == 0 {
         value  := a.array[0]
         a.array = a.array[1 : ]
@@ -149,15 +143,15 @@ func (a *SortedArray) Remove(index int) interface{} {
         a.array = a.array[: index]
         return value
     }
-    // 如果非边界删除，会涉及到数组创建，那么删除的效率差一些
+	// If it is a non-boundary delete,
+	// it will involve the creation of an array,
+	// then the deletion is less efficient.
     value  := a.array[index]
     a.array = append(a.array[ : index], a.array[index + 1 : ]...)
     return value
 }
 
-// Push new items to the beginning of array.
-//
-// 将数据项添加到数组的最左端(索引为0)。
+// PopLeft pops and returns an item from the beginning of array.
 func (a *SortedArray) PopLeft() interface{} {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -166,9 +160,7 @@ func (a *SortedArray) PopLeft() interface{} {
     return value
 }
 
-// Push new items to the end of array.
-//
-// 将数据项添加到数组的最右端(索引为length - 1)。
+// PopRight pops and returns an item from the end of array.
 func (a *SortedArray) PopRight() interface{} {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -178,16 +170,28 @@ func (a *SortedArray) PopRight() interface{} {
     return value
 }
 
-// Pop an random item from array.
-//
-// 随机将一个数据项移出数组，并返回该数据项。
+// PopRand randomly pops and return an item out of array.
 func (a *SortedArray) PopRand() interface{} {
     return a.Remove(grand.Intn(len(a.array)))
 }
 
-// Pop <size> items from the beginning of array.
-//
-// 将最左端(首部)的size个数据项移出数组，并返回该数据项
+// PopRands randomly pops and returns <size> items out of array.
+func (a *SortedArray) PopRands(size int) []interface{} {
+    a.mu.Lock()
+    defer a.mu.Unlock()
+    if size > len(a.array) {
+        size = len(a.array)
+    }
+    array := make([]interface{}, size)
+    for i := 0; i < size; i++ {
+        index   := grand.Intn(len(a.array))
+        array[i] = a.array[index]
+        a.array  = append(a.array[ : index], a.array[index + 1 : ]...)
+    }
+    return array
+}
+
+// PopLefts pops and returns <size> items from the beginning of array.
 func (a *SortedArray) PopLefts(size int) []interface{} {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -200,9 +204,7 @@ func (a *SortedArray) PopLefts(size int) []interface{} {
     return value
 }
 
-// Pop <size> items from the end of array.
-//
-// 将最右端(尾部)的size个数据项移出数组，并返回该数据项
+// PopRights pops and returns <size> items from the end of array.
 func (a *SortedArray) PopRights(size int) []interface{} {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -215,11 +217,9 @@ func (a *SortedArray) PopRights(size int) []interface{} {
     return value
 }
 
-// Get items by range, returns array[start:end].
-// Be aware that, if in concurrent-safe usage, it returns a copy of slice;
+// Range picks and returns items by range, like array[start:end].
+// Notice, if in concurrent-safe usage, it returns a copy of slice;
 // else a pointer to the underlying data.
-//
-// 将最右端(尾部)的size个数据项移出数组，并返回该数据项
 func (a *SortedArray) Range(start, end int) []interface{} {
     a.mu.RLock()
     defer a.mu.RUnlock()
@@ -245,9 +245,7 @@ func (a *SortedArray) Range(start, end int) []interface{} {
     return array
 }
 
-// Calculate the sum of values in an array.
-//
-// 对数组中的元素项求和(将元素值转换为int类型后叠加)。
+// Sum returns the sum of values in an array.
 func (a *SortedArray) Sum() (sum int) {
     a.mu.RLock()
     defer a.mu.RUnlock()
@@ -257,9 +255,7 @@ func (a *SortedArray) Sum() (sum int) {
     return
 }
 
-// Get the length of array.
-//
-// 数组长度。
+// Len returns the length of array.
 func (a *SortedArray) Len() int {
     a.mu.RLock()
     length := len(a.array)
@@ -267,11 +263,9 @@ func (a *SortedArray) Len() int {
     return length
 }
 
-// Get the underlying data of array.
-// Be aware that, if in concurrent-safe usage, it returns a copy of slice;
+// Slice returns the underlying data of array.
+// Notice, if in concurrent-safe usage, it returns a copy of slice;
 // else a pointer to the underlying data.
-//
-// 返回原始数据数组.
 func (a *SortedArray) Slice() []interface{} {
     array := ([]interface{})(nil)
     if a.mu.IsSafe() {
@@ -285,25 +279,19 @@ func (a *SortedArray) Slice() []interface{} {
     return array
 }
 
-// Check whether a value exists in the array.
-//
-// 查找指定数值是否存在。
+// Contains checks whether a value exists in the array.
 func (a *SortedArray) Contains(value interface{}) bool {
     return a.Search(value) == 0
 }
 
-// Search array by <value>, returns the index of <value>, returns -1 if not exists.
-//
-// 查找指定数值的索引位置，返回索引位置，如果查找不到则返回-1。
+// Search searches array by <value>, returns the index of <value>,
+// or returns -1 if not exists.
 func (a *SortedArray) Search(value interface{}) (index int) {
     index, _ = a.binSearch(value, true)
     return
 }
 
 // Binary search.
-//
-// 二分查找。查找指定数值的索引位置，返回索引位置(具体匹配位置或者最后对比位置)及查找结果
-// 返回值: 最后比较位置, 比较结果。
 func (a *SortedArray) binSearch(value interface{}, lock bool)(index int, result int) {
     if len(a.array) == 0 {
         return -1, -2
@@ -329,11 +317,9 @@ func (a *SortedArray) binSearch(value interface{}, lock bool)(index int, result
     return mid, cmp
 }
 
-// Set unique mark to the array,
+// SetUnique sets unique mark to the array,
 // which means it does not contain any repeated items.
 // It also do unique check, remove all repeated items.
-//
-// 设置是否允许数组唯一.
 func (a *SortedArray) SetUnique(unique bool) *SortedArray {
     oldUnique := a.unique.Val()
     a.unique.Set(unique)
@@ -343,9 +329,7 @@ func (a *SortedArray) SetUnique(unique bool) *SortedArray {
     return a
 }
 
-// Do unique check, remove all repeated items.
-//
-// 清理数组中重复的元素项.
+// Unique uniques the array, clear repeated items.
 func (a *SortedArray) Unique() *SortedArray {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -363,9 +347,7 @@ func (a *SortedArray) Unique() *SortedArray {
     return a
 }
 
-// Return a new array, which is a copy of current array.
-//
-// 克隆当前数组，返回当前数组的一个拷贝。
+// Clone returns a new array, which is a copy of current array.
 func (a *SortedArray) Clone() (newArray *SortedArray) {
     a.mu.RLock()
     array := make([]interface{}, len(a.array))
@@ -374,9 +356,7 @@ func (a *SortedArray) Clone() (newArray *SortedArray) {
     return NewSortedArrayFrom(array, a.compareFunc, !a.mu.IsSafe())
 }
 
-// Clear array.
-//
-// 清空数据数组。
+// Clear deletes all items of current array.
 func (a *SortedArray) Clear() *SortedArray {
     a.mu.Lock()
     if len(a.array) > 0 {
@@ -386,47 +366,43 @@ func (a *SortedArray) Clear() *SortedArray {
     return a
 }
 
-// Lock writing by callback function f.
-//
-// 使用自定义方法执行加锁修改操作。
+// LockFunc locks writing by callback function <f>.
 func (a *SortedArray) LockFunc(f func(array []interface{})) *SortedArray {
-    a.mu.Lock(true)
-    defer a.mu.Unlock(true)
-    f(a.array)
-    return a
-}
-
-// Lock reading by callback function f.
-//
-// 使用自定义方法执行加锁读取操作。
-func (a *SortedArray) RLockFunc(f func(array []interface{})) *SortedArray {
-    a.mu.RLock(true)
-    defer a.mu.RUnlock(true)
-    f(a.array)
-    return a
-}
-
-// Merge two arrays.
-//
-// 合并两个数组.
-func (a *SortedArray) Merge(array *SortedArray) *SortedArray {
     a.mu.Lock()
     defer a.mu.Unlock()
-    if a != array {
-        array.mu.RLock()
-        defer array.mu.RUnlock()
-    }
-    a.array = append(a.array, array.array...)
-    sort.Slice(a.array, func(i, j int) bool {
-        return a.compareFunc(a.array[i], a.array[j]) < 0
-    })
+    f(a.array)
     return a
 }
 
-// Chunks an array into arrays with size elements.
+// RLockFunc locks reading by callback function <f>.
+func (a *SortedArray) RLockFunc(f func(array []interface{})) *SortedArray {
+    a.mu.RLock()
+    defer a.mu.RUnlock()
+    f(a.array)
+    return a
+}
+
+// Merge merges <array> into current array.
+// The parameter <array> can be any garray or slice type.
+// The difference between Merge and Append is Append supports only specified slice type,
+// but Merge supports more parameter types.
+func (a *SortedArray) Merge(array interface{}) *SortedArray {
+    switch v := array.(type) {
+        case *Array:             a.Add(gconv.Interfaces(v.Slice())...)
+        case *IntArray:          a.Add(gconv.Interfaces(v.Slice())...)
+        case *StringArray:       a.Add(gconv.Interfaces(v.Slice())...)
+        case *SortedArray:       a.Add(gconv.Interfaces(v.Slice())...)
+        case *SortedIntArray:    a.Add(gconv.Interfaces(v.Slice())...)
+        case *SortedStringArray: a.Add(gconv.Interfaces(v.Slice())...)
+        default:
+            a.Add(gconv.Interfaces(array)...)
+    }
+    return a
+}
+
+// Chunk splits an array into multiple arrays,
+// the size of each array is determined by <size>.
 // The last chunk may contain less than size elements.
-//
-// 将一个数组分割成多个数组，其中每个数组的单元数目由size决定。最后一个数组的单元数目可能会少于size个。
 func (a *SortedArray) Chunk(size int) [][]interface{} {
     if size < 1 {
         return nil
@@ -447,12 +423,9 @@ func (a *SortedArray) Chunk(size int) [][]interface{} {
     return n
 }
 
-// Extract a slice of the array(If in concurrent safe usage,
-// it returns a copy of the slice; else a pointer).
-// It returns the sequence of elements from the array array as specified
-// by the offset and length parameters.
-//
-// 返回根据offset和size参数所指定的数组中的一段序列。
+// SubSlice returns a slice of elements from the array as specified
+// by the <offset> and <size> parameters.
+// If in concurrent safe usage, it returns a copy of the slice; else a pointer.
 func (a *SortedArray) SubSlice(offset, size int) []interface{} {
     a.mu.RLock()
     defer a.mu.RUnlock()
@@ -471,11 +444,15 @@ func (a *SortedArray) SubSlice(offset, size int) []interface{} {
     }
 }
 
-// Picks one or more random entries out of an array(a copy),
-// and returns the key (or keys) of the random entries.
-//
-// 从数组中随机取出size个元素项，构成slice返回。
-func (a *SortedArray) Rand(size int) []interface{} {
+// Rand randomly returns one item from array(no deleting).
+func (a *SortedArray) Rand() interface{} {
+    a.mu.RLock()
+    defer a.mu.RUnlock()
+    return a.array[grand.Intn(len(a.array))]
+}
+
+// Rands randomly returns <size> items from array(no deleting).
+func (a *SortedArray) Rands(size int) []interface{} {
     a.mu.RLock()
     defer a.mu.RUnlock()
     if size > len(a.array) {
@@ -491,11 +468,34 @@ func (a *SortedArray) Rand(size int) []interface{} {
     return n
 }
 
-// Join array elements with a string.
-//
-// 使用glue字符串串连当前数组的元素项，构造成新的字符串返回。
+// Join joins array elements with a string <glue>.
 func (a *SortedArray) Join(glue string) string {
     a.mu.RLock()
     defer a.mu.RUnlock()
-    return strings.Join(gconv.Strings(a.array), glue)
+    buffer := bytes.NewBuffer(nil)
+    for k, v := range a.array {
+        buffer.WriteString(gconv.String(v))
+        if k != len(a.array) - 1 {
+            buffer.WriteString(glue)
+        }
+    }
+    return buffer.String()
+}
+
+// CountValues counts the number of occurrences of all values in the array.
+func (a *SortedArray) CountValues() map[interface{}]int {
+	m := make(map[interface{}]int)
+	a.mu.RLock()
+	defer a.mu.RUnlock()
+	for _, v := range a.array {
+		m[v]++
+	}
+	return m
+}
+
+// String returns current array as a string.
+func (a *SortedArray) String() string {
+	a.mu.RLock()
+	defer a.mu.RUnlock()
+	return fmt.Sprint(a.array)
 }

g/container/garray/garray_sorted_string.go

@@ -7,7 +7,9 @@
 package garray
 
 import (
-    "github.com/gogf/gf/g/container/gtype"
+    "bytes"
+	"fmt"
+	"github.com/gogf/gf/g/container/gtype"
     "github.com/gogf/gf/g/internal/rwmutex"
     "github.com/gogf/gf/g/util/gconv"
     "github.com/gogf/gf/g/util/grand"
@@ -16,28 +18,24 @@ import (
     "strings"
 )
 
-// 默认按照从小到大进行排序
+// It's using increasing order in default.
 type SortedStringArray struct {
-    mu          *rwmutex.RWMutex        // 互斥锁
-    array       []string                // 底层数组
-    unique      *gtype.Bool             // 是否要求不能重复
-    compareFunc func(v1, v2 string) int // 比较函数，返回值 -1: v1 < v2；0: v1 == v2；1: v1 > v2
+    mu          *rwmutex.RWMutex
+    array       []string
+    unique      *gtype.Bool             // Whether enable unique feature(false)
+    compareFunc func(v1, v2 string) int // Comparison function(it returns -1: v1 < v2; 0: v1 == v2; 1: v1 > v2)
 }
 
-// Create an empty sorted array.
-// The param <unsafe> used to specify whether using array with un-concurrent-safety,
-// which is false in default, means concurrent-safe in default.
-//
-// 创建一个空的排序数组对象，参数unsafe用于指定是否用于非并发安全场景，默认为false，表示并发安全。
+// NewSortedStringArray creates and returns an empty sorted array.
+// The param <unsafe> used to specify whether using array in un-concurrent-safety,
+// which is false in default.
 func NewSortedStringArray(unsafe...bool) *SortedStringArray {
     return NewSortedStringArraySize(0, unsafe...)
 }
 
-// Create a sorted array with given size and cap.
+// NewSortedStringArraySize create and returns an sorted array with given size and cap.
 // The param <unsafe> used to specify whether using array with un-concurrent-safety,
-// which is false in default, means concurrent-safe in default.
-//
-// 创建一个指定大小的排序数组对象，参数unsafe用于指定是否用于非并发安全场景，默认为false，表示并发安全。
+// which is false in default.
 func NewSortedStringArraySize(cap int, unsafe...bool) *SortedStringArray {
     return &SortedStringArray {
         mu          : rwmutex.New(unsafe...),
@@ -49,11 +47,9 @@ func NewSortedStringArraySize(cap int, unsafe...bool) *SortedStringArray {
     }
 }
 
-// Create an array with given slice <array>.
+// NewSortedStringArrayFrom creates and returns an sorted array with given slice <array>.
 // The param <unsafe> used to specify whether using array with un-concurrent-safety,
-// which is false in default, means concurrent-safe in default.
-//
-// 通过给定的slice变量创建排序数组对象，参数unsafe用于指定是否用于非并发安全场景，默认为false，表示并发安全。
+// which is false in default.
 func NewSortedStringArrayFrom(array []string, unsafe...bool) *SortedStringArray {
     a := NewSortedStringArraySize(0, unsafe...)
     a.array = array
@@ -61,9 +57,19 @@ func NewSortedStringArrayFrom(array []string, unsafe...bool) *SortedStringArray
     return a
 }
 
-// Set the underlying slice array with the given <array> param.
-//
-// 设置底层数组变量.
+// NewSortedStringArrayFromCopy creates and returns an sorted array from a copy of given slice <array>.
+// The param <unsafe> used to specify whether using array with un-concurrent-safety,
+// which is false in default.
+func NewSortedStringArrayFromCopy(array []string, unsafe...bool) *SortedStringArray {
+    newArray := make([]string, len(array))
+    copy(newArray, array)
+    return &SortedStringArray{
+        mu    : rwmutex.New(unsafe...),
+        array : newArray,
+    }
+}
+
+// SetArray sets the underlying slice array with the given <array>.
 func (a *SortedStringArray) SetArray(array []string) *SortedStringArray {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -72,9 +78,9 @@ func (a *SortedStringArray) SetArray(array []string) *SortedStringArray {
     return a
 }
 
-// Sort the array in increasing order.
-//
-// 将数组排序(默认从低到高).
+// Sort sorts the array in increasing order.
+// The param <reverse> controls whether sort
+// in increasing order(default) or decreasing order.
 func (a *SortedStringArray) Sort() *SortedStringArray {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -82,9 +88,7 @@ func (a *SortedStringArray) Sort() *SortedStringArray {
     return a
 }
 
-// And values to sorted array, the array always keeps sorted.
-//
-// 添加数据项.
+// Add adds one or multiple values to sorted array, the array always keeps sorted.
 func (a *SortedStringArray) Add(values...string) *SortedStringArray {
     if len(values) == 0 {
         return a
@@ -100,7 +104,6 @@ func (a *SortedStringArray) Add(values...string) *SortedStringArray {
             a.array = append(a.array, value)
             continue
         }
-        // 加到指定索引后面
         if cmp > 0 {
             index++
         }
@@ -111,9 +114,8 @@ func (a *SortedStringArray) Add(values...string) *SortedStringArray {
     return a
 }
 
-// Get value by index.
-//
-// 获取指定索引的数据项, 调用方注意判断数组边界。
+// Get returns the value of the specified index,
+// the caller should notice the boundary of the array.
 func (a *SortedStringArray) Get(index int) string {
     a.mu.RLock()
     defer a.mu.RUnlock()
@@ -121,13 +123,11 @@ func (a *SortedStringArray) Get(index int) string {
     return value
 }
 
-// Remove an item by index.
-//
-// 删除指定索引的数据项, 调用方注意判断数组边界。
+// Remove removes an item by index.
 func (a *SortedStringArray) Remove(index int) string {
     a.mu.Lock()
     defer a.mu.Unlock()
-    // 边界删除判断，以提高删除效率
+    // Determine array boundaries when deleting to improve deletion efficiency.
     if index == 0 {
         value  := a.array[0]
         a.array = a.array[1 : ]
@@ -137,15 +137,15 @@ func (a *SortedStringArray) Remove(index int) string {
         a.array = a.array[: index]
         return value
     }
-    // 如果非边界删除，会涉及到数组创建，那么删除的效率差一些
+	// If it is a non-boundary delete,
+	// it will involve the creation of an array,
+	// then the deletion is less efficient.
     value  := a.array[index]
     a.array = append(a.array[ : index], a.array[index + 1 : ]...)
     return value
 }
 
-// Push new items to the beginning of array.
-//
-// 将数据项添加到数组的最左端(索引为0)。
+// PopLeft pops and returns an item from the beginning of array.
 func (a *SortedStringArray) PopLeft() string {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -154,9 +154,7 @@ func (a *SortedStringArray) PopLeft() string {
     return value
 }
 
-// Push new items to the end of array.
-//
-// 将数据项添加到数组的最右端(索引为length - 1)。
+// PopRight pops and returns an item from the end of array.
 func (a *SortedStringArray) PopRight() string {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -166,16 +164,28 @@ func (a *SortedStringArray) PopRight() string {
     return value
 }
 
-// Pop an random item from array.
-//
-// 随机将一个数据项移出数组，并返回该数据项。
+// PopRand randomly pops and return an item out of array.
 func (a *SortedStringArray) PopRand() string {
     return a.Remove(grand.Intn(len(a.array)))
 }
 
-// Pop <size> items from the beginning of array.
-//
-// 将最左端(首部)的size个数据项移出数组，并返回该数据项
+// PopRands randomly pops and returns <size> items out of array.
+func (a *SortedStringArray) PopRands(size int) []string {
+    a.mu.Lock()
+    defer a.mu.Unlock()
+    if size > len(a.array) {
+        size = len(a.array)
+    }
+    array := make([]string, size)
+    for i := 0; i < size; i++ {
+        index   := grand.Intn(len(a.array))
+        array[i] = a.array[index]
+        a.array  = append(a.array[ : index], a.array[index + 1 : ]...)
+    }
+    return array
+}
+
+// PopLefts pops and returns <size> items from the beginning of array.
 func (a *SortedStringArray) PopLefts(size int) []string {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -188,9 +198,7 @@ func (a *SortedStringArray) PopLefts(size int) []string {
     return value
 }
 
-// Pop <size> items from the end of array.
-//
-// 将最右端(尾部)的size个数据项移出数组，并返回该数据项
+// PopRights pops and returns <size> items from the end of array.
 func (a *SortedStringArray) PopRights(size int) []string {
     a.mu.Lock()
     defer a.mu.Unlock()
@@ -203,11 +211,9 @@ func (a *SortedStringArray) PopRights(size int) []string {
     return value
 }
 
-// Get items by range, returns array[start:end].
-// Be aware that, if in concurrent-safe usage, it returns a copy of slice;
+// Range picks and returns items by range, like array[start:end].
+// Notice, if in concurrent-safe usage, it returns a copy of slice;
 // else a pointer to the underlying data.
-//
-// 将最右端(尾部)的size个数据项移出数组，并返回该数据项
 func (a *SortedStringArray) Range(start, end int) []string {
     a.mu.RLock()
     defer a.mu.RUnlock()
@@ -233,9 +239,7 @@ func (a *SortedStringArray) Range(start, end int) []string {
     return array
 }
 
-// Calculate the sum of values in an array.
-//
-// 对数组中的元素项求和(将元素值转换为int类型后叠加)。
+// Sum returns the sum of values in an array.
 func (a *SortedStringArray) Sum() (sum int) {
     a.mu.RLock()
     defer a.mu.RUnlock()
@@ -245,9 +249,7 @@ func (a *SortedStringArray) Sum() (sum int) {
     return
 }
 
-// Get the length of array.
-//
-// 数组长度。
+// Len returns the length of array.
 func (a *SortedStringArray) Len() int {
     a.mu.RLock()
     length := len(a.array)
@@ -255,11 +257,9 @@ func (a *SortedStringArray) Len() int {
     return length
 }
 
-// Get the underlying data of array.
-// Be aware that, if in concurrent-safe usage, it returns a copy of slice;
+// Slice returns the underlying data of array.
+// Notice, if in concurrent-safe usage, it returns a copy of slice;
 // else a pointer to the underlying data.
-//
-// 返回原始数据数组.
 func (a *SortedStringArray) Slice() []string {
     array := ([]string)(nil)
     if a.mu.IsSafe() {
@@ -273,24 +273,19 @@ func (a *SortedStringArray) Slice() []string {
     return array
 }
 
-// Check whether a value exists in the array.
-//
-// 查找指定数值是否存在。
+// Contains checks whether a value exists in the array.
 func (a *SortedStringArray) Contains(value string) bool {
     return a.Search(value) == 0
 }
 
-// Search array by <value>, returns the index of <value>, returns -1 if not exists.
-//
-// 查找指定数值的索引位置，返回索引位置，如果查找不到则返回-1。
+// Search searches array by <value>, returns the index of <value>,
+// or returns -1 if not exists.
 func (a *SortedStringArray) Search(value string) (index int) {
     index, _ = a.binSearch(value, true)
     return
 }
 
 // Binary search.
-//
-// 二分查找.
 func (a *SortedStringArray) binSearch(value string, lock bool) (index int, result int) {
     if len(a.array) == 0 {
         return -1, -2
@@ -316,11 +311,9 @@ func (a *SortedStringArray) binSearch(value string, lock bool) (index int, resul
     return mid, cmp
 }
 
-// Set unique mark to the array,
+// SetUnique sets unique mark to the array,
 // which means it does not contain any repeated items.
 // It also do unique check, remove all repeated items.
-//
-// 设置是否允许数组唯一.
 func (a *SortedStringArray) SetUnique(unique bool) *SortedStringArray {
     oldUnique := a.unique.Val()
     a.unique.Set(unique)
@@ -330,9 +323,7 @@ func (a *SortedStringArray) SetUnique(unique bool) *SortedStringArray {
     return a
 }
 
-// Do unique check, remove all repeated items.
-//
-// 清理数组中重复的元素项.
+// Unique uniques the array, clear repeated items.
 func (a *SortedStringArray) Unique() *SortedStringArray {
     a.mu.Lock()
     i := 0
@@ -350,9 +341,7 @@ func (a *SortedStringArray) Unique() *SortedStringArray {
     return a
 }
 
-// Return a new array, which is a copy of current array.
-//
-// 克隆当前数组，返回当前数组的一个拷贝。
+// Clone returns a new array, which is a copy of current array.
 func (a *SortedStringArray) Clone() (newArray *SortedStringArray) {
     a.mu.RLock()
     array := make([]string, len(a.array))
@@ -361,9 +350,7 @@ func (a *SortedStringArray) Clone() (newArray *SortedStringArray) {
     return NewSortedStringArrayFrom(array, !a.mu.IsSafe())
 }
 
-// Clear array.
-//
-// 清空数据数组。
+// Clear deletes all items of current array.
 func (a *SortedStringArray) Clear() *SortedStringArray {
     a.mu.Lock()
     if len(a.array) > 0 {
@@ -373,45 +360,43 @@ func (a *SortedStringArray) Clear() *SortedStringArray {
     return a
 }
 
-// Lock writing by callback function f.
-//
-// 使用自定义方法执行加锁修改操作。
+// LockFunc locks writing by callback function <f>.
 func (a *SortedStringArray) LockFunc(f func(array []string)) *SortedStringArray {
-    a.mu.Lock(true)
-    defer a.mu.Unlock(true)
-    f(a.array)
-    return a
-}
-
-// Lock reading by callback function f.
-//
-// 使用自定义方法执行加锁读取操作。
-func (a *SortedStringArray) RLockFunc(f func(array []string)) *SortedStringArray {
-    a.mu.RLock(true)
-    defer a.mu.RUnlock(true)
-    f(a.array)
-    return a
-}
-
-// Merge two arrays.
-//
-// 合并两个数组.
-func (a *SortedStringArray) Merge(array *SortedStringArray) *SortedStringArray {
     a.mu.Lock()
     defer a.mu.Unlock()
-    if a != array {
-        array.mu.RLock()
-        defer array.mu.RUnlock()
-    }
-    a.array = append(a.array, array.array...)
-    sort.Strings(a.array)
+    f(a.array)
     return a
 }
 
-// Chunks an array into arrays with size elements.
+// RLockFunc locks reading by callback function <f>.
+func (a *SortedStringArray) RLockFunc(f func(array []string)) *SortedStringArray {
+    a.mu.RLock()
+    defer a.mu.RUnlock()
+    f(a.array)
+    return a
+}
+
+// Merge merges <array> into current array.
+// The parameter <array> can be any garray or slice type.
+// The difference between Merge and Append is Append supports only specified slice type,
+// but Merge supports more parameter types.
+func (a *SortedStringArray) Merge(array interface{}) *SortedStringArray {
+    switch v := array.(type) {
+        case *Array:             a.Add(gconv.Strings(v.Slice())...)
+        case *IntArray:          a.Add(gconv.Strings(v.Slice())...)
+        case *StringArray:       a.Add(gconv.Strings(v.Slice())...)
+        case *SortedArray:       a.Add(gconv.Strings(v.Slice())...)
+        case *SortedIntArray:    a.Add(gconv.Strings(v.Slice())...)
+        case *SortedStringArray: a.Add(gconv.Strings(v.Slice())...)
+        default:
+            a.Add(gconv.Strings(array)...)
+    }
+    return a
+}
+
+// Chunk splits an array into multiple arrays,
+// the size of each array is determined by <size>.
 // The last chunk may contain less than size elements.
-//
-// 将一个数组分割成多个数组，其中每个数组的单元数目由size决定。最后一个数组的单元数目可能会少于size个。
 func (a *SortedStringArray) Chunk(size int) [][]string {
     if size < 1 {
         return nil
@@ -432,12 +417,9 @@ func (a *SortedStringArray) Chunk(size int) [][]string {
     return n
 }
 
-// Extract a slice of the array(If in concurrent safe usage,
-// it returns a copy of the slice; else a pointer).
-// It returns the sequence of elements from the array array as specified
-// by the offset and length parameters.
-//
-// 返回根据offset和size参数所指定的数组中的一段序列。
+// SubSlice returns a slice of elements from the array as specified
+// by the <offset> and <size> parameters.
+// If in concurrent safe usage, it returns a copy of the slice; else a pointer.
 func (a *SortedStringArray) SubSlice(offset, size int) []string {
     a.mu.RLock()
     defer a.mu.RUnlock()
@@ -456,11 +438,15 @@ func (a *SortedStringArray) SubSlice(offset, size int) []string {
     }
 }
 
-// Picks one or more random entries out of an array(a copy),
-// and returns the key (or keys) of the random entries.
-//
-// 从数组中随机取出size个元素项，构成slice返回。
-func (a *SortedStringArray) Rand(size int) []string {
+// Rand randomly returns one item from array(no deleting).
+func (a *SortedStringArray) Rand() string {
+    a.mu.RLock()
+    defer a.mu.RUnlock()
+    return a.array[grand.Intn(len(a.array))]
+}
+
+// Rands randomly returns <size> items from array(no deleting).
+func (a *SortedStringArray) Rands(size int) []string {
     a.mu.RLock()
     defer a.mu.RUnlock()
     if size > len(a.array) {
@@ -476,11 +462,34 @@ func (a *SortedStringArray) Rand(size int) []string {
     return n
 }
 
-// Join array elements with a string.
-//
-// 使用glue字符串串连当前数组的元素项，构造成新的字符串返回。
+// Join joins array elements with a string <glue>.
 func (a *SortedStringArray) Join(glue string) string {
     a.mu.RLock()
     defer a.mu.RUnlock()
-    return strings.Join(a.array, glue)
+    buffer := bytes.NewBuffer(nil)
+    for k, v := range a.array {
+        buffer.WriteString(gconv.String(v))
+        if k != len(a.array) - 1 {
+            buffer.WriteString(glue)
+        }
+    }
+    return buffer.String()
+}
+
+// CountValues counts the number of occurrences of all values in the array.
+func (a *SortedStringArray) CountValues() map[string]int {
+	m := make(map[string]int)
+	a.mu.RLock()
+	defer a.mu.RUnlock()
+	for _, v := range a.array {
+		m[v]++
+	}
+	return m
+}
+
+// String returns current array as a string.
+func (a *SortedStringArray) String() string {
+	a.mu.RLock()
+	defer a.mu.RUnlock()
+	return fmt.Sprint(a.array)
 }

g/container/garray/garray_z_example_test.go

@@ -0,0 +1,111 @@
+// Copyright 2018 gf Author(https://github.com/gogf/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://github.com/gogf/gf.
+
+package garray_test
+
+import (
+    "fmt"
+    "github.com/gogf/gf/g/container/garray"
+)
+
+func Example_basic() {
+    // 创建普通的数组，默认并发安全(带锁)
+    a := garray.New()
+
+    // 添加数据项
+    for i := 0; i < 10; i++ {
+        a.Append(i)
+    }
+
+    // 获取当前数组长度
+    fmt.Println(a.Len())
+
+    // 获取当前数据项列表
+    fmt.Println(a.Slice())
+
+    // 获取指定索引项
+    fmt.Println(a.Get(6))
+
+    // 查找指定数据项是否存在
+    fmt.Println(a.Contains(6))
+    fmt.Println(a.Contains(100))
+
+    // 在指定索引前插入数据项
+    a.InsertAfter(9, 11)
+    // 在指定索引后插入数据项
+    a.InsertBefore(10, 10)
+
+    fmt.Println(a.Slice())
+
+    // 修改指定索引的数据项
+    a.Set(0, 100)
+    fmt.Println(a.Slice())
+
+    // 搜索数据项，返回搜索到的索引位置
+    fmt.Println(a.Search(5))
+
+    // 删除指定索引的数据项
+    a.Remove(0)
+    fmt.Println(a.Slice())
+
+    // 清空数组
+    fmt.Println(a.Slice())
+    a.Clear()
+    fmt.Println(a.Slice())
+
+    // Output:
+    // 10
+    // [0 1 2 3 4 5 6 7 8 9]
+    // 6
+    // true
+    // false
+    // [0 1 2 3 4 5 6 7 8 9 10 11]
+    // [100 1 2 3 4 5 6 7 8 9 10 11]
+    // 5
+    // [1 2 3 4 5 6 7 8 9 10 11]
+    // [1 2 3 4 5 6 7 8 9 10 11]
+    // []
+}
+
+func Example_rand() {
+    array := garray.NewFrom([]interface{}{1,2,3,4,5,6,7,8,9})
+    // 随机返回两个数据项(不删除)
+    fmt.Println(array.Rands(2))
+    fmt.Println(array.PopRand())
+}
+
+func Example_pop() {
+    array := garray.NewFrom([]interface{}{1,2,3,4,5,6,7,8,9})
+    fmt.Println(array.PopLeft())
+    fmt.Println(array.PopLefts(2))
+    fmt.Println(array.PopRight())
+    fmt.Println(array.PopRights(2))
+
+    // Output:
+    // 1
+    // [2 3]
+    // 9
+    // [7 8]
+}
+
+func Example_merge() {
+    array1 := garray.NewFrom([]interface{}{1,2})
+    array2 := garray.NewFrom([]interface{}{3,4})
+    slice1 := []interface{}{5,6}
+    slice2 := []int{7,8}
+    slice3 := []string{"9","0"}
+    fmt.Println(array1.Slice())
+    array1.Merge(array1)
+    array1.Merge(array2)
+    array1.Merge(slice1)
+    array1.Merge(slice2)
+    array1.Merge(slice3)
+    fmt.Println(array1.Slice())
+
+    // Output:
+    // [1 2]
+    // [1 2 1 2 3 4 5 6 7 8 9 0]
+}

g/container/garray/garray_z_unit_int_test.go

@@ -161,9 +161,18 @@ func TestIntArray_Rand(t *testing.T) {
     gtest.Case(t, func() {
         a1 := []int{0,1,2,3,4,5,6}
         array1 := garray.NewIntArrayFrom(a1)
-        gtest.Assert(len(array1.Rand(2)),  2)
-        gtest.Assert(len(array1.Rand(10)), 7)
-        gtest.AssertIN(array1.Rand(1)[0], a1)
+        gtest.Assert(len(array1.Rands(2)),  2)
+        gtest.Assert(len(array1.Rands(10)), 7)
+        gtest.AssertIN(array1.Rands(1)[0], a1)
+        gtest.AssertIN(array1.Rand(), a1)
+    })
+}
+
+func TestIntArray_PopRands(t *testing.T) {
+    gtest.Case(t, func() {
+        a1 := []interface{}{100, 200, 300, 400, 500, 600}
+        array := garray.NewFromCopy(a1)
+        gtest.AssertIN(array.PopRands(2), a1)
     })
 }
 

g/container/garray/garray_z_unit_interface_test.go

@@ -80,6 +80,14 @@ func TestArray_PushAndPop(t *testing.T) {
     })
 }
 
+func TestArray_PopRands(t *testing.T) {
+    gtest.Case(t, func() {
+        a1 := []interface{}{100, 200, 300, 400, 500, 600}
+        array := garray.NewFromCopy(a1)
+        gtest.AssertIN(array.PopRands(2), a1)
+    })
+}
+
 func TestArray_PopLeftsAndPopRights(t *testing.T) {
     gtest.Case(t, func() {
         value1 := []interface{}{0,1,2,3,4,5,6}
@@ -165,9 +173,9 @@ func TestArray_Rand(t *testing.T) {
     gtest.Case(t, func() {
         a1 := []interface{}{0,1,2,3,4,5,6}
         array1 := garray.NewArrayFrom(a1)
-        gtest.Assert(len(array1.Rand(2)),  2)
-        gtest.Assert(len(array1.Rand(10)), 7)
-        gtest.AssertIN(array1.Rand(1)[0], a1)
+        gtest.Assert(len(array1.Rands(2)),  2)
+        gtest.Assert(len(array1.Rands(10)), 7)
+        gtest.AssertIN(array1.Rands(1)[0], a1)
     })
 }
 

g/container/garray/garray_z_unit_string_test.go

@@ -162,9 +162,17 @@ func TestStringArray_Rand(t *testing.T) {
     gtest.Case(t, func() {
         a1 := []string{"0","1","2","3","4","5","6"}
         array1 := garray.NewStringArrayFrom(a1)
-        gtest.Assert(len(array1.Rand(2)),  "2")
-        gtest.Assert(len(array1.Rand(10)), "7")
-        gtest.AssertIN(array1.Rand(1)[0], a1)
+        gtest.Assert(len(array1.Rands(2)),  "2")
+        gtest.Assert(len(array1.Rands(10)), "7")
+        gtest.AssertIN(array1.Rands(1)[0], a1)
+    })
+}
+
+func TestStringArray_PopRands(t *testing.T) {
+    gtest.Case(t, func() {
+        a1 := []interface{}{"100", "200", "300", "400", "500", "600"}
+        array := garray.NewFromCopy(a1)
+        gtest.AssertIN(array.PopRands(2), a1)
     })
 }
 

g/container/gchan/gchan.go

@@ -4,9 +4,9 @@
 // If a copy of the MIT was not distributed with this file,
 // You can obtain one at https://github.com/gogf/gf.
 
-// Package gchan provides graceful operations for channel.
+// Package gchan provides graceful channel for safe operations.
 //
-// 优雅的Channel操作.
+// It's safe to call Chan.Push/Close functions repeatedly.
 package gchan
 
 import (
@@ -15,39 +15,48 @@ import (
 )
 
 type Chan struct {
-    list   chan interface{}
-    closed *gtype.Bool
+    channel chan interface{}
+    closed  *gtype.Bool
 }
 
+// New creates a graceful channel with given limit.
 func New(limit int) *Chan {
     return &Chan {
-        list   : make(chan interface{}, limit),
-        closed : gtype.NewBool(),
+	    channel : make(chan interface{}, limit),
+        closed  : gtype.NewBool(),
     }
 }
 
-// 将数据压入队列
-func (q *Chan) Push(v interface{}) error {
-    if q.closed.Val() {
+// Push pushes <value> to channel.
+// It is safe to be called repeatedly.
+func (c *Chan) Push(value interface{}) error {
+    if c.closed.Val() {
         return errors.New("closed")
     }
-    q.list <- v
+    c.channel <- value
     return nil
 }
 
-// 先进先出地从队列取出一项数据，当没有数据可获取时，阻塞等待
-func (q *Chan) Pop() interface{} {
-    return <- q.list
+// Pop pops value from channel.
+// If there's no value in channel, it would block to wait.
+func (c *Chan) Pop() interface{} {
+    return <- c.channel
 }
 
-// 关闭队列(通知所有通过Pop阻塞的协程退出)
-func (q *Chan) Close() {
-    if !q.closed.Set(true) {
-        close(q.list)
+// Close closes the channel.
+// It is safe to be called repeatedly.
+func (c *Chan) Close() {
+    if !c.closed.Set(true) {
+        close(c.channel)
     }
 }
 
-// 获取当前队列大小
-func (q *Chan) Size() int {
-    return len(q.list)
+// See Len.
+func (c *Chan) Size() int {
+    return c.Len()
+}
+
+// Len returns the length of the channel.
+func (c *Chan) Len() int {
+	return len(c.channel)
 }

g/container/glist/glist.go

@@ -5,9 +5,7 @@
 // You can obtain one at https://github.com/gogf/gf.
 //
 
-// Package glist provides a concurrent-safe(alternative) doubly linked list.
-//
-// 并发安全双向链表.
+// Package glist provides a concurrent-safe/unsafe doubly linked list.
 package glist
 
 import (
@@ -15,14 +13,14 @@ import (
     "github.com/gogf/gf/g/internal/rwmutex"
 )
 
-// 变长双向链表
-type List struct {
-    mu     *rwmutex.RWMutex
-    list   *list.List
-}
-
-type Element = list.Element
+type (
+	List struct {
+	    mu   *rwmutex.RWMutex
+	    list *list.List
+	}
 
+	Element = list.Element
+)
 
 // 获得一个变长链表指针
 func New(unsafe...bool) *List {
@@ -291,6 +289,10 @@ func (l *List) RemoveAll() {
     l.mu.Unlock()
 }
 
+func (l *List) Clear() {
+	l.RemoveAll()
+}
+
 // 读锁操作
 func (l *List) RLockFunc(f func(list *list.List)) {
     l.mu.RLock()

g/container/gmap/gmap.go

@@ -4,46 +4,34 @@
 // If a copy of the MIT was not distributed with gm file,
 // You can obtain one at https://github.com/gogf/gf.
 
-// Package gmap provides kinds of concurrent-safe(alternative) maps.
-//
-// 并发安全MAP.
+// Package gmap provides concurrent-safe/unsafe maps.
 package gmap
 
 import "github.com/gogf/gf/g/internal/rwmutex"
 
-// 注意:
-// 1、这个Map是所有并发安全Map中效率最低的，如果对效率要求比较高的场合，请合理选择对应数据类型的Map；
-// 2、这个Map的优点是使用简便，由于键值都是interface{}类型，因此对键值的数据类型要求不高；
-// 3、底层实现比较类似于sync.Map；
 type Map struct {
     mu *rwmutex.RWMutex
     m  map[interface{}]interface{}
 }
 
-// Create an empty hash map.
+// New returns an empty hash map.
 // The param <unsafe> used to specify whether using map with un-concurrent-safety,
-// which is false in default, means concurrent-safe in default.
-//
-// 创建一个空的哈希表，参数unsafe用于指定是否用于非并发安全场景，默认为false，表示并发安全。
-func New(unsafe...bool) *Map {
+// which is false in default, means concurrent-safe.
+func New(unsafe ...bool) *Map {
     return NewMap(unsafe...)
 }
 
-// See New.
-//
-// 同New方法。
-func NewMap(unsafe...bool) *Map {
+// Alias of New. See New.
+func NewMap(unsafe ...bool) *Map {
     return &Map{
         m  : make(map[interface{}]interface{}),
         mu : rwmutex.New(unsafe...),
     }
 }
 
-// Create a hash map from given map.
-// Be aware that, the param map is a type of pointer,
+// NewFrom returns a hash map from given map <m>.
+// Notice that, the param map is a type of pointer,
 // there might be some concurrent-safe issues when changing the map outside.
-//
-// 基于给定的map变量创建哈希表对象，注意由于map是指针类型，外部对map有操作时会有并发安全问题。
 func NewFrom(m map[interface{}]interface{}, unsafe...bool) *Map {
     return &Map{
         m  : m,
@@ -51,12 +39,12 @@ func NewFrom(m map[interface{}]interface{}, unsafe...bool) *Map {
     }
 }
 
-// Create a hash map from given arrays.
+// NewFromArray returns a hash map from given array.
 // The param <keys> given as the keys of the map,
-// and <values> as the corresponding values.
+// and <values> as its corresponding values.
 //
-// 基于给定的数组变量创建哈希表对象，keys作为键名, values作为键值。
-// 当keys数组大小比values数组大时，多余的键名将会使用对应类型默认的键值。
+// If length of <keys> is greater than that of <values>,
+// the corresponding overflow map values will be the default value of its type.
 func NewFromArray(keys []interface{}, values []interface{}, unsafe...bool) *Map {
     m := make(map[interface{}]interface{})
     l := len(values)
@@ -73,10 +61,8 @@ func NewFromArray(keys []interface{}, values []interface{}, unsafe...bool) *Map
     }
 }
 
-// Iterate the hash map with custom callback function <f>.
+// Iterator iterates the hash map with custom callback function <f>.
 // If f returns true, then continue iterating; or false to stop.
-//
-// 给定回调函数对原始内容进行遍历，回调函数返回true表示继续遍历，否则停止遍历
 func (gm *Map) Iterator(f func (k interface{}, v interface{}) bool) {
     gm.mu.RLock()
     defer gm.mu.RUnlock()
@@ -87,17 +73,12 @@ func (gm *Map) Iterator(f func (k interface{}, v interface{}) bool) {
     }
 }
 
-// Clone current hash map with copy of underlying data,
-// return a new hash map.
-//
-// 哈希表克隆.
-func (gm *Map) Clone() *Map {
-    return NewFrom(gm.Map(), !gm.mu.IsSafe())
+// Clone returns a new hash map with copy of current map data.
+func (gm *Map) Clone(unsafe ...bool) *Map {
+    return NewFrom(gm.Map(), unsafe ...)
 }
 
-// Returns copy of the data of the hash map.
-//
-// 返回当前哈希表的数据Map.
+// Map returns a copy of the data of the hash map.
 func (gm *Map) Map() map[interface{}]interface{} {
     m := make(map[interface{}]interface{})
     gm.mu.RLock()
@@ -108,18 +89,14 @@ func (gm *Map) Map() map[interface{}]interface{} {
     return m
 }
 
-// Set key-value to the hash map.
-//
-// 设置键值对
+// Set sets key-value to the hash map.
 func (gm *Map) Set(key interface{}, val interface{}) {
     gm.mu.Lock()
     gm.m[key] = val
     gm.mu.Unlock()
 }
 
-// Batch set key-values to the hash map.
-//
-// 批量设置键值对
+// BatchSet batch sets key-values to the hash map.
 func (gm *Map) BatchSet(m map[interface{}]interface{}) {
     gm.mu.Lock()
     for k, v := range m {
@@ -128,9 +105,7 @@ func (gm *Map) BatchSet(m map[interface{}]interface{}) {
     gm.mu.Unlock()
 }
 
-// Get value by key.
-//
-// 获取键值
+// Get returns the value by given <key>.
 func (gm *Map) Get(key interface{}) interface{} {
     gm.mu.RLock()
     val, _ := gm.m[key]
@@ -138,8 +113,15 @@ func (gm *Map) Get(key interface{}) interface{} {
     return val
 }
 
-// 设置kv缓存键值对，内部会对键名的存在性使用写锁进行二次检索确认，如果存在则不再写入；返回键名对应的键值。
-// 在高并发下有用，防止数据写入的并发逻辑错误。
+// doSetWithLockCheck checks whether value of the key exists with mutex.Lock,
+// if not exists, set value to the map with given <key>,
+// or else just return the existing value.
+//
+// When setting value, if <value> is type of <func() interface {}>,
+// it will be executed with mutex.Lock of the hash map,
+// and its return value will be set to the map with <key>.
+//
+// It returns value with given <key>.
 func (gm *Map) doSetWithLockCheck(key interface{}, value interface{}) interface{} {
     gm.mu.Lock()
     defer gm.mu.Unlock()
@@ -153,9 +135,8 @@ func (gm *Map) doSetWithLockCheck(key interface{}, value interface{}) interface{
     return value
 }
 
-// Get the value by key, or set it with given key-value if not exist.
-//
-// 当键名存在时返回其键值，否则写入指定的键值
+// GetOrSet returns the value by key,
+// or set value with given <value> if not exist and returns this value.
 func (gm *Map) GetOrSet(key interface{}, value interface{}) interface{} {
     if v := gm.Get(key); v == nil {
         return gm.doSetWithLockCheck(key, value)
@@ -164,9 +145,9 @@ func (gm *Map) GetOrSet(key interface{}, value interface{}) interface{} {
     }
 }
 
-// Get the value by key, or set the it with return of callback function <f> if not exist.
-//
-// 当键名存在时返回其键值，否则写入指定的键值，键值由指定的函数生成
+// GetOrSetFunc returns the value by key,
+// or sets value with return value of callback function <f> if not exist
+// and returns this value.
 func (gm *Map) GetOrSetFunc(key interface{}, f func() interface{}) interface{} {
     if v := gm.Get(key); v == nil {
         return gm.doSetWithLockCheck(key, f())
@@ -175,10 +156,12 @@ func (gm *Map) GetOrSetFunc(key interface{}, f func() interface{}) interface{} {
     }
 }
 
-// Get the value by key, or set the it with return of callback function <f> if not exist.
-// The difference with GetOrSetFunc is, it locks in executing callback function <f>.
+// GetOrSetFuncLock returns the value by key,
+// or sets value with return value of callback function <f> if not exist
+// and returns this value.
 //
-// 与GetOrSetFunc不同的是，f是在写锁机制内执行
+// GetOrSetFuncLock differs with GetOrSetFunc function is that it executes function <f>
+// with mutex.Lock of the hash map.
 func (gm *Map) GetOrSetFuncLock(key interface{}, f func() interface{}) interface{} {
     if v := gm.Get(key); v == nil {
         return gm.doSetWithLockCheck(key, f)
@@ -187,9 +170,8 @@ func (gm *Map) GetOrSetFuncLock(key interface{}, f func() interface{}) interface
     }
 }
 
-// Set key-value if the key does not exist, then return true; or else return false.
-//
-// 当键名不存在时写入，并返回true；否则返回false。
+// SetIfNotExist sets <value> to the map if the <key> does not exist, then return true.
+// It returns false if <key> exists, and <value> would be ignored.
 func (gm *Map) SetIfNotExist(key interface{}, value interface{}) bool {
     if !gm.Contains(key) {
         gm.doSetWithLockCheck(key, value)
@@ -198,9 +180,30 @@ func (gm *Map) SetIfNotExist(key interface{}, value interface{}) bool {
     return false
 }
 
-// Batch remove by keys.
+// SetIfNotExistFunc sets value with return value of callback function <f>, then return true.
+// It returns false if <key> exists, and <value> would be ignored.
+func (gm *Map) SetIfNotExistFunc(key interface{}, f func() interface{}) bool {
+	if !gm.Contains(key) {
+		gm.doSetWithLockCheck(key, f())
+		return true
+	}
+	return false
+}
+
+// SetIfNotExistFuncLock sets value with return value of callback function <f>, then return true.
+// It returns false if <key> exists, and <value> would be ignored.
 //
-// 批量删除键值对
+// SetIfNotExistFuncLock differs with SetIfNotExistFunc function is that
+// it executes function <f> with mutex.Lock of the hash map.
+func (gm *Map) SetIfNotExistFuncLock(key interface{}, f func() interface{}) bool {
+	if !gm.Contains(key) {
+		gm.doSetWithLockCheck(key, f)
+		return true
+	}
+	return false
+}
+
+// BatchRemove batch deletes values of the map by keys.
 func (gm *Map) BatchRemove(keys []interface{}) {
     gm.mu.Lock()
     for _, key := range keys {
@@ -209,9 +212,7 @@ func (gm *Map) BatchRemove(keys []interface{}) {
     gm.mu.Unlock()
 }
 
-// Remove by given key.
-//
-// 返回对应的键值，并删除该键值
+// Remove deletes value from map by given <key>, and return this deleted value.
 func (gm *Map) Remove(key interface{}) interface{} {
     gm.mu.Lock()
     val, exists := gm.m[key]
@@ -222,9 +223,7 @@ func (gm *Map) Remove(key interface{}) interface{} {
     return val
 }
 
-// Return all the keys of hash map as a slice.
-//
-// 返回键列表.
+// Keys returns all keys of the map as a slice.
 func (gm *Map) Keys() []interface{} {
     gm.mu.RLock()
     keys := make([]interface{}, 0)
@@ -235,9 +234,7 @@ func (gm *Map) Keys() []interface{} {
     return keys
 }
 
-// Return all the values of hash map as a slice.
-//
-// 返回值列表(注意是随机排序)
+// Values returns all values of the map as a slice.
 func (gm *Map) Values() []interface{} {
     gm.mu.RLock()
     vals := make([]interface{}, 0)
@@ -248,9 +245,8 @@ func (gm *Map) Values() []interface{} {
     return vals
 }
 
-// Check whether a key exist.
-//
-// 是否存在某个键
+// Contains checks whether a key exists.
+// It returns true if the <key> exists, or else false.
 func (gm *Map) Contains(key interface{}) bool {
     gm.mu.RLock()
     _, exists := gm.m[key]
@@ -258,9 +254,7 @@ func (gm *Map) Contains(key interface{}) bool {
     return exists
 }
 
-// Get the size of hash map.
-//
-// 哈希表大小
+// Size returns the size of the map.
 func (gm *Map) Size() int {
     gm.mu.RLock()
     length := len(gm.m)
@@ -268,9 +262,8 @@ func (gm *Map) Size() int {
     return length
 }
 
-// Check whether the hash map is empty.
-//
-// 哈希表是否为空
+// IsEmpty checks whether the map is empty.
+// It returns true if map is empty, or else false.
 func (gm *Map) IsEmpty() bool {
     gm.mu.RLock()
     empty := len(gm.m) == 0
@@ -278,36 +271,28 @@ func (gm *Map) IsEmpty() bool {
     return empty
 }
 
-// Clear the hash map, it will remake a new underlying map data map.
-//
-// 清空哈希表
+// Clear deletes all data of the map, it will remake a new underlying map data map.
 func (gm *Map) Clear() {
     gm.mu.Lock()
     gm.m = make(map[interface{}]interface{})
     gm.mu.Unlock()
 }
 
-// Lock writing with given callback <f>.
-//
-// 并发安全锁操作，使用自定义方法执行加锁修改操作
+// LockFunc locks writing with given callback function <f> and mutex.Lock.
 func (gm *Map) LockFunc(f func(m map[interface{}]interface{})) {
-    gm.mu.Lock(true)
-    defer gm.mu.Unlock(true)
+    gm.mu.Lock()
+    defer gm.mu.Unlock()
     f(gm.m)
 }
 
-// Lock reading with given callback <f>.
-//
-// 并发安全锁操作，使用自定义方法执行加锁读取操作
+// RLockFunc locks reading with given callback function <f> and mutex.RLock.
 func (gm *Map) RLockFunc(f func(m map[interface{}]interface{})) {
-    gm.mu.RLock(true)
-    defer gm.mu.RUnlock(true)
+    gm.mu.RLock()
+    defer gm.mu.RUnlock()
     f(gm.m)
 }
 
-// Exchange key-value in the hash map, it will change key-value to value-key.
-//
-// 交换Map中的键和值.
+// Flip exchanges key-value of the map, it will change key-value to value-key.
 func (gm *Map) Flip() {
     gm.mu.Lock()
     defer gm.mu.Unlock()
@@ -318,17 +303,16 @@ func (gm *Map) Flip() {
     gm.m = n
 }
 
-// Merge two hash maps.
-//
-// 合并两个Map.
-func (gm *Map) Merge(m *Map) {
+// Merge merges two hash maps.
+// The <other> map will be merged into the map <gm>.
+func (gm *Map) Merge(other *Map) {
     gm.mu.Lock()
     defer gm.mu.Unlock()
-    if m != gm {
-        m.mu.RLock()
-        defer m.mu.RUnlock()
+    if other != gm {
+	    other.mu.RLock()
+        defer other.mu.RUnlock()
     }
-    for k, v := range m.m {
+    for k, v := range other.m {
         gm.m[k] = v
     }
 }

g/container/gmap/gmap_int_bool_map.go

@@ -16,6 +16,9 @@ type IntBoolMap struct {
     mu *rwmutex.RWMutex
 }
 
+// NewIntBoolMap returns an empty IntBoolMap object.
+// The param <unsafe> used to specify whether using map with un-concurrent-safety,
+// which is false in default, means concurrent-safe.
 func NewIntBoolMap(unsafe...bool) *IntBoolMap {
 	return &IntBoolMap{
         m  : make(map[int]bool),
@@ -23,6 +26,9 @@ func NewIntBoolMap(unsafe...bool) *IntBoolMap {
     }
 }
 
+// NewIntBoolMapFrom returns an IntBoolMap object from given map <m>.
+// Notice that, the param map is a type of pointer,
+// there might be some concurrent-safe issues when changing the map outside.
 func NewIntBoolMapFrom(m map[int]bool, unsafe...bool) *IntBoolMap {
     return &IntBoolMap{
         m  : m,
@@ -30,6 +36,12 @@ func NewIntBoolMapFrom(m map[int]bool, unsafe...bool) *IntBoolMap {
     }
 }
 
+// NewIntBoolMapFromArray returns an IntBoolMap from given array.
+// The param <keys> given as the keys of the map,
+// and <values> as its corresponding values.
+//
+// If length of <keys> is greater than that of <values>,
+// the corresponding overflow map values will be the default value of its type.
 func NewIntBoolMapFromArray(keys []int, values []bool, unsafe...bool) *IntBoolMap {
     m := make(map[int]bool)
     l := len(values)
@@ -46,12 +58,12 @@ func NewIntBoolMapFromArray(keys []int, values []bool, unsafe...bool) *IntBoolMa
     }
 }
 
-// 哈希表克隆.
+// Clone returns a new hash map with copy of current map data.
 func (gm *IntBoolMap) Clone() *IntBoolMap {
     return NewIntBoolMapFrom(gm.Map(), !gm.mu.IsSafe())
 }
 
-// 返回当前哈希表的数据Map.
+// Map returns a copy of the data of the hash map.
 func (gm *IntBoolMap) Map() map[int]bool {
 	m := make(map[int]bool)
 	gm.mu.RLock()
@@ -62,7 +74,8 @@ func (gm *IntBoolMap) Map() map[int]bool {
 	return m
 }
 
-// 给定回调函数对原始内容进行遍历，回调函数返回true表示继续遍历，否则停止遍历
+// Iterator iterates the hash map with custom callback function <f>.
+// If f returns true, then continue iterating; or false to stop.
 func (gm *IntBoolMap) Iterator(f func (k int, v bool) bool) {
     gm.mu.RLock()
     defer gm.mu.RUnlock()
@@ -73,14 +86,14 @@ func (gm *IntBoolMap) Iterator(f func (k int, v bool) bool) {
     }
 }
 
-// 设置键值对
+// Set sets key-value to the hash map.
 func (gm *IntBoolMap) Set(key int, val bool) {
 	gm.mu.Lock()
 	gm.m[key] = val
 	gm.mu.Unlock()
 }
 
-// 批量设置键值对
+// BatchSet batch sets key-values to the hash map.
 func (gm *IntBoolMap) BatchSet(m map[int]bool) {
 	gm.mu.Lock()
 	for k, v := range m {
@@ -89,7 +102,7 @@ func (gm *IntBoolMap) BatchSet(m map[int]bool) {
 	gm.mu.Unlock()
 }
 
-// 获取键值
+// Get returns the value by given <key>.
 func (gm *IntBoolMap) Get(key int) bool {
 	gm.mu.RLock()
 	val, _ := gm.m[key]
@@ -97,8 +110,11 @@ func (gm *IntBoolMap) Get(key int) bool {
 	return val
 }
 
-// 设置kv缓存键值对，内部会对键名的存在性使用写锁进行二次检索确认，如果存在则不再写入；返回键名对应的键值。
-// 在高并发下有用，防止数据写入的并发逻辑错误。
+// doSetWithLockCheck checks whether value of the key exists with mutex.Lock,
+// if not exists, set value to the map with given <key>,
+// or else just return the existing value.
+//
+// It returns value with given <key>.
 func (gm *IntBoolMap) doSetWithLockCheck(key int, value bool) bool {
     gm.mu.Lock()
     if v, ok := gm.m[key]; ok {
@@ -110,7 +126,8 @@ func (gm *IntBoolMap) doSetWithLockCheck(key int, value bool) bool {
     return value
 }
 
-// 当键名存在时返回其键值，否则写入指定的键值
+// GetOrSet returns the value by key,
+// or set value with given <value> if not exist and returns this value.
 func (gm *IntBoolMap) GetOrSet(key int, value bool) bool {
     gm.mu.RLock()
     v, ok := gm.m[key]
@@ -122,7 +139,8 @@ func (gm *IntBoolMap) GetOrSet(key int, value bool) bool {
     }
 }
 
-// 当键名存在时返回其键值，否则写入指定的键值，键值由指定的函数生成
+// GetOrSetFunc returns the value by key,
+// or sets value with return value of callback function <f> if not exist and returns this value.
 func (gm *IntBoolMap) GetOrSetFunc(key int, f func() bool) bool {
     gm.mu.RLock()
     v, ok := gm.m[key]
@@ -134,7 +152,11 @@ func (gm *IntBoolMap) GetOrSetFunc(key int, f func() bool) bool {
     }
 }
 
-// 与GetOrSetFunc不同的是，f是在写锁机制内执行
+// GetOrSetFuncLock returns the value by key,
+// or sets value with return value of callback function <f> if not exist and returns this value.
+//
+// GetOrSetFuncLock differs with GetOrSetFunc function is that it executes function <f>
+// with mutex.Lock of the hash map.
 func (gm *IntBoolMap) GetOrSetFuncLock(key int, f func() bool) bool {
     gm.mu.RLock()
     val, ok := gm.m[key]
@@ -143,10 +165,9 @@ func (gm *IntBoolMap) GetOrSetFuncLock(key int, f func() bool) bool {
         gm.mu.Lock()
         defer gm.mu.Unlock()
         if v, ok := gm.m[key]; ok {
-            gm.mu.Unlock()
             return v
         }
-        val         = f()
+        val       = f()
         gm.m[key] = val
         return val
     } else {
@@ -154,7 +175,8 @@ func (gm *IntBoolMap) GetOrSetFuncLock(key int, f func() bool) bool {
     }
 }
 
-// 当键名不存在时写入，并返回true；否则返回false。
+// SetIfNotExist sets <value> to the map if the <key> does not exist, then return true.
+// It returns false if <key> exists, and <value> would be ignored.
 func (gm *IntBoolMap) SetIfNotExist(key int, value bool) bool {
     if !gm.Contains(key) {
         gm.doSetWithLockCheck(key, value)
@@ -163,7 +185,34 @@ func (gm *IntBoolMap) SetIfNotExist(key int, value bool) bool {
     return false
 }
 
-// 批量删除键值对
+// SetIfNotExistFunc sets value with return value of callback function <f>, then return true.
+// It returns false if <key> exists, and <value> would be ignored.
+func (gm *IntBoolMap) SetIfNotExistFunc(key int, f func() bool) bool {
+	if !gm.Contains(key) {
+		gm.doSetWithLockCheck(key, f())
+		return true
+	}
+	return false
+}
+
+// SetIfNotExistFuncLock sets value with return value of callback function <f>, then return true.
+// It returns false if <key> exists, and <value> would be ignored.
+//
+// SetIfNotExistFuncLock differs with SetIfNotExistFunc function is that
+// it executes function <f> with mutex.Lock of the hash map.
+func (gm *IntBoolMap) SetIfNotExistFuncLock(key int, f func() bool) bool {
+	if !gm.Contains(key) {
+		gm.mu.Lock()
+		defer gm.mu.Unlock()
+		if _, ok := gm.m[key]; !ok {
+			gm.m[key] = f()
+		}
+		return true
+	}
+	return false
+}
+
+// BatchRemove batch deletes values of the map by keys.
 func (gm *IntBoolMap) BatchRemove(keys []int) {
     gm.mu.Lock()
     for _, key := range keys {
@@ -172,7 +221,7 @@ func (gm *IntBoolMap) BatchRemove(keys []int) {
     gm.mu.Unlock()
 }
 
-// 返回对应的键值，并删除该键值
+// Remove deletes value from map by given <key>, and return this deleted value.
 func (gm *IntBoolMap) Remove(key int) bool {
     gm.mu.Lock()
     val, exists := gm.m[key]
@@ -183,7 +232,7 @@ func (gm *IntBoolMap) Remove(key int) bool {
     return val
 }
 
-// 返回键列表
+// Keys returns all keys of the map as a slice.
 func (gm *IntBoolMap) Keys() []int {
     gm.mu.RLock()
     keys := make([]int, 0)
@@ -194,18 +243,8 @@ func (gm *IntBoolMap) Keys() []int {
     return keys
 }
 
-// 返回值列表(注意是随机排序)
-//func (gm *IntBoolMap) Values() []bool {
-//    gm.mu.RLock()
-//    vals := make([]bool, 0)
-//    for _, val := range gm.m {
-//        vals = append(vals, val)
-//    }
-//    gm.mu.RUnlock()
-//    return vals
-//}
-
-// 是否存在某个键
+// Contains checks whether a key exists.
+// It returns true if the <key> exists, or else false.
 func (gm *IntBoolMap) Contains(key int) bool {
 	gm.mu.RLock()
 	_, exists := gm.m[key]
@@ -213,7 +252,7 @@ func (gm *IntBoolMap) Contains(key int) bool {
 	return exists
 }
 
-// 哈希表大小
+// Size returns the size of the map.
 func (gm *IntBoolMap) Size() int {
     gm.mu.RLock()
     length := len(gm.m)
@@ -221,7 +260,8 @@ func (gm *IntBoolMap) Size() int {
     return length
 }
 
-// 哈希表是否为空
+// IsEmpty checks whether the map is empty.
+// It returns true if map is empty, or else false.
 func (gm *IntBoolMap) IsEmpty() bool {
     gm.mu.RLock()
     empty := len(gm.m) == 0
@@ -229,36 +269,37 @@ func (gm *IntBoolMap) IsEmpty() bool {
     return empty
 }
 
-// 清空哈希表
+// Clear deletes all data of the map, it will remake a new underlying map data map.
 func (gm *IntBoolMap) Clear() {
     gm.mu.Lock()
     gm.m = make(map[int]bool)
     gm.mu.Unlock()
 }
 
-// 并发安全锁操作，使用自定义方法执行加锁修改操作
+// LockFunc locks writing with given callback function <f> and mutex.Lock.
 func (gm *IntBoolMap) LockFunc(f func(m map[int]bool)) {
-    gm.mu.Lock(true)
-    defer gm.mu.Unlock(true)
-    f(gm.m)
-}
-
-// 并发安全锁操作，使用自定义方法执行加锁读取操作
-func (gm *IntBoolMap) RLockFunc(f func(m map[int]bool)) {
-    gm.mu.RLock(true)
-    defer gm.mu.RUnlock(true)
-    f(gm.m)
-}
-
-// 合并两个Map.
-func (gm *IntBoolMap) Merge(m *IntBoolMap) {
     gm.mu.Lock()
     defer gm.mu.Unlock()
-    if m != gm {
-        m.mu.RLock()
-        defer m.mu.RUnlock()
+    f(gm.m)
+}
+
+// RLockFunc locks reading with given callback function <f> and mutex.RLock.
+func (gm *IntBoolMap) RLockFunc(f func(m map[int]bool)) {
+    gm.mu.RLock()
+    defer gm.mu.RUnlock()
+    f(gm.m)
+}
+
+// Merge merges two hash maps.
+// The <other> map will be merged into the map <gm>.
+func (gm *IntBoolMap) Merge(other *IntBoolMap) {
+    gm.mu.Lock()
+    defer gm.mu.Unlock()
+    if other != gm {
+	    other.mu.RLock()
+        defer other.mu.RUnlock()
     }
-    for k, v := range m.m {
+    for k, v := range other.m {
         gm.m[k] = v
     }
 }

g/container/gmap/gmap_int_int_map.go

@@ -16,6 +16,9 @@ type IntIntMap struct {
 	m  map[int]int
 }
 
+// NewIntIntMap returns an empty IntIntMap object.
+// The param <unsafe> used to specify whether using map with un-concurrent-safety,
+// which is false in default, means concurrent-safe.
 func NewIntIntMap(unsafe...bool) *IntIntMap {
 	return &IntIntMap{
         m  : make(map[int]int),
@@ -23,6 +26,9 @@ func NewIntIntMap(unsafe...bool) *IntIntMap {
     }
 }
 
+// NewIntIntMapFrom returns an IntIntMap object from given map <m>.
+// Notice that, the param map is a type of pointer,
+// there might be some concurrent-safe issues when changing the map outside.
 func NewIntIntMapFrom(m map[int]int, unsafe...bool) *IntIntMap {
     return &IntIntMap{
         m  : m,
@@ -30,6 +36,12 @@ func NewIntIntMapFrom(m map[int]int, unsafe...bool) *IntIntMap {
     }
 }
 
+// NewIntIntMapFromArray returns an IntIntMap object from given array.
+// The param <keys> given as the keys of the map,
+// and <values> as its corresponding values.
+//
+// If length of <keys> is greater than that of <values>,
+// the corresponding overflow map values will be the default value of its type.
 func NewIntIntMapFromArray(keys []int, values []int, unsafe...bool) *IntIntMap {
     m := make(map[int]int)
     l := len(values)
@@ -46,7 +58,8 @@ func NewIntIntMapFromArray(keys []int, values []int, unsafe...bool) *IntIntMap {
     }
 }
 
-// 给定回调函数对原始内容进行遍历，回调函数返回true表示继续遍历，否则停止遍历
+// Iterator iterates the hash map with custom callback function <f>.
+// If f returns true, then continue iterating; or false to stop.
 func (gm *IntIntMap) Iterator(f func (k int, v int) bool) {
     gm.mu.RLock()
     defer gm.mu.RUnlock()
@@ -57,12 +70,12 @@ func (gm *IntIntMap) Iterator(f func (k int, v int) bool) {
     }
 }
 
-// 哈希表克隆.
+// Clone returns a new hash map with copy of current map data.
 func (gm *IntIntMap) Clone() *IntIntMap {
     return NewIntIntMapFrom(gm.Map(), !gm.mu.IsSafe())
 }
 
-// 返回当前哈希表的数据Map.
+// Map returns a copy of the data of the hash map.
 func (gm *IntIntMap) Map() map[int]int {
 	m := make(map[int]int)
 	gm.mu.RLock()
@@ -73,14 +86,14 @@ func (gm *IntIntMap) Map() map[int]int {
 	return m
 }
 
-// 设置键值对
+// Set sets key-value to the hash map.
 func (gm *IntIntMap) Set(key int, val int) {
 	gm.mu.Lock()
 	gm.m[key] = val
 	gm.mu.Unlock()
 }
 
-// 批量设置键值对
+// BatchSet batch sets key-values to the hash map.
 func (gm *IntIntMap) BatchSet(m map[int]int) {
 	gm.mu.Lock()
 	for k, v := range m {
@@ -89,7 +102,7 @@ func (gm *IntIntMap) BatchSet(m map[int]int) {
 	gm.mu.Unlock()
 }
 
-// 获取键值
+// Get returns the value by given <key>.
 func (gm *IntIntMap) Get(key int) (int) {
 	gm.mu.RLock()
 	val, _ := gm.m[key]
@@ -97,8 +110,11 @@ func (gm *IntIntMap) Get(key int) (int) {
 	return val
 }
 
-// 设置kv缓存键值对，内部会对键名的存在性使用写锁进行二次检索确认，如果存在则不再写入；返回键名对应的键值。
-// 在高并发下有用，防止数据写入的并发逻辑错误。
+// doSetWithLockCheck checks whether value of the key exists with mutex.Lock,
+// if not exists, set value to the map with given <key>,
+// or else just return the existing value.
+//
+// It returns value with given <key>.
 func (gm *IntIntMap) doSetWithLockCheck(key int, value int) int {
     gm.mu.Lock()
     if v, ok := gm.m[key]; ok {
@@ -110,7 +126,8 @@ func (gm *IntIntMap) doSetWithLockCheck(key int, value int) int {
     return value
 }
 
-// 当键名存在时返回其键值，否则写入指定的键值
+// GetOrSet returns the value by key,
+// or set value with given <value> if not exist and returns this value.
 func (gm *IntIntMap) GetOrSet(key int, value int) int {
     gm.mu.RLock()
     v, ok := gm.m[key]
@@ -122,7 +139,8 @@ func (gm *IntIntMap) GetOrSet(key int, value int) int {
     }
 }
 
-// 当键名存在时返回其键值，否则写入指定的键值，键值由指定的函数生成
+// GetOrSetFunc returns the value by key,
+// or sets value with return value of callback function <f> if not exist and returns this value.
 func (gm *IntIntMap) GetOrSetFunc(key int, f func() int) int {
     gm.mu.RLock()
     v, ok := gm.m[key]
@@ -134,7 +152,11 @@ func (gm *IntIntMap) GetOrSetFunc(key int, f func() int) int {
     }
 }
 
-// 与GetOrSetFunc不同的是，f是在写锁机制内执行
+// GetOrSetFuncLock returns the value by key,
+// or sets value with return value of callback function <f> if not exist and returns this value.
+//
+// GetOrSetFuncLock differs with GetOrSetFunc function is that it executes function <f>
+// with mutex.Lock of the hash map.
 func (gm *IntIntMap) GetOrSetFuncLock(key int, f func() int) int {
     gm.mu.RLock()
     val, ok := gm.m[key]
@@ -143,7 +165,6 @@ func (gm *IntIntMap) GetOrSetFuncLock(key int, f func() int) int {
         gm.mu.Lock()
         defer gm.mu.Unlock()
         if v, ok := gm.m[key]; ok {
-            gm.mu.Unlock()
             return v
         }
         val         = f()
@@ -154,7 +175,8 @@ func (gm *IntIntMap) GetOrSetFuncLock(key int, f func() int) int {
     }
 }
 
-// 当键名不存在时写入，并返回true；否则返回false。
+// SetIfNotExist sets <value> to the map if the <key> does not exist, then return true.
+// It returns false if <key> exists, and <value> would be ignored.
 func (gm *IntIntMap) SetIfNotExist(key int, value int) bool {
     if !gm.Contains(key) {
         gm.doSetWithLockCheck(key, value)
@@ -163,7 +185,34 @@ func (gm *IntIntMap) SetIfNotExist(key int, value int) bool {
     return false
 }
 
-// 批量删除键值对
+// SetIfNotExistFunc sets value with return value of callback function <f>, then return true.
+// It returns false if <key> exists, and <value> would be ignored.
+func (gm *IntIntMap) SetIfNotExistFunc(key int, f func() int) bool {
+	if !gm.Contains(key) {
+		gm.doSetWithLockCheck(key, f())
+		return true
+	}
+	return false
+}
+
+// SetIfNotExistFuncLock sets value with return value of callback function <f>, then return true.
+// It returns false if <key> exists, and <value> would be ignored.
+//
+// SetIfNotExistFuncLock differs with SetIfNotExistFunc function is that
+// it executes function <f> with mutex.Lock of the hash map.
+func (gm *IntIntMap) SetIfNotExistFuncLock(key int, f func() int) bool {
+	if !gm.Contains(key) {
+		gm.mu.Lock()
+		defer gm.mu.Unlock()
+		if _, ok := gm.m[key]; !ok {
+			gm.m[key] = f()
+		}
+		return true
+	}
+	return false
+}
+
+// BatchRemove batch deletes values of the map by keys.
 func (gm *IntIntMap) BatchRemove(keys []int) {
     gm.mu.Lock()
     for _, key := range keys {
@@ -172,7 +221,7 @@ func (gm *IntIntMap) BatchRemove(keys []int) {
     gm.mu.Unlock()
 }
 
-// 返回对应的键值，并删除该键值
+// Remove deletes value from map by given <key>, and return this deleted value.
 func (gm *IntIntMap) Remove(key int) int {
     gm.mu.Lock()
     val, exists := gm.m[key]
@@ -183,7 +232,7 @@ func (gm *IntIntMap) Remove(key int) int {
     return val
 }
 
-// 返回键列表
+// Keys returns all keys of the map as a slice.
 func (gm *IntIntMap) Keys() []int {
     gm.mu.RLock()
     keys := make([]int, 0)
@@ -194,7 +243,7 @@ func (gm *IntIntMap) Keys() []int {
     return keys
 }
 
-// 返回值列表(注意是随机排序)
+// Values returns all values of the map as a slice.
 func (gm *IntIntMap) Values() []int {
     gm.mu.RLock()
     vals := make([]int, 0)
@@ -205,7 +254,8 @@ func (gm *IntIntMap) Values() []int {
     return vals
 }
 
-// 是否存在某个键
+// Contains checks whether a key exists.
+// It returns true if the <key> exists, or else false.
 func (gm *IntIntMap) Contains(key int) bool {
     gm.mu.RLock()
     _, exists := gm.m[key]
@@ -213,7 +263,7 @@ func (gm *IntIntMap) Contains(key int) bool {
     return exists
 }
 
-// 哈希表大小
+// Size returns the size of the map.
 func (gm *IntIntMap) Size() int {
     gm.mu.RLock()
     length := len(gm.m)
@@ -221,7 +271,8 @@ func (gm *IntIntMap) Size() int {
     return length
 }
 
-// 哈希表是否为空
+// IsEmpty checks whether the map is empty.
+// It returns true if map is empty, or else false.
 func (gm *IntIntMap) IsEmpty() bool {
     gm.mu.RLock()
     empty := len(gm.m) == 0
@@ -229,28 +280,28 @@ func (gm *IntIntMap) IsEmpty() bool {
     return empty
 }
 
-// 清空哈希表
+// Clear deletes all data of the map, it will remake a new underlying map data map.
 func (gm *IntIntMap) Clear() {
     gm.mu.Lock()
     gm.m = make(map[int]int)
     gm.mu.Unlock()
 }
 
-// 并发安全锁操作，使用自定义方法执行加锁修改操作
+// LockFunc locks writing with given callback function <f> and mutex.Lock.
 func (gm *IntIntMap) LockFunc(f func(m map[int]int)) {
-    gm.mu.Lock(true)
-    defer gm.mu.Unlock(true)
+    gm.mu.Lock()
+    defer gm.mu.Unlock()
     f(gm.m)
 }
 
-// 并发安全锁操作，使用自定义方法执行加锁读取操作
+// RLockFunc locks reading with given callback function <f> and mutex.RLock.
 func (gm *IntIntMap) RLockFunc(f func(m map[int]int)) {
-    gm.mu.RLock(true)
-    defer gm.mu.RUnlock(true)
+    gm.mu.RLock()
+    defer gm.mu.RUnlock()
     f(gm.m)
 }
 
-// 交换Map中的键和值.
+// Flip exchanges key-value of the map, it will change key-value to value-key.
 func (gm *IntIntMap) Flip() {
     gm.mu.Lock()
     defer gm.mu.Unlock()
@@ -261,15 +312,16 @@ func (gm *IntIntMap) Flip() {
     gm.m = n
 }
 
-// 合并两个Map.
-func (gm *IntIntMap) Merge(m *IntIntMap) {
+// Merge merges two hash maps.
+// The <other> map will be merged into the map <gm>.
+func (gm *IntIntMap) Merge(other *IntIntMap) {
     gm.mu.Lock()
     defer gm.mu.Unlock()
-    if m != gm {
-        m.mu.RLock()
-        defer m.mu.RUnlock()
+    if other != gm {
+	    other.mu.RLock()
+        defer other.mu.RUnlock()
     }
-    for k, v := range m.m {
+    for k, v := range other.m {
         gm.m[k] = v
     }
 }

g/container/gmap/gmap_int_interface_map.go

@@ -17,6 +17,9 @@ type IntInterfaceMap struct {
 	m  map[int]interface{}
 }
 
+// NewIntInterfaceMap returns an empty IntInterfaceMap object.
+// The param <unsafe> used to specify whether using map with un-concurrent-safety,
+// which is false in default, means concurrent-safe.
 func NewIntInterfaceMap(unsafe...bool) *IntInterfaceMap {
 	return &IntInterfaceMap{
         m  : make(map[int]interface{}),
@@ -24,6 +27,9 @@ func NewIntInterfaceMap(unsafe...bool) *IntInterfaceMap {
     }
 }
 
+// NewIntInterfaceMapFrom returns an IntInterfaceMap object from given map <m>.
+// Notice that, the param map is a type of pointer,
+// there might be some concurrent-safe issues when changing the map outside.
 func NewIntInterfaceMapFrom(m map[int]interface{}, unsafe...bool) *IntInterfaceMap {
     return &IntInterfaceMap{
         m  : m,
@@ -31,6 +37,12 @@ func NewIntInterfaceMapFrom(m map[int]interface{}, unsafe...bool) *IntInterfaceM
     }
 }
 
+// NewFromArray returns a hash map from given array.
+// The param <keys> given as the keys of the map,
+// and <values> as its corresponding values.
+//
+// If length of <keys> is greater than that of <values>,
+// the corresponding overflow map values will be the default value of its type.
 func NewIntInterfaceMapFromArray(keys []int, values []interface{}, unsafe...bool) *IntInterfaceMap {
     m := make(map[int]interface{})
     l := len(values)
@@ -47,7 +59,8 @@ func NewIntInterfaceMapFromArray(keys []int, values []interface{}, unsafe...bool
     }
 }
 
-// 给定回调函数对原始内容进行遍历，回调函数返回true表示继续遍历，否则停止遍历
+// Iterator iterates the hash map with custom callback function <f>.
+// If f returns true, then continue iterating; or false to stop.
 func (gm *IntInterfaceMap) Iterator(f func (k int, v interface{}) bool) {
     gm.mu.RLock()
     defer gm.mu.RUnlock()
@@ -58,12 +71,12 @@ func (gm *IntInterfaceMap) Iterator(f func (k int, v interface{}) bool) {
     }
 }
 
-// 哈希表克隆.
+// Clone returns a new hash map with copy of current map data.
 func (gm *IntInterfaceMap) Clone() *IntInterfaceMap {
     return NewIntInterfaceMapFrom(gm.Map(), !gm.mu.IsSafe())
 }
 
-// 返回当前哈希表的数据Map.
+// Map returns a copy of the data of the hash map.
 func (gm *IntInterfaceMap) Map() map[int]interface{} {
 	m := make(map[int]interface{})
 	gm.mu.RLock()
@@ -74,14 +87,14 @@ func (gm *IntInterfaceMap) Map() map[int]interface{} {
 	return m
 }
 
-// 设置键值对
+// Set sets key-value to the hash map.
 func (gm *IntInterfaceMap) Set(key int, val interface{}) {
 	gm.mu.Lock()
 	gm.m[key] = val
 	gm.mu.Unlock()
 }
 
-// 批量设置键值对
+// BatchSet batch sets key-values to the hash map.
 func (gm *IntInterfaceMap) BatchSet(m map[int]interface{}) {
 	gm.mu.Lock()
 	for k, v := range m {
@@ -90,7 +103,7 @@ func (gm *IntInterfaceMap) BatchSet(m map[int]interface{}) {
 	gm.mu.Unlock()
 }
 
-// 获取键值
+// Get returns the value by given <key>.
 func (gm *IntInterfaceMap) Get(key int) (interface{}) {
 	gm.mu.RLock()
 	val, _ := gm.m[key]
@@ -98,8 +111,16 @@ func (gm *IntInterfaceMap) Get(key int) (interface{}) {
 	return val
 }
 
-// 设置kv缓存键值对，内部会对键名的存在性使用写锁进行二次检索确认，如果存在则不再写入；返回键名对应的键值。
-// 在高并发下有用，防止数据写入的并发逻辑错误。
+
+// doSetWithLockCheck checks whether value of the key exists with mutex.Lock,
+// if not exists, set value to the map with given <key>,
+// or else just return the existing value.
+//
+// When setting value, if <value> is type of <func() interface {}>,
+// it will be executed with mutex.Lock of the hash map,
+// and its return value will be set to the map with <key>.
+//
+// It returns value with given <key>.
 func (gm *IntInterfaceMap) doSetWithLockCheck(key int, value interface{}) interface{} {
     gm.mu.Lock()
     defer gm.mu.Unlock()
@@ -109,11 +130,14 @@ func (gm *IntInterfaceMap) doSetWithLockCheck(key int, value interface{}) interf
     if f, ok := value.(func() interface {}); ok {
         value = f()
     }
-    gm.m[key] = value
+    if value != nil {
+        gm.m[key] = value
+    }
     return value
 }
 
-// 当键名存在时返回其键值，否则写入指定的键值
+// GetOrSet returns the value by key,
+// or set value with given <value> if not exist and returns this value.
 func (gm *IntInterfaceMap) GetOrSet(key int, value interface{}) interface{} {
     if v := gm.Get(key); v == nil {
         return gm.doSetWithLockCheck(key, value)
@@ -122,7 +146,8 @@ func (gm *IntInterfaceMap) GetOrSet(key int, value interface{}) interface{} {
     }
 }
 
-// 当键名存在时返回其键值，否则写入指定的键值，键值由指定的函数生成
+// GetOrSetFunc returns the value by key,
+// or sets value with return value of callback function <f> if not exist and returns this value.
 func (gm *IntInterfaceMap) GetOrSetFunc(key int, f func() interface{}) interface{} {
     if v := gm.Get(key); v == nil {
         return gm.doSetWithLockCheck(key, f())
@@ -131,7 +156,11 @@ func (gm *IntInterfaceMap) GetOrSetFunc(key int, f func() interface{}) interface
     }
 }
 
-// 与GetOrSetFunc不同的是，f是在写锁机制内执行
+// GetOrSetFuncLock returns the value by key,
+// or sets value with return value of callback function <f> if not exist and returns this value.
+//
+// GetOrSetFuncLock differs with GetOrSetFunc function is that it executes function <f>
+// with mutex.Lock of the hash map.
 func (gm *IntInterfaceMap) GetOrSetFuncLock(key int, f func() interface{}) interface{} {
     if v := gm.Get(key); v == nil {
         return gm.doSetWithLockCheck(key, f)
@@ -140,7 +169,8 @@ func (gm *IntInterfaceMap) GetOrSetFuncLock(key int, f func() interface{}) inter
     }
 }
 
-// 当键名不存在时写入，并返回true；否则返回false。
+// SetIfNotExist sets <value> to the map if the <key> does not exist, then return true.
+// It returns false if <key> exists, and <value> would be ignored.
 func (gm *IntInterfaceMap) SetIfNotExist(key int, value interface{}) bool {
     if !gm.Contains(key) {
         gm.doSetWithLockCheck(key, value)
@@ -149,7 +179,31 @@ func (gm *IntInterfaceMap) SetIfNotExist(key int, value interface{}) bool {
     return false
 }
 
-// 批量删除键值对
+// SetIfNotExistFunc sets value with return value of callback function <f>, then return true.
+// It returns false if <key> exists, and <value> would be ignored.
+func (gm *IntInterfaceMap) SetIfNotExistFunc(key int, f func() interface{}) bool {
+	if !gm.Contains(key) {
+		gm.doSetWithLockCheck(key, f())
+		return true
+	}
+	return false
+}
+
+// SetIfNotExistFuncLock sets value with return value of callback function <f>, then return true.
+// It returns false if <key> exists, and <value> would be ignored.
+//
+// SetIfNotExistFuncLock differs with SetIfNotExistFunc function is that
+// it executes function <f> with mutex.Lock of the hash map.
+func (gm *IntInterfaceMap) SetIfNotExistFuncLock(key int, f func() interface{}) bool {
+	if !gm.Contains(key) {
+		gm.doSetWithLockCheck(key, f)
+		return true
+	}
+	return false
+}
+
+
+// BatchRemove batch deletes values of the map by keys.
 func (gm *IntInterfaceMap) BatchRemove(keys []int) {
     gm.mu.Lock()
     for _, key := range keys {
@@ -158,7 +212,7 @@ func (gm *IntInterfaceMap) BatchRemove(keys []int) {
     gm.mu.Unlock()
 }
 
-// 返回对应的键值，并删除该键值
+// Remove deletes value from map by given <key>, and return this deleted value.
 func (gm *IntInterfaceMap) Remove(key int) interface{} {
     gm.mu.Lock()
     val, exists := gm.m[key]
@@ -169,7 +223,7 @@ func (gm *IntInterfaceMap) Remove(key int) interface{} {
     return val
 }
 
-// 返回键列表
+// Keys returns all keys of the map as a slice.
 func (gm *IntInterfaceMap) Keys() []int {
     gm.mu.RLock()
     keys := make([]int, 0)
@@ -180,7 +234,7 @@ func (gm *IntInterfaceMap) Keys() []int {
     return keys
 }
 
-// 返回值列表(注意是随机排序)
+// Values returns all values of the map as a slice.
 func (gm *IntInterfaceMap) Values() []interface{} {
     gm.mu.RLock()
     vals := make([]interface{}, 0)
@@ -191,7 +245,8 @@ func (gm *IntInterfaceMap) Values() []interface{} {
     return vals
 }
 
-// 是否存在某个键
+// Contains checks whether a key exists.
+// It returns true if the <key> exists, or else false.
 func (gm *IntInterfaceMap) Contains(key int) bool {
     gm.mu.RLock()
     _, exists := gm.m[key]
@@ -199,7 +254,7 @@ func (gm *IntInterfaceMap) Contains(key int) bool {
     return exists
 }
 
-// 哈希表大小
+// Size returns the size of the map.
 func (gm *IntInterfaceMap) Size() int {
     gm.mu.RLock()
     length := len(gm.m)
@@ -207,7 +262,8 @@ func (gm *IntInterfaceMap) Size() int {
     return length
 }
 
-// 哈希表是否为空
+// IsEmpty checks whether the map is empty.
+// It returns true if map is empty, or else false.
 func (gm *IntInterfaceMap) IsEmpty() bool {
     gm.mu.RLock()
     empty := len(gm.m) == 0
@@ -215,28 +271,28 @@ func (gm *IntInterfaceMap) IsEmpty() bool {
     return empty
 }
 
-// 清空哈希表
+// Clear deletes all data of the map, it will remake a new underlying map data map.
 func (gm *IntInterfaceMap) Clear() {
     gm.mu.Lock()
     gm.m = make(map[int]interface{})
     gm.mu.Unlock()
 }
 
-// 并发安全锁操作，使用自定义方法执行加锁修改操作
+// LockFunc locks writing with given callback function <f> and mutex.Lock.
 func (gm *IntInterfaceMap) LockFunc(f func(m map[int]interface{})) {
     gm.mu.Lock()
     defer gm.mu.Unlock()
     f(gm.m)
 }
 
-// 并发安全锁操作，使用自定义方法执行加锁读取操作
+// RLockFunc locks reading with given callback function <f> and mutex.RLock.
 func (gm *IntInterfaceMap) RLockFunc(f func(m map[int]interface{})) {
-    gm.mu.RLock(true)
-    defer gm.mu.RUnlock(true)
+    gm.mu.RLock()
+    defer gm.mu.RUnlock()
     f(gm.m)
 }
 
-// 交换Map中的键和值.
+// Flip exchanges key-value of the map, it will change key-value to value-key.
 func (gm *IntInterfaceMap) Flip() {
     gm.mu.Lock()
     defer gm.mu.Unlock()
@@ -247,15 +303,16 @@ func (gm *IntInterfaceMap) Flip() {
     gm.m = n
 }
 
-// 合并两个Map.
-func (gm *IntInterfaceMap) Merge(m *IntInterfaceMap) {
+// Merge merges two hash maps.
+// The <other> map will be merged into the map <gm>.
+func (gm *IntInterfaceMap) Merge(other *IntInterfaceMap) {
     gm.mu.Lock()
     defer gm.mu.Unlock()
-    if m != gm {
-        m.mu.RLock()
-        defer m.mu.RUnlock()
+    if other != gm {
+	    other.mu.RLock()
+        defer other.mu.RUnlock()
     }
-    for k, v := range m.m {
+    for k, v := range other.m {
         gm.m[k] = v
     }
 }

g/container/gmap/gmap_int_string_map.go

@@ -4,12 +4,11 @@
 // If a copy of the MIT was not distributed with gm file,
 // You can obtain one at https://github.com/gogf/gf.
 
-
 package gmap
 
 import (
-    "github.com/gogf/gf/g/internal/rwmutex"
-    "github.com/gogf/gf/g/util/gconv"
+	"github.com/gogf/gf/g/internal/rwmutex"
+	"github.com/gogf/gf/g/util/gconv"
 )
 
 type IntStringMap struct {
@@ -17,71 +16,84 @@ type IntStringMap struct {
 	m  map[int]string
 }
 
-func NewIntStringMap(unsafe...bool) *IntStringMap {
+// NewIntStringMap returns an empty IntStringMap object.
+// The param <unsafe> used to specify whether using map with un-concurrent-safety,
+// which is false in default, means concurrent-safe.
+func NewIntStringMap(unsafe ...bool) *IntStringMap {
 	return &IntStringMap{
-        m  : make(map[int]string),
-        mu : rwmutex.New(unsafe...),
-    }
+		m:  make(map[int]string),
+		mu: rwmutex.New(unsafe...),
+	}
 }
 
-func NewIntStringMapFrom(m map[int]string, unsafe...bool) *IntStringMap {
-    return &IntStringMap{
-        m  : m,
-        mu : rwmutex.New(unsafe...),
-    }
+// NewIntStringMapFrom returns an IntStringMap object from given map <m>.
+// Notice that, the param map is a type of pointer,
+// there might be some concurrent-safe issues when changing the map outside.
+func NewIntStringMapFrom(m map[int]string, unsafe ...bool) *IntStringMap {
+	return &IntStringMap{
+		m:  m,
+		mu: rwmutex.New(unsafe...),
+	}
 }
 
-func NewIntStringMapFromArray(keys []int, values []string, unsafe...bool) *IntStringMap {
-    m := make(map[int]string)
-    l := len(values)
-    for i, k := range keys {
-        if i < l {
-            m[k] = values[i]
-        } else {
-            m[k] = ""
-        }
-    }
-    return &IntStringMap{
-        m  : m,
-        mu : rwmutex.New(unsafe...),
-    }
+// NewIntStringMapFromArray returns an IntStringMap object from given array.
+// The param <keys> given as the keys of the map,
+// and <values> as its corresponding values.
+//
+// If length of <keys> is greater than that of <values>,
+// the corresponding overflow map values will be the default value of its type.
+func NewIntStringMapFromArray(keys []int, values []string, unsafe ...bool) *IntStringMap {
+	m := make(map[int]string)
+	l := len(values)
+	for i, k := range keys {
+		if i < l {
+			m[k] = values[i]
+		} else {
+			m[k] = ""
+		}
+	}
+	return &IntStringMap{
+		m:  m,
+		mu: rwmutex.New(unsafe...),
+	}
 }
 
-// 给定回调函数对原始内容进行遍历，回调函数返回true表示继续遍历，否则停止遍历
-func (gm *IntStringMap) Iterator(f func (k int, v string) bool) {
-    gm.mu.RLock()
-    defer gm.mu.RUnlock()
-    for k, v := range gm.m {
-        if !f(k, v) {
-            break
-        }
-    }
+// Iterator iterates the hash map with custom callback function <f>.
+// If f returns true, then continue iterating; or false to stop.
+func (gm *IntStringMap) Iterator(f func(k int, v string) bool) {
+	gm.mu.RLock()
+	defer gm.mu.RUnlock()
+	for k, v := range gm.m {
+		if !f(k, v) {
+			break
+		}
+	}
 }
 
-// 哈希表克隆.
+// Clone returns a new hash map with copy of current map data.
 func (gm *IntStringMap) Clone() *IntStringMap {
-    return NewIntStringMapFrom(gm.Map(), !gm.mu.IsSafe())
+	return NewIntStringMapFrom(gm.Map(), !gm.mu.IsSafe())
 }
 
-// 返回当前哈希表的数据Map.
+// Map returns a copy of the data of the hash map.
 func (gm *IntStringMap) Map() map[int]string {
 	m := make(map[int]string)
 	gm.mu.RLock()
 	for k, v := range gm.m {
 		m[k] = v
 	}
-    gm.mu.RUnlock()
+	gm.mu.RUnlock()
 	return m
 }
 
-// 设置键值对
+// Set sets key-value to the hash map.
 func (gm *IntStringMap) Set(key int, val string) {
 	gm.mu.Lock()
 	gm.m[key] = val
 	gm.mu.Unlock()
 }
 
-// 批量设置键值对
+// BatchSet batch sets key-values to the hash map.
 func (gm *IntStringMap) BatchSet(m map[int]string) {
 	gm.mu.Lock()
 	for k, v := range m {
@@ -90,7 +102,7 @@ func (gm *IntStringMap) BatchSet(m map[int]string) {
 	gm.mu.Unlock()
 }
 
-// 获取键值
+// Get returns the value by given <key>.
 func (gm *IntStringMap) Get(key int) string {
 	gm.mu.RLock()
 	val, _ := gm.m[key]
@@ -98,179 +110,218 @@ func (gm *IntStringMap) Get(key int) string {
 	return val
 }
 
-// 设置kv缓存键值对，内部会对键名的存在性使用写锁进行二次检索确认，如果存在则不再写入；返回键名对应的键值。
-// 在高并发下有用，防止数据写入的并发逻辑错误。
+// doSetWithLockCheck checks whether value of the key exists with mutex.Lock,
+// if not exists, set value to the map with given <key>,
+// or else just return the existing value.
+//
+// It returns value with given <key>.
 func (gm *IntStringMap) doSetWithLockCheck(key int, value string) string {
-    gm.mu.Lock()
-    if v, ok := gm.m[key]; ok {
-        gm.mu.Unlock()
-        return v
-    }
-    gm.m[key] = value
-    gm.mu.Unlock()
-    return value
+	gm.mu.Lock()
+	if v, ok := gm.m[key]; ok {
+		gm.mu.Unlock()
+		return v
+	}
+	gm.m[key] = value
+	gm.mu.Unlock()
+	return value
 }
 
-// 当键名存在时返回其键值，否则写入指定的键值
+// GetOrSet returns the value by key,
+// or set value with given <value> if not exist and returns this value.
 func (gm *IntStringMap) GetOrSet(key int, value string) string {
-    gm.mu.RLock()
-    v, ok := gm.m[key]
-    gm.mu.RUnlock()
-    if !ok {
-        return gm.doSetWithLockCheck(key, value)
-    } else {
-        return v
-    }
+	gm.mu.RLock()
+	v, ok := gm.m[key]
+	gm.mu.RUnlock()
+	if !ok {
+		return gm.doSetWithLockCheck(key, value)
+	} else {
+		return v
+	}
 }
 
-// 当键名存在时返回其键值，否则写入指定的键值，键值由指定的函数生成
+// GetOrSetFunc returns the value by key,
+// or sets value with return value of callback function <f> if not exist and returns this value.
 func (gm *IntStringMap) GetOrSetFunc(key int, f func() string) string {
-    gm.mu.RLock()
-    v, ok := gm.m[key]
-    gm.mu.RUnlock()
-    if !ok {
-        return gm.doSetWithLockCheck(key, f())
-    } else {
-        return v
-    }
+	gm.mu.RLock()
+	v, ok := gm.m[key]
+	gm.mu.RUnlock()
+	if !ok {
+		return gm.doSetWithLockCheck(key, f())
+	} else {
+		return v
+	}
 }
 
-// 与GetOrSetFunc不同的是，f是在写锁机制内执行
+// GetOrSetFuncLock returns the value by key,
+// or sets value with return value of callback function <f> if not exist and returns this value.
+//
+// GetOrSetFuncLock differs with GetOrSetFunc function is that it executes function <f>
+// with mutex.Lock of the hash map.
 func (gm *IntStringMap) GetOrSetFuncLock(key int, f func() string) string {
-    gm.mu.RLock()
-    val, ok := gm.m[key]
-    gm.mu.RUnlock()
-    if !ok {
-        gm.mu.Lock()
-        defer gm.mu.Unlock()
-        if v, ok := gm.m[key]; ok {
-            gm.mu.Unlock()
-            return v
-        }
-        val         = f()
-        gm.m[key] = val
-        return val
-    } else {
-        return val
-    }
+	gm.mu.RLock()
+	val, ok := gm.m[key]
+	gm.mu.RUnlock()
+	if !ok {
+		gm.mu.Lock()
+		defer gm.mu.Unlock()
+		if v, ok := gm.m[key]; ok {
+			return v
+		}
+		val = f()
+		gm.m[key] = val
+		return val
+	} else {
+		return val
+	}
 }
 
-// 当键名不存在时写入，并返回true；否则返回false。
+// SetIfNotExist sets <value> to the map if the <key> does not exist, then return true.
+// It returns false if <key> exists, and <value> would be ignored.
 func (gm *IntStringMap) SetIfNotExist(key int, value string) bool {
-    if !gm.Contains(key) {
-        gm.doSetWithLockCheck(key, value)
-        return true
-    }
-    return false
+	if !gm.Contains(key) {
+		gm.doSetWithLockCheck(key, value)
+		return true
+	}
+	return false
 }
 
-// 批量删除键值对
+// SetIfNotExistFunc sets value with return value of callback function <f>, then return true.
+// It returns false if <key> exists, and <value> would be ignored.
+func (gm *IntStringMap) SetIfNotExistFunc(key int, f func() string) bool {
+	if !gm.Contains(key) {
+		gm.doSetWithLockCheck(key, f())
+		return true
+	}
+	return false
+}
+
+// SetIfNotExistFuncLock sets value with return value of callback function <f>, then return true.
+// It returns false if <key> exists, and <value> would be ignored.
+//
+// SetIfNotExistFuncLock differs with SetIfNotExistFunc function is that
+// it executes function <f> with mutex.Lock of the hash map.
+func (gm *IntStringMap) SetIfNotExistFuncLock(key int, f func() string) bool {
+	if !gm.Contains(key) {
+		gm.mu.Lock()
+		defer gm.mu.Unlock()
+		if _, ok := gm.m[key]; !ok {
+			gm.m[key] = f()
+		}
+		return true
+	}
+	return false
+}
+
+// BatchRemove batch deletes values of the map by keys.
 func (gm *IntStringMap) BatchRemove(keys []int) {
-    gm.mu.Lock()
-    for _, key := range keys {
-        delete(gm.m, key)
-    }
-    gm.mu.Unlock()
+	gm.mu.Lock()
+	for _, key := range keys {
+		delete(gm.m, key)
+	}
+	gm.mu.Unlock()
 }
 
-// 返回对应的键值，并删除该键值
+// Remove deletes value from map by given <key>, and return this deleted value.
 func (gm *IntStringMap) Remove(key int) string {
-    gm.mu.Lock()
-    val, exists := gm.m[key]
-    if exists {
-        delete(gm.m, key)
-    }
-    gm.mu.Unlock()
-    return val
+	gm.mu.Lock()
+	val, exists := gm.m[key]
+	if exists {
+		delete(gm.m, key)
+	}
+	gm.mu.Unlock()
+	return val
 }
 
-// 返回键列表
+// Keys returns all keys of the map as a slice.
 func (gm *IntStringMap) Keys() []int {
-    gm.mu.RLock()
-    keys := make([]int, 0)
-    for key, _ := range gm.m {
-        keys = append(keys, key)
-    }
-    gm.mu.RUnlock()
-    return keys
+	gm.mu.RLock()
+	keys := make([]int, 0)
+	for key, _ := range gm.m {
+		keys = append(keys, key)
+	}
+	gm.mu.RUnlock()
+	return keys
 }
 
-// 返回值列表(注意是随机排序)
+// Values returns all values of the map as a slice.
 func (gm *IntStringMap) Values() []string {
-    gm.mu.RLock()
-    vals := make([]string, 0)
-    for _, val := range gm.m {
-        vals = append(vals, val)
-    }
-    gm.mu.RUnlock()
-    return vals
+	gm.mu.RLock()
+	vals := make([]string, 0)
+	for _, val := range gm.m {
+		vals = append(vals, val)
+	}
+	gm.mu.RUnlock()
+	return vals
 }
 
-// 是否存在某个键
+// Contains checks whether a key exists.
+// It returns true if the <key> exists, or else false.
 func (gm *IntStringMap) Contains(key int) bool {
-    gm.mu.RLock()
-    _, exists := gm.m[key]
-    gm.mu.RUnlock()
-    return exists
+	gm.mu.RLock()
+	_, exists := gm.m[key]
+	gm.mu.RUnlock()
+	return exists
 }
 
-// 哈希表大小
+// Size returns the size of the map.
 func (gm *IntStringMap) Size() int {
-    gm.mu.RLock()
-    length := len(gm.m)
-    gm.mu.RUnlock()
-    return length
+	gm.mu.RLock()
+	length := len(gm.m)
+	gm.mu.RUnlock()
+	return length
 }
 
-// 哈希表是否为空
+// IsEmpty checks whether the map is empty.
+// It returns true if map is empty, or else false.
 func (gm *IntStringMap) IsEmpty() bool {
-    gm.mu.RLock()
-    empty := len(gm.m) == 0
-    gm.mu.RUnlock()
-    return empty
+	gm.mu.RLock()
+	empty := len(gm.m) == 0
+	gm.mu.RUnlock()
+	return empty
 }
 
-// 清空哈希表
+// Clear deletes all data of the map, it will remake a new underlying map data map.
 func (gm *IntStringMap) Clear() {
-    gm.mu.Lock()
-    gm.m = make(map[int]string)
-    gm.mu.Unlock()
+	gm.mu.Lock()
+	gm.m = make(map[int]string)
+	gm.mu.Unlock()
 }
 
-// 并发安全锁操作，使用自定义方法执行加锁修改操作
+// LockFunc locks writing with given callback function <f> and mutex.Lock.
 func (gm *IntStringMap) LockFunc(f func(m map[int]string)) {
-    gm.mu.Lock(true)
-    defer gm.mu.Unlock(true)
-    f(gm.m)
+	gm.mu.Lock()
+	defer gm.mu.Unlock()
+	f(gm.m)
 }
 
-// 并发安全锁操作，使用自定义方法执行加锁读取操作
+// RLockFunc locks reading with given callback function <f> and mutex.RLock.
 func (gm *IntStringMap) RLockFunc(f func(m map[int]string)) {
-    gm.mu.RLock(true)
-    defer gm.mu.RUnlock(true)
-    f(gm.m)
+	gm.mu.RLock()
+	defer gm.mu.RUnlock()
+	f(gm.m)
 }
 
-// 交换Map中的键和值.
+// Flip exchanges key-value of the map, it will change key-value to value-key.
 func (gm *IntStringMap) Flip() {
-    gm.mu.Lock()
-    defer gm.mu.Unlock()
-    n := make(map[int]string, len(gm.m))
-    for k, v := range gm.m {
-        n[gconv.Int(v)] = gconv.String(k)
-    }
-    gm.m = n
+	gm.mu.Lock()
+	defer gm.mu.Unlock()
+	n := make(map[int]string, len(gm.m))
+	for k, v := range gm.m {
+		n[gconv.Int(v)] = gconv.String(k)
+	}
+	gm.m = n
 }
 
-// 合并两个Map.
-func (gm *IntStringMap) Merge(m *IntStringMap) {
-    gm.mu.Lock()
-    defer gm.mu.Unlock()
-    if m != gm {
-        m.mu.RLock()
-        defer m.mu.RUnlock()
-    }
-    for k, v := range m.m {
-        gm.m[k] = v
-    }
-}
+// Merge merges two hash maps.
+// The <other> map will be merged into the map <gm>.
+func (gm *IntStringMap) Merge(other *IntStringMap) {
+	gm.mu.Lock()
+	defer gm.mu.Unlock()
+	if other != gm {
+		other.mu.RLock()
+		defer other.mu.RUnlock()
+	}
+	for k, v := range other.m {
+		gm.m[k] = v
+	}
+}

g/container/gmap/gmap_string_bool_map.go

@@ -16,6 +16,9 @@ type StringBoolMap struct {
 	m  map[string]bool
 }
 
+// NewStringBoolMap returns an empty StringBoolMap object.
+// The param <unsafe> used to specify whether using map with un-concurrent-safety,
+// which is false in default, means concurrent-safe.
 func NewStringBoolMap(unsafe...bool) *StringBoolMap {
 	return &StringBoolMap{
 		m  : make(map[string]bool),
@@ -23,6 +26,9 @@ func NewStringBoolMap(unsafe...bool) *StringBoolMap {
 	}
 }
 
+// NewStringBoolMapFrom returns an StringBoolMap object from given map <m>.
+// Notice that, the param map is a type of pointer,
+// there might be some concurrent-safe issues when changing the map outside.
 func NewStringBoolMapFrom(m map[string]bool, unsafe...bool) *StringBoolMap {
     return &StringBoolMap{
         m  : m,
@@ -30,6 +36,12 @@ func NewStringBoolMapFrom(m map[string]bool, unsafe...bool) *StringBoolMap {
     }
 }
 
+// NewFromArray returns a hash map from given array.
+// The param <keys> given as the keys of the map,
+// and <values> as its corresponding values.
+//
+// If length of <keys> is greater than that of <values>,
+// the corresponding overflow map values will be the default value of its type.
 func NewStringBoolMapFromArray(keys []string, values []bool, unsafe...bool) *StringBoolMap {
     m := make(map[string]bool)
     l := len(values)
@@ -46,7 +58,8 @@ func NewStringBoolMapFromArray(keys []string, values []bool, unsafe...bool) *Str
     }
 }
 
-// 给定回调函数对原始内容进行遍历，回调函数返回true表示继续遍历，否则停止遍历
+// Iterator iterates the hash map with custom callback function <f>.
+// If f returns true, then continue iterating; or false to stop.
 func (gm *StringBoolMap) Iterator(f func (k string, v bool) bool) {
 	gm.mu.RLock()
 	defer gm.mu.RUnlock()
@@ -57,12 +70,12 @@ func (gm *StringBoolMap) Iterator(f func (k string, v bool) bool) {
     }
 }
 
-// 哈希表克隆.
+// Clone returns a new hash map with copy of current map data.
 func (gm *StringBoolMap) Clone() *StringBoolMap {
     return NewStringBoolMapFrom(gm.Map(), !gm.mu.IsSafe())
 }
 
-// 返回当前哈希表的数据Map.
+// Map returns a copy of the data of the hash map.
 func (gm *StringBoolMap) Map() map[string]bool {
     m := make(map[string]bool)
     gm.mu.RLock()
@@ -73,14 +86,14 @@ func (gm *StringBoolMap) Map() map[string]bool {
     return m
 }
 
-// 设置键值对
+// Set sets key-value to the hash map.
 func (gm *StringBoolMap) Set(key string, val bool) {
 	gm.mu.Lock()
 	gm.m[key] = val
 	gm.mu.Unlock()
 }
 
-// 批量设置键值对
+// BatchSet batch sets key-values to the hash map.
 func (gm *StringBoolMap) BatchSet(m map[string]bool) {
     gm.mu.Lock()
     for k, v := range m {
@@ -89,7 +102,7 @@ func (gm *StringBoolMap) BatchSet(m map[string]bool) {
     gm.mu.Unlock()
 }
 
-// 获取键值
+// Get returns the value by given <key>.
 func (gm *StringBoolMap) Get(key string) bool {
 	gm.mu.RLock()
 	val, _ := gm.m[key]
@@ -97,8 +110,11 @@ func (gm *StringBoolMap) Get(key string) bool {
 	return val
 }
 
-// 设置kv缓存键值对，内部会对键名的存在性使用写锁进行二次检索确认，如果存在则不再写入；返回键名对应的键值。
-// 在高并发下有用，防止数据写入的并发逻辑错误。
+// doSetWithLockCheck checks whether value of the key exists with mutex.Lock,
+// if not exists, set value to the map with given <key>,
+// or else just return the existing value.
+//
+// It returns value with given <key>.
 func (gm *StringBoolMap) doSetWithLockCheck(key string, value bool) bool {
 	gm.mu.Lock()
 	if v, ok := gm.m[key]; ok {
@@ -110,7 +126,8 @@ func (gm *StringBoolMap) doSetWithLockCheck(key string, value bool) bool {
 	return value
 }
 
-// 当键名存在时返回其键值，否则写入指定的键值
+// GetOrSet returns the value by key,
+// or set value with given <value> if not exist and returns this value.
 func (gm *StringBoolMap) GetOrSet(key string, value bool) bool {
 	gm.mu.RLock()
 	v, ok := gm.m[key]
@@ -122,7 +139,9 @@ func (gm *StringBoolMap) GetOrSet(key string, value bool) bool {
 	}
 }
 
-// 当键名存在时返回其键值，否则写入指定的键值，键值由指定的函数生成
+// GetOrSetFunc returns the value by key,
+// or sets value with return value of callback function <f> if not exist
+// and returns this value.
 func (gm *StringBoolMap) GetOrSetFunc(key string, f func() bool) bool {
 	gm.mu.RLock()
 	v, ok := gm.m[key]
@@ -134,7 +153,12 @@ func (gm *StringBoolMap) GetOrSetFunc(key string, f func() bool) bool {
 	}
 }
 
-// 与GetOrSetFunc不同的是，f是在写锁机制内执行
+// GetOrSetFuncLock returns the value by key,
+// or sets value with return value of callback function <f> if not exist
+// and returns this value.
+//
+// GetOrSetFuncLock differs with GetOrSetFunc function is that it executes function <f>
+// with mutex.Lock of the hash map.
 func (gm *StringBoolMap) GetOrSetFuncLock(key string, f func() bool) bool {
 	gm.mu.RLock()
 	val, ok := gm.m[key]
@@ -143,7 +167,6 @@ func (gm *StringBoolMap) GetOrSetFuncLock(key string, f func() bool) bool {
 		gm.mu.Lock()
 		defer gm.mu.Unlock()
 		if v, ok := gm.m[key]; ok {
-			gm.mu.Unlock()
 			return v
 		}
 		val         = f()
@@ -154,7 +177,9 @@ func (gm *StringBoolMap) GetOrSetFuncLock(key string, f func() bool) bool {
 	}
 }
 
-// 当键名不存在时写入，并返回true；否则返回false。
+
+// SetIfNotExist sets <value> to the map if the <key> does not exist, then return true.
+// It returns false if <key> exists, and <value> would be ignored.
 func (gm *StringBoolMap) SetIfNotExist(key string, value bool) bool {
 	if !gm.Contains(key) {
 		gm.doSetWithLockCheck(key, value)
@@ -163,7 +188,34 @@ func (gm *StringBoolMap) SetIfNotExist(key string, value bool) bool {
 	return false
 }
 
-// 批量删除键值对
+// SetIfNotExistFunc sets value with return value of callback function <f>, then return true.
+// It returns false if <key> exists, and <value> would be ignored.
+func (gm *StringBoolMap) SetIfNotExistFunc(key string, f func() bool) bool {
+	if !gm.Contains(key) {
+		gm.doSetWithLockCheck(key, f())
+		return true
+	}
+	return false
+}
+
+// SetIfNotExistFuncLock sets value with return value of callback function <f>, then return true.
+// It returns false if <key> exists, and <value> would be ignored.
+//
+// SetIfNotExistFuncLock differs with SetIfNotExistFunc function is that
+// it executes function <f> with mutex.Lock of the hash map.
+func (gm *StringBoolMap) SetIfNotExistFuncLock(key string, f func() bool) bool {
+	if !gm.Contains(key) {
+		gm.mu.Lock()
+		defer gm.mu.Unlock()
+		if _, ok := gm.m[key]; !ok {
+			gm.m[key] = f()
+		}
+		return true
+	}
+	return false
+}
+
+// BatchRemove batch deletes values of the map by keys.
 func (gm *StringBoolMap) BatchRemove(keys []string) {
     gm.mu.Lock()
     for _, key := range keys {
@@ -172,7 +224,7 @@ func (gm *StringBoolMap) BatchRemove(keys []string) {
     gm.mu.Unlock()
 }
 
-// 返回对应的键值，并删除该键值
+// Remove deletes value from map by given <key>, and return this deleted value.
 func (gm *StringBoolMap) Remove(key string) bool {
 	gm.mu.Lock()
 	val, exists := gm.m[key]
@@ -183,7 +235,7 @@ func (gm *StringBoolMap) Remove(key string) bool {
 	return val
 }
 
-// 返回键列表
+// Keys returns all keys of the map as a slice.
 func (gm *StringBoolMap) Keys() []string {
 	gm.mu.RLock()
 	keys := make([]string, 0)
@@ -194,18 +246,8 @@ func (gm *StringBoolMap) Keys() []string {
 	return keys
 }
 
-// 返回值列表(注意是随机排序)
-//func (gm *StringBoolMap) Values() []bool {
-//	gm.mu.RLock()
-//	vals := make([]bool, 0)
-//	for _, val := range gm.m {
-//		vals = append(vals, val)
-//	}
-//	gm.mu.RUnlock()
-//	return vals
-//}
-
-// 是否存在某个键
+// Contains checks whether a key exists.
+// It returns true if the <key> exists, or else false.
 func (gm *StringBoolMap) Contains(key string) bool {
 	gm.mu.RLock()
 	_, exists := gm.m[key]
@@ -213,7 +255,7 @@ func (gm *StringBoolMap) Contains(key string) bool {
 	return exists
 }
 
-// 哈希表大小
+// Size returns the size of the map.
 func (gm *StringBoolMap) Size() int {
 	gm.mu.RLock()
 	length := len(gm.m)
@@ -221,7 +263,8 @@ func (gm *StringBoolMap) Size() int {
 	return length
 }
 
-// 哈希表是否为空
+// IsEmpty checks whether the map is empty.
+// It returns true if map is empty, or else false.
 func (gm *StringBoolMap) IsEmpty() bool {
 	gm.mu.RLock()
 	empty := len(gm.m) == 0
@@ -229,36 +272,37 @@ func (gm *StringBoolMap) IsEmpty() bool {
 	return empty
 }
 
-// 清空哈希表
+// Clear deletes all data of the map, it will remake a new underlying map data map.
 func (gm *StringBoolMap) Clear() {
     gm.mu.Lock()
     gm.m = make(map[string]bool)
     gm.mu.Unlock()
 }
 
-// 并发安全锁操作，使用自定义方法执行加锁修改操作
+// LockFunc locks writing with given callback function <f> and mutex.Lock.
 func (gm *StringBoolMap) LockFunc(f func(m map[string]bool)) {
-	gm.mu.Lock(true)
-	defer gm.mu.Unlock(true)
-	f(gm.m)
-}
-
-// 并发安全锁操作，使用自定义方法执行加锁读取操作
-func (gm *StringBoolMap) RLockFunc(f func(m map[string]bool)) {
-	gm.mu.RLock(true)
-	defer gm.mu.RUnlock(true)
-	f(gm.m)
-}
-
-// 合并两个Map.
-func (gm *StringBoolMap) Merge(m *StringBoolMap) {
 	gm.mu.Lock()
 	defer gm.mu.Unlock()
-	if m != gm {
-		m.mu.RLock()
-		defer m.mu.RUnlock()
+	f(gm.m)
+}
+
+// RLockFunc locks reading with given callback function <f> and mutex.RLock.
+func (gm *StringBoolMap) RLockFunc(f func(m map[string]bool)) {
+	gm.mu.RLock()
+	defer gm.mu.RUnlock()
+	f(gm.m)
+}
+
+// Merge merges two hash maps.
+// The <other> map will be merged into the map <gm>.
+func (gm *StringBoolMap) Merge(other *StringBoolMap) {
+	gm.mu.Lock()
+	defer gm.mu.Unlock()
+	if other != gm {
+		other.mu.RLock()
+		defer other.mu.RUnlock()
 	}
-	for k, v := range m.m {
+	for k, v := range other.m {
 		gm.m[k] = v
 	}
 }

g/container/gmap/gmap_string_int_map.go

@@ -8,8 +8,8 @@
 package gmap
 
 import (
-    "github.com/gogf/gf/g/internal/rwmutex"
-    "github.com/gogf/gf/g/util/gconv"
+	"github.com/gogf/gf/g/internal/rwmutex"
+	"github.com/gogf/gf/g/util/gconv"
 )
 
 type StringIntMap struct {
@@ -17,71 +17,84 @@ type StringIntMap struct {
 	m  map[string]int
 }
 
-func NewStringIntMap(unsafe...bool) *StringIntMap {
+// NewStringIntMap returns an empty StringIntMap object.
+// The param <unsafe> used to specify whether using map with un-concurrent-safety,
+// which is false in default, means concurrent-safe.
+func NewStringIntMap(unsafe ...bool) *StringIntMap {
 	return &StringIntMap{
-        m  : make(map[string]int),
-        mu : rwmutex.New(unsafe...),
-    }
+		m:  make(map[string]int),
+		mu: rwmutex.New(unsafe...),
+	}
 }
 
-func NewStringIntMapFrom(m map[string]int, unsafe...bool) *StringIntMap {
-    return &StringIntMap{
-        m  : m,
-        mu : rwmutex.New(unsafe...),
-    }
+// NewStringIntMapFrom returns an StringIntMap object from given map <m>.
+// Notice that, the param map is a type of pointer,
+// there might be some concurrent-safe issues when changing the map outside.
+func NewStringIntMapFrom(m map[string]int, unsafe ...bool) *StringIntMap {
+	return &StringIntMap{
+		m:  m,
+		mu: rwmutex.New(unsafe...),
+	}
 }
 
-func NewStringIntMapFromArray(keys []string, values []int, unsafe...bool) *StringIntMap {
-    m := make(map[string]int)
-    l := len(values)
-    for i, k := range keys {
-        if i < l {
-            m[k] = values[i]
-        } else {
-            m[k] = 0
-        }
-    }
-    return &StringIntMap{
-        m  : m,
-        mu : rwmutex.New(unsafe...),
-    }
+// NewStringIntMapFromArray returns an StringIntMap object from given array.
+// The param <keys> given as the keys of the map,
+// and <values> as its corresponding values.
+//
+// If length of <keys> is greater than that of <values>,
+// the corresponding overflow map values will be the default value of its type.
+func NewStringIntMapFromArray(keys []string, values []int, unsafe ...bool) *StringIntMap {
+	m := make(map[string]int)
+	l := len(values)
+	for i, k := range keys {
+		if i < l {
+			m[k] = values[i]
+		} else {
+			m[k] = 0
+		}
+	}
+	return &StringIntMap{
+		m:  m,
+		mu: rwmutex.New(unsafe...),
+	}
 }
 
-// 给定回调函数对原始内容进行遍历，回调函数返回true表示继续遍历，否则停止遍历
-func (gm *StringIntMap) Iterator(f func (k string, v int) bool) {
-    gm.mu.RLock()
-    defer gm.mu.RUnlock()
-    for k, v := range gm.m {
-        if !f(k, v) {
-            break
-        }
-    }
+// Iterator iterates the hash map with custom callback function <f>.
+// If f returns true, then continue iterating; or false to stop.
+func (gm *StringIntMap) Iterator(f func(k string, v int) bool) {
+	gm.mu.RLock()
+	defer gm.mu.RUnlock()
+	for k, v := range gm.m {
+		if !f(k, v) {
+			break
+		}
+	}
 }
 
-// 哈希表克隆.
+// Clone returns a new hash map with copy of current map data.
 func (gm *StringIntMap) Clone() *StringIntMap {
-    return NewStringIntMapFrom(gm.Map(), !gm.mu.IsSafe())
+	return NewStringIntMapFrom(gm.Map(), !gm.mu.IsSafe())
 }
 
-// 返回当前哈希表的数据Map.
+// Map returns a copy of the data of the hash map.
 func (gm *StringIntMap) Map() map[string]int {
-    m := make(map[string]int)
-    gm.mu.RLock()
-    for k, v := range gm.m {
-        m[k] = v
-    }
-    gm.mu.RUnlock()
-    return m
+	m := make(map[string]int)
+	gm.mu.RLock()
+	for k, v := range gm.m {
+		m[k] = v
+	}
+	gm.mu.RUnlock()
+	return m
 }
 
-// 设置键值对
+// Set sets key-value to the hash map.
 func (gm *StringIntMap) Set(key string, val int) {
 	gm.mu.Lock()
 	gm.m[key] = val
 	gm.mu.Unlock()
 }
 
-// 批量设置键值对
+// BatchSet batch sets key-values to the hash map.
 func (gm *StringIntMap) BatchSet(m map[string]int) {
 	gm.mu.Lock()
 	for k, v := range m {
@@ -90,187 +103,228 @@ func (gm *StringIntMap) BatchSet(m map[string]int) {
 	gm.mu.Unlock()
 }
 
-// 获取键值
+// Get returns the value by given <key>.
 func (gm *StringIntMap) Get(key string) int {
 	gm.mu.RLock()
 	val, _ := gm.m[key]
-    gm.mu.RUnlock()
+	gm.mu.RUnlock()
 	return val
 }
 
-// 设置kv缓存键值对，内部会对键名的存在性使用写锁进行二次检索确认，如果存在则不再写入；返回键名对应的键值。
-// 在高并发下有用，防止数据写入的并发逻辑错误。
+// doSetWithLockCheck checks whether value of the key exists with mutex.Lock,
+// if not exists, set value to the map with given <key>,
+// or else just return the existing value.
+//
+// It returns value with given <key>.
 func (gm *StringIntMap) doSetWithLockCheck(key string, value int) int {
-    gm.mu.Lock()
-    if v, ok := gm.m[key]; ok {
-        gm.mu.Unlock()
-        return v
-    }
-    gm.m[key] = value
-    gm.mu.Unlock()
-    return value
+	gm.mu.Lock()
+	if v, ok := gm.m[key]; ok {
+		gm.mu.Unlock()
+		return v
+	}
+	gm.m[key] = value
+	gm.mu.Unlock()
+	return value
 }
 
-// 当键名存在时返回其键值，否则写入指定的键值
+// GetOrSet returns the value by key,
+// or set value with given <value> if not exist and returns this value.
 func (gm *StringIntMap) GetOrSet(key string, value int) int {
-    gm.mu.RLock()
-    v, ok := gm.m[key]
-    gm.mu.RUnlock()
-    if !ok {
-        return gm.doSetWithLockCheck(key, value)
-    } else {
-        return v
-    }
+	gm.mu.RLock()
+	v, ok := gm.m[key]
+	gm.mu.RUnlock()
+	if !ok {
+		return gm.doSetWithLockCheck(key, value)
+	} else {
+		return v
+	}
 }
 
-// 当键名存在时返回其键值，否则写入指定的键值，键值由指定的函数生成
+// GetOrSetFunc returns the value by key,
+// or sets value with return value of callback function <f> if not exist
+// and returns this value.
 func (gm *StringIntMap) GetOrSetFunc(key string, f func() int) int {
-    gm.mu.RLock()
-    v, ok := gm.m[key]
-    gm.mu.RUnlock()
-    if !ok {
-        return gm.doSetWithLockCheck(key, f())
-    } else {
-        return v
-    }
+	gm.mu.RLock()
+	v, ok := gm.m[key]
+	gm.mu.RUnlock()
+	if !ok {
+		return gm.doSetWithLockCheck(key, f())
+	} else {
+		return v
+	}
 }
 
-// 与GetOrSetFunc不同的是，f是在写锁机制内执行
+// GetOrSetFuncLock returns the value by key,
+// or sets value with return value of callback function <f> if not exist
+// and returns this value.
+//
+// GetOrSetFuncLock differs with GetOrSetFunc function is that it executes function <f>
+// with mutex.Lock of the hash map.
 func (gm *StringIntMap) GetOrSetFuncLock(key string, f func() int) int {
-    gm.mu.RLock()
-    val, ok := gm.m[key]
-    gm.mu.RUnlock()
-    if !ok {
-        gm.mu.Lock()
-        defer gm.mu.Unlock()
-        if v, ok := gm.m[key]; ok {
-            gm.mu.Unlock()
-            return v
-        }
-        val         = f()
-        gm.m[key] = val
-        return val
-    } else {
-        return val
-    }
+	gm.mu.RLock()
+	val, ok := gm.m[key]
+	gm.mu.RUnlock()
+	if !ok {
+		gm.mu.Lock()
+		defer gm.mu.Unlock()
+		if v, ok := gm.m[key]; ok {
+			return v
+		}
+		val = f()
+		gm.m[key] = val
+		return val
+	} else {
+		return val
+	}
 }
 
-// 当键名不存在时写入，并返回true；否则返回false。
+// SetIfNotExist sets <value> to the map if the <key> does not exist, then return true.
+// It returns false if <key> exists, and <value> would be ignored.
 func (gm *StringIntMap) SetIfNotExist(key string, value int) bool {
-    if !gm.Contains(key) {
-        gm.doSetWithLockCheck(key, value)
-        return true
-    }
-    return false
+	if !gm.Contains(key) {
+		gm.doSetWithLockCheck(key, value)
+		return true
+	}
+	return false
 }
 
-// 批量删除键值对
+// SetIfNotExistFunc sets value with return value of callback function <f>, then return true.
+// It returns false if <key> exists, and <value> would be ignored.
+func (gm *StringIntMap) SetIfNotExistFunc(key string, f func() int) bool {
+	if !gm.Contains(key) {
+		gm.doSetWithLockCheck(key, f())
+		return true
+	}
+	return false
+}
+
+// SetIfNotExistFuncLock sets value with return value of callback function <f>, then return true.
+// It returns false if <key> exists, and <value> would be ignored.
+//
+// SetIfNotExistFuncLock differs with SetIfNotExistFunc function is that
+// it executes function <f> with mutex.Lock of the hash map.
+func (gm *StringIntMap) SetIfNotExistFuncLock(key string, f func() int) bool {
+	if !gm.Contains(key) {
+		gm.mu.Lock()
+		defer gm.mu.Unlock()
+		if _, ok := gm.m[key]; !ok {
+			gm.m[key] = f()
+		}
+		return true
+	}
+	return false
+}
+
+// BatchRemove batch deletes values of the map by keys.
 func (gm *StringIntMap) BatchRemove(keys []string) {
-    gm.mu.Lock()
-    for _, key := range keys {
-        delete(gm.m, key)
-    }
-    gm.mu.Unlock()
+	gm.mu.Lock()
+	for _, key := range keys {
+		delete(gm.m, key)
+	}
+	gm.mu.Unlock()
 }
 
-// 返回对应的键值，并删除该键值
+// Remove deletes value from map by given <key>, and return this deleted value.
 func (gm *StringIntMap) Remove(key string) int {
-    gm.mu.Lock()
-    val, exists := gm.m[key]
-    if exists {
-        delete(gm.m, key)
-    }
-    gm.mu.Unlock()
-    return val
+	gm.mu.Lock()
+	val, exists := gm.m[key]
+	if exists {
+		delete(gm.m, key)
+	}
+	gm.mu.Unlock()
+	return val
 }
 
-// 返回键列表
+// Keys returns all keys of the map as a slice.
 func (gm *StringIntMap) Keys() []string {
-    gm.mu.RLock()
-    keys := make([]string, 0)
-    for key, _ := range gm.m {
-        keys = append(keys, key)
-    }
-    gm.mu.RUnlock()
-    return keys
+	gm.mu.RLock()
+	keys := make([]string, 0)
+	for key, _ := range gm.m {
+		keys = append(keys, key)
+	}
+	gm.mu.RUnlock()
+	return keys
 }
 
-// 返回值列表(注意是随机排序)
+// Values returns all values of the map as a slice.
 func (gm *StringIntMap) Values() []int {
-    gm.mu.RLock()
-    vals := make([]int, 0)
-    for _, val := range gm.m {
-        vals = append(vals, val)
-    }
-    gm.mu.RUnlock()
-    return vals
+	gm.mu.RLock()
+	vals := make([]int, 0)
+	for _, val := range gm.m {
+		vals = append(vals, val)
+	}
+	gm.mu.RUnlock()
+	return vals
 }
 
-// 是否存在某个键
+// Contains checks whether a key exists.
+// It returns true if the <key> exists, or else false.
 func (gm *StringIntMap) Contains(key string) bool {
-    gm.mu.RLock()
-    _, exists := gm.m[key]
-    gm.mu.RUnlock()
-    return exists
+	gm.mu.RLock()
+	_, exists := gm.m[key]
+	gm.mu.RUnlock()
+	return exists
 }
 
-// 哈希表大小
+// Size returns the size of the map.
 func (gm *StringIntMap) Size() int {
-    gm.mu.RLock()
-    length := len(gm.m)
-    gm.mu.RUnlock()
-    return length
+	gm.mu.RLock()
+	length := len(gm.m)
+	gm.mu.RUnlock()
+	return length
 }
 
-// 哈希表是否为空
+// IsEmpty checks whether the map is empty.
+// It returns true if map is empty, or else false.
 func (gm *StringIntMap) IsEmpty() bool {
-    gm.mu.RLock()
-    empty := len(gm.m) == 0
-    gm.mu.RUnlock()
-    return empty
+	gm.mu.RLock()
+	empty := len(gm.m) == 0
+	gm.mu.RUnlock()
+	return empty
 }
 
-// 清空哈希表
+// Clear deletes all data of the map, it will remake a new underlying map data map.
 func (gm *StringIntMap) Clear() {
-    gm.mu.Lock()
-    gm.m = make(map[string]int)
-    gm.mu.Unlock()
+	gm.mu.Lock()
+	gm.m = make(map[string]int)
+	gm.mu.Unlock()
 }
 
-// 并发安全写锁操作，使用自定义方法执行加锁修改操作
+// LockFunc locks writing with given callback function <f> and mutex.Lock.
 func (gm *StringIntMap) LockFunc(f func(m map[string]int)) {
-    gm.mu.Lock(true)
-    defer gm.mu.Unlock(true)
-    f(gm.m)
+	gm.mu.Lock()
+	defer gm.mu.Unlock()
+	f(gm.m)
 }
 
-// 并发安全读锁操作，使用自定义方法执行加锁读取操作
+// RLockFunc locks reading with given callback function <f> and mutex.RLock.
 func (gm *StringIntMap) RLockFunc(f func(m map[string]int)) {
-    gm.mu.RLock(true)
-    defer gm.mu.RUnlock(true)
-    f(gm.m)
+	gm.mu.RLock()
+	defer gm.mu.RUnlock()
+	f(gm.m)
 }
 
-// 交换Map中的键和值.
+// Flip exchanges key-value of the map, it will change key-value to value-key.
 func (gm *StringIntMap) Flip() {
-    gm.mu.Lock()
-    defer gm.mu.Unlock()
-    n := make(map[string]int, len(gm.m))
-    for k, v := range gm.m {
-        n[gconv.String(v)] = gconv.Int(k)
-    }
-    gm.m = n
+	gm.mu.Lock()
+	defer gm.mu.Unlock()
+	n := make(map[string]int, len(gm.m))
+	for k, v := range gm.m {
+		n[gconv.String(v)] = gconv.Int(k)
+	}
+	gm.m = n
 }
 
-// 合并两个Map.
-func (gm *StringIntMap) Merge(m *StringIntMap) {
-    gm.mu.Lock()
-    defer gm.mu.Unlock()
-    if m != gm {
-        m.mu.RLock()
-        defer m.mu.RUnlock()
-    }
-    for k, v := range m.m {
-        gm.m[k] = v
-    }
-}
+// Merge merges two hash maps.
+// The <other> map will be merged into the map <gm>.
+func (gm *StringIntMap) Merge(other *StringIntMap) {
+	gm.mu.Lock()
+	defer gm.mu.Unlock()
+	if other != gm {
+		other.mu.RLock()
+		defer other.mu.RUnlock()
+	}
+	for k, v := range other.m {
+		gm.m[k] = v
+	}
+}

g/container/gmap/gmap_string_interface_map.go

@@ -17,38 +17,51 @@ type StringInterfaceMap struct {
 	m  map[string]interface{}
 }
 
-func NewStringInterfaceMap(unsafe...bool) *StringInterfaceMap {
+// NewStringInterfaceMap returns an empty StringInterfaceMap object.
+// The param <unsafe> used to specify whether using map with un-concurrent-safety,
+// which is false in default, means concurrent-safe.
+func NewStringInterfaceMap(unsafe ...bool) *StringInterfaceMap {
 	return &StringInterfaceMap{
-		m  : make(map[string]interface{}),
-		mu : rwmutex.New(unsafe...),
+		m:  make(map[string]interface{}),
+		mu: rwmutex.New(unsafe...),
 	}
 }
 
-func NewStringInterfaceMapFrom(m map[string]interface{}, unsafe...bool) *StringInterfaceMap {
-    return &StringInterfaceMap{
-        m  : m,
-        mu : rwmutex.New(unsafe...),
-    }
+// NewStringInterfaceMapFrom returns an StringInterfaceMap object from given map <m>.
+// Notice that, the param map is a type of pointer,
+// there might be some concurrent-safe issues when changing the map outside.
+func NewStringInterfaceMapFrom(m map[string]interface{}, unsafe ...bool) *StringInterfaceMap {
+	return &StringInterfaceMap{
+		m:  m,
+		mu: rwmutex.New(unsafe...),
+	}
 }
 
-func NewStringInterfaceMapFromArray(keys []string, values []interface{}, unsafe...bool) *StringInterfaceMap {
-    m := make(map[string]interface{})
-    l := len(values)
-    for i, k := range keys {
-        if i < l {
-            m[k] = values[i]
-        } else {
-            m[k] = interface{}(nil)
-        }
-    }
-    return &StringInterfaceMap{
-        m  : m,
-        mu : rwmutex.New(unsafe...),
-    }
+// NewStringInterfaceMapFromArray returns an StringInterfaceMap object from given array.
+// The param <keys> given as the keys of the map,
+// and <values> as its corresponding values.
+//
+// If length of <keys> is greater than that of <values>,
+// the corresponding overflow map values will be the default value of its type.
+func NewStringInterfaceMapFromArray(keys []string, values []interface{}, unsafe ...bool) *StringInterfaceMap {
+	m := make(map[string]interface{})
+	l := len(values)
+	for i, k := range keys {
+		if i < l {
+			m[k] = values[i]
+		} else {
+			m[k] = interface{}(nil)
+		}
+	}
+	return &StringInterfaceMap{
+		m:  m,
+		mu: rwmutex.New(unsafe...),
+	}
 }
 
-// 给定回调函数对原始内容进行遍历，回调函数返回true表示继续遍历，否则停止遍历
-func (gm *StringInterfaceMap) Iterator(f func (k string, v interface{}) bool) {
+// Iterator iterates the hash map with custom callback function <f>.
+// If f returns true, then continue iterating; or false to stop.
+func (gm *StringInterfaceMap) Iterator(f func(k string, v interface{}) bool) {
 	gm.mu.RLock()
 	defer gm.mu.RUnlock()
 	for k, v := range gm.m {
@@ -58,39 +71,39 @@ func (gm *StringInterfaceMap) Iterator(f func (k string, v interface{}) bool) {
 	}
 }
 
-// 哈希表克隆.
+// Clone returns a new hash map with copy of current map data.
 func (gm *StringInterfaceMap) Clone() *StringInterfaceMap {
-    return NewStringInterfaceMapFrom(gm.Map(), !gm.mu.IsSafe())
+	return NewStringInterfaceMapFrom(gm.Map(), !gm.mu.IsSafe())
 }
 
-// 返回当前哈希表的数据Map.
+// Map returns a copy of the data of the hash map.
 func (gm *StringInterfaceMap) Map() map[string]interface{} {
-    m := make(map[string]interface{})
-    gm.mu.RLock()
-    for k, v := range gm.m {
-        m[k] = v
-    }
-    gm.mu.RUnlock()
-    return m
+	m := make(map[string]interface{})
+	gm.mu.RLock()
+	for k, v := range gm.m {
+		m[k] = v
+	}
+	gm.mu.RUnlock()
+	return m
 }
 
-// 设置键值对
+// Set sets key-value to the hash map.
 func (gm *StringInterfaceMap) Set(key string, val interface{}) {
 	gm.mu.Lock()
 	gm.m[key] = val
 	gm.mu.Unlock()
 }
 
-// 批量设置键值对
+// BatchSet batch sets key-values to the hash map.
 func (gm *StringInterfaceMap) BatchSet(m map[string]interface{}) {
-    gm.mu.Lock()
-    for k, v := range m {
-        gm.m[k] = v
-    }
-    gm.mu.Unlock()
+	gm.mu.Lock()
+	for k, v := range m {
+		gm.m[k] = v
+	}
+	gm.mu.Unlock()
 }
 
-// 获取键值
+// Get returns the value by given <key>.
 func (gm *StringInterfaceMap) Get(key string) interface{} {
 	gm.mu.RLock()
 	val, _ := gm.m[key]
@@ -98,67 +111,108 @@ func (gm *StringInterfaceMap) Get(key string) interface{} {
 	return val
 }
 
-// 设置kv缓存键值对，内部会对键名的存在性使用写锁进行二次检索确认，如果存在则不再写入；返回键名对应的键值。
-// 在高并发下有用，防止数据写入的并发逻辑错误。
+// doSetWithLockCheck checks whether value of the key exists with mutex.Lock,
+// if not exists, set value to the map with given <key>,
+// or else just return the existing value.
+//
+// When setting value, if <value> is type of <func() interface {}>,
+// it will be executed with mutex.Lock of the hash map,
+// and its return value will be set to the map with <key>.
+//
+// It returns value with given <key>.
 func (gm *StringInterfaceMap) doSetWithLockCheck(key string, value interface{}) interface{} {
 	gm.mu.Lock()
 	defer gm.mu.Unlock()
-    if v, ok := gm.m[key]; ok {
-        return v
-    }
-    if f, ok := value.(func() interface {}); ok {
-        value = f()
-    }
-    gm.m[key] = value
-    return value
+	if v, ok := gm.m[key]; ok {
+		return v
+	}
+	if f, ok := value.(func() interface{}); ok {
+		value = f()
+	}
+	if value != nil {
+		gm.m[key] = value
+	}
+	return value
 }
 
-// 当键名存在时返回其键值，否则写入指定的键值
+// GetOrSet returns the value by key,
+// or set value with given <value> if not exist and returns this value.
 func (gm *StringInterfaceMap) GetOrSet(key string, value interface{}) interface{} {
-    if v := gm.Get(key); v == nil {
-        return gm.doSetWithLockCheck(key, value)
-    } else {
-        return v
-    }
+	if v := gm.Get(key); v == nil {
+		return gm.doSetWithLockCheck(key, value)
+	} else {
+		return v
+	}
 }
 
-// 当键名存在时返回其键值，否则写入指定的键值，键值由指定的函数生成
+// GetOrSetFunc returns the value by key,
+// or sets value with return value of callback function <f> if not exist
+// and returns this value.
 func (gm *StringInterfaceMap) GetOrSetFunc(key string, f func() interface{}) interface{} {
-    if v := gm.Get(key); v == nil {
-        return gm.doSetWithLockCheck(key, f())
-    } else {
-        return v
-    }
+	if v := gm.Get(key); v == nil {
+		return gm.doSetWithLockCheck(key, f())
+	} else {
+		return v
+	}
 }
 
-// 与GetOrSetFunc不同的是，f是在写锁机制内执行
+// GetOrSetFuncLock returns the value by key,
+// or sets value with return value of callback function <f> if not exist
+// and returns this value.
+//
+// GetOrSetFuncLock differs with GetOrSetFunc function is that it executes function <f>
+// with mutex.Lock of the hash map.
 func (gm *StringInterfaceMap) GetOrSetFuncLock(key string, f func() interface{}) interface{} {
-    if v := gm.Get(key); v == nil {
-        return gm.doSetWithLockCheck(key, f)
-    } else {
-        return v
-    }
+	if v := gm.Get(key); v == nil {
+		return gm.doSetWithLockCheck(key, f)
+	} else {
+		return v
+	}
 }
 
-// 当键名不存在时写入，并返回true；否则返回false。
+// SetIfNotExist sets <value> to the map if the <key> does not exist, then return true.
+// It returns false if <key> exists, and <value> would be ignored.
 func (gm *StringInterfaceMap) SetIfNotExist(key string, value interface{}) bool {
-    if !gm.Contains(key) {
-        gm.doSetWithLockCheck(key, value)
-        return true
-    }
-    return false
+	if !gm.Contains(key) {
+		gm.doSetWithLockCheck(key, value)
+		return true
+	}
+	return false
 }
 
-// 批量删除键值对
+// SetIfNotExistFunc sets value with return value of callback function <f>, then return true.
+// It returns false if <key> exists, and <value> would be ignored.
+func (gm *StringInterfaceMap) SetIfNotExistFunc(key string, f func() interface{}) bool {
+	if !gm.Contains(key) {
+		gm.doSetWithLockCheck(key, f())
+		return true
+	}
+	return false
+}
+
+// SetIfNotExistFuncLock sets value with return value of callback function <f>, then return true.
+// It returns false if <key> exists, and <value> would be ignored.
+//
+// SetIfNotExistFuncLock differs with SetIfNotExistFunc function is that
+// it executes function <f> with mutex.Lock of the hash map.
+func (gm *StringInterfaceMap) SetIfNotExistFuncLock(key string, f func() interface{}) bool {
+	if !gm.Contains(key) {
+		gm.doSetWithLockCheck(key, f)
+		return true
+	}
+	return false
+}
+
+// BatchRemove batch deletes values of the map by keys.
 func (gm *StringInterfaceMap) BatchRemove(keys []string) {
-    gm.mu.Lock()
-    for _, key := range keys {
-        delete(gm.m, key)
-    }
-    gm.mu.Unlock()
+	gm.mu.Lock()
+	for _, key := range keys {
+		delete(gm.m, key)
+	}
+	gm.mu.Unlock()
 }
 
-// 返回对应的键值，并删除该键值
+// Remove deletes value from map by given <key>, and return this deleted value.
 func (gm *StringInterfaceMap) Remove(key string) interface{} {
 	gm.mu.Lock()
 	val, exists := gm.m[key]
@@ -169,18 +223,18 @@ func (gm *StringInterfaceMap) Remove(key string) interface{} {
 	return val
 }
 
-// 返回键列表
+// Keys returns all keys of the map as a slice.
 func (gm *StringInterfaceMap) Keys() []string {
 	gm.mu.RLock()
 	keys := make([]string, 0)
 	for key, _ := range gm.m {
 		keys = append(keys, key)
 	}
-    gm.mu.RUnlock()
+	gm.mu.RUnlock()
 	return keys
 }
 
-// 返回值列表(注意是随机排序)
+// Values returns all values of the map as a slice.
 func (gm *StringInterfaceMap) Values() []interface{} {
 	gm.mu.RLock()
 	vals := make([]interface{}, 0)
@@ -191,7 +245,8 @@ func (gm *StringInterfaceMap) Values() []interface{} {
 	return vals
 }
 
-// 是否存在某个键
+// Contains checks whether a key exists.
+// It returns true if the <key> exists, or else false.
 func (gm *StringInterfaceMap) Contains(key string) bool {
 	gm.mu.RLock()
 	_, exists := gm.m[key]
@@ -199,7 +254,7 @@ func (gm *StringInterfaceMap) Contains(key string) bool {
 	return exists
 }
 
-// 哈希表大小
+// Size returns the size of the map.
 func (gm *StringInterfaceMap) Size() int {
 	gm.mu.RLock()
 	length := len(gm.m)
@@ -207,7 +262,8 @@ func (gm *StringInterfaceMap) Size() int {
 	return length
 }
 
-// 哈希表是否为空
+// IsEmpty checks whether the map is empty.
+// It returns true if map is empty, or else false.
 func (gm *StringInterfaceMap) IsEmpty() bool {
 	gm.mu.RLock()
 	empty := len(gm.m) == 0
@@ -215,28 +271,28 @@ func (gm *StringInterfaceMap) IsEmpty() bool {
 	return empty
 }
 
-// 清空哈希表
+// Clear deletes all data of the map, it will remake a new underlying map data map.
 func (gm *StringInterfaceMap) Clear() {
-    gm.mu.Lock()
-    gm.m = make(map[string]interface{})
-    gm.mu.Unlock()
+	gm.mu.Lock()
+	gm.m = make(map[string]interface{})
+	gm.mu.Unlock()
 }
 
-// 并发安全写锁操作，使用自定义方法执行加锁修改操作
+// LockFunc locks writing with given callback function <f> and mutex.Lock.
 func (gm *StringInterfaceMap) LockFunc(f func(m map[string]interface{})) {
-	gm.mu.Lock(true)
-	defer gm.mu.Unlock(true)
+	gm.mu.Lock()
+	defer gm.mu.Unlock()
 	f(gm.m)
 }
 
-// 并发安全读锁操作，使用自定义方法执行加锁读取操作
+// RLockFunc locks reading with given callback function <f> and mutex.RLock.
 func (gm *StringInterfaceMap) RLockFunc(f func(m map[string]interface{})) {
-	gm.mu.RLock(true)
-	defer gm.mu.RUnlock(true)
+	gm.mu.RLock()
+	defer gm.mu.RUnlock()
 	f(gm.m)
 }
 
-// 交换Map中的键和值.
+// Flip exchanges key-value of the map, it will change key-value to value-key.
 func (gm *StringInterfaceMap) Flip() {
 	gm.mu.Lock()
 	defer gm.mu.Unlock()
@@ -247,15 +303,16 @@ func (gm *StringInterfaceMap) Flip() {
 	gm.m = n
 }
 
-// 合并两个Map.
-func (gm *StringInterfaceMap) Merge(m *StringInterfaceMap) {
+// Merge merges two hash maps.
+// The <other> map will be merged into the map <gm>.
+func (gm *StringInterfaceMap) Merge(other *StringInterfaceMap) {
 	gm.mu.Lock()
 	defer gm.mu.Unlock()
-	if m != gm {
-		m.mu.RLock()
-		defer m.mu.RUnlock()
+	if other != gm {
+		other.mu.RLock()
+		defer other.mu.RUnlock()
 	}
-	for k, v := range m.m {
+	for k, v := range other.m {
 		gm.m[k] = v
 	}
-}
+}

g/container/gmap/gmap_string_string_map.go

@@ -16,6 +16,9 @@ type StringStringMap struct {
 	m  map[string]string
 }
 
+// NewStringStringMap returns an empty StringStringMap object.
+// The param <unsafe> used to specify whether using map with un-concurrent-safety,
+// which is false in default, means concurrent-safe.
 func NewStringStringMap(unsafe...bool) *StringStringMap {
 	return &StringStringMap{
 		m  : make(map[string]string),
@@ -23,6 +26,9 @@ func NewStringStringMap(unsafe...bool) *StringStringMap {
 	}
 }
 
+// NewStringStringMapFrom returns an StringStringMap object from given map <m>.
+// Notice that, the param map is a type of pointer,
+// there might be some concurrent-safe issues when changing the map outside.
 func NewStringStringMapFrom(m map[string]string, unsafe...bool) *StringStringMap {
     return &StringStringMap{
         m  : m,
@@ -30,6 +36,12 @@ func NewStringStringMapFrom(m map[string]string, unsafe...bool) *StringStringMap
     }
 }
 
+// NewStringStringMapFromArray returns an StringStringMap object from given array.
+// The param <keys> given as the keys of the map,
+// and <values> as its corresponding values.
+//
+// If length of <keys> is greater than that of <values>,
+// the corresponding overflow map values will be the default value of its type.
 func NewStringStringMapFromArray(keys []string, values []string, unsafe...bool) *StringStringMap {
     m := make(map[string]string)
     l := len(values)
@@ -46,7 +58,8 @@ func NewStringStringMapFromArray(keys []string, values []string, unsafe...bool)
     }
 }
 
-// 给定回调函数对原始内容进行遍历，回调函数返回true表示继续遍历，否则停止遍历
+// Iterator iterates the hash map with custom callback function <f>.
+// If f returns true, then continue iterating; or false to stop.
 func (gm *StringStringMap) Iterator(f func (k string, v string) bool) {
 	gm.mu.RLock()
 	defer gm.mu.RUnlock()
@@ -57,12 +70,12 @@ func (gm *StringStringMap) Iterator(f func (k string, v string) bool) {
 	}
 }
 
-// 哈希表克隆.
+// Clone returns a new hash map with copy of current map data.
 func (gm *StringStringMap) Clone() *StringStringMap {
     return NewStringStringMapFrom(gm.Map(), !gm.mu.IsSafe())
 }
 
-// 返回当前哈希表的数据Map.
+// Map returns a copy of the data of the hash map.
 func (gm *StringStringMap) Map() map[string]string {
     m := make(map[string]string)
     gm.mu.RLock()
@@ -73,14 +86,14 @@ func (gm *StringStringMap) Map() map[string]string {
     return m
 }
 
-// 设置键值对
+// Set sets key-value to the hash map.
 func (gm *StringStringMap) Set(key string, val string) {
 	gm.mu.Lock()
 	gm.m[key] = val
 	gm.mu.Unlock()
 }
 
-// 批量设置键值对
+// BatchSet batch sets key-values to the hash map.
 func (gm *StringStringMap) BatchSet(m map[string]string) {
     gm.mu.Lock()
     for k, v := range m {
@@ -89,7 +102,7 @@ func (gm *StringStringMap) BatchSet(m map[string]string) {
     gm.mu.Unlock()
 }
 
-// 获取键值
+// Get returns the value by given <key>.
 func (gm *StringStringMap) Get(key string) string {
 	gm.mu.RLock()
 	val, _ := gm.m[key]
@@ -97,8 +110,11 @@ func (gm *StringStringMap) Get(key string) string {
 	return val
 }
 
-// 设置kv缓存键值对，内部会对键名的存在性使用写锁进行二次检索确认，如果存在则不再写入；返回键名对应的键值。
-// 在高并发下有用，防止数据写入的并发逻辑错误。
+// doSetWithLockCheck checks whether value of the key exists with mutex.Lock,
+// if not exists, set value to the map with given <key>,
+// or else just return the existing value.
+//
+// It returns value with given <key>.
 func (gm *StringStringMap) doSetWithLockCheck(key string, value string) string {
 	gm.mu.Lock()
 	if v, ok := gm.m[key]; ok {
@@ -110,7 +126,8 @@ func (gm *StringStringMap) doSetWithLockCheck(key string, value string) string {
 	return value
 }
 
-// 当键名存在时返回其键值，否则写入指定的键值
+// GetOrSet returns the value by key,
+// or set value with given <value> if not exist and returns this value.
 func (gm *StringStringMap) GetOrSet(key string, value string) string {
 	gm.mu.RLock()
 	v, ok := gm.m[key]
@@ -122,7 +139,9 @@ func (gm *StringStringMap) GetOrSet(key string, value string) string {
 	}
 }
 
-// 当键名存在时返回其键值，否则写入指定的键值，键值由指定的函数生成
+// GetOrSetFunc returns the value by key,
+// or sets value with return value of callback function <f> if not exist
+// and returns this value.
 func (gm *StringStringMap) GetOrSetFunc(key string, f func() string) string {
 	gm.mu.RLock()
 	v, ok := gm.m[key]
@@ -134,7 +153,12 @@ func (gm *StringStringMap) GetOrSetFunc(key string, f func() string) string {
 	}
 }
 
-// 与GetOrSetFunc不同的是，f是在写锁机制内执行
+// GetOrSetFuncLock returns the value by key,
+// or sets value with return value of callback function <f> if not exist
+// and returns this value.
+//
+// GetOrSetFuncLock differs with GetOrSetFunc function is that it executes function <f>
+// with mutex.Lock of the hash map.
 func (gm *StringStringMap) GetOrSetFuncLock(key string, f func() string) string {
 	gm.mu.RLock()
 	val, ok := gm.m[key]
@@ -143,10 +167,9 @@ func (gm *StringStringMap) GetOrSetFuncLock(key string, f func() string) string
 		gm.mu.Lock()
 		defer gm.mu.Unlock()
 		if v, ok := gm.m[key]; ok {
-			gm.mu.Unlock()
 			return v
 		}
-		val         = f()
+		val       = f()
 		gm.m[key] = val
 		return val
 	} else {
@@ -154,7 +177,8 @@ func (gm *StringStringMap) GetOrSetFuncLock(key string, f func() string) string
 	}
 }
 
-// 当键名不存在时写入，并返回true；否则返回false。
+// SetIfNotExist sets <value> to the map if the <key> does not exist, then return true.
+// It returns false if <key> exists, and <value> would be ignored.
 func (gm *StringStringMap) SetIfNotExist(key string, value string) bool {
 	if !gm.Contains(key) {
 		gm.doSetWithLockCheck(key, value)
@@ -163,7 +187,34 @@ func (gm *StringStringMap) SetIfNotExist(key string, value string) bool {
 	return false
 }
 
-// 批量删除键值对
+// SetIfNotExistFunc sets value with return value of callback function <f>, then return true.
+// It returns false if <key> exists, and <value> would be ignored.
+func (gm *StringStringMap) SetIfNotExistFunc(key string, f func() string) bool {
+	if !gm.Contains(key) {
+		gm.doSetWithLockCheck(key, f())
+		return true
+	}
+	return false
+}
+
+// SetIfNotExistFuncLock sets value with return value of callback function <f>, then return true.
+// It returns false if <key> exists, and <value> would be ignored.
+//
+// SetIfNotExistFuncLock differs with SetIfNotExistFunc function is that
+// it executes function <f> with mutex.Lock of the hash map.
+func (gm *StringStringMap) SetIfNotExistFuncLock(key string, f func() string) bool {
+	if !gm.Contains(key) {
+		gm.mu.Lock()
+		defer gm.mu.Unlock()
+		if _, ok := gm.m[key]; !ok {
+			gm.m[key] = f()
+		}
+		return true
+	}
+	return false
+}
+
+// BatchRemove batch deletes values of the map by keys.
 func (gm *StringStringMap) BatchRemove(keys []string) {
     gm.mu.Lock()
     for _, key := range keys {
@@ -172,7 +223,7 @@ func (gm *StringStringMap) BatchRemove(keys []string) {
     gm.mu.Unlock()
 }
 
-// 返回对应的键值，并删除该键值
+// Remove deletes value from map by given <key>, and return this deleted value.
 func (gm *StringStringMap) Remove(key string) string {
 	gm.mu.Lock()
 	val, exists := gm.m[key]
@@ -183,7 +234,7 @@ func (gm *StringStringMap) Remove(key string) string {
 	return val
 }
 
-// 返回键列表
+// Keys returns all keys of the map as a slice.
 func (gm *StringStringMap) Keys() []string {
 	gm.mu.RLock()
 	keys := make([]string, 0)
@@ -194,7 +245,7 @@ func (gm *StringStringMap) Keys() []string {
 	return keys
 }
 
-// 返回值列表(注意是随机排序)
+// Values returns all values of the map as a slice.
 func (gm *StringStringMap) Values() []string {
 	gm.mu.RLock()
 	vals := make([]string, 0)
@@ -205,7 +256,8 @@ func (gm *StringStringMap) Values() []string {
 	return vals
 }
 
-// 是否存在某个键
+// Contains checks whether a key exists.
+// It returns true if the <key> exists, or else false.
 func (gm *StringStringMap) Contains(key string) bool {
 	gm.mu.RLock()
 	_, exists := gm.m[key]
@@ -213,7 +265,7 @@ func (gm *StringStringMap) Contains(key string) bool {
 	return exists
 }
 
-// 哈希表大小
+// Size returns the size of the map.
 func (gm *StringStringMap) Size() int {
 	gm.mu.RLock()
 	length := len(gm.m)
@@ -221,7 +273,8 @@ func (gm *StringStringMap) Size() int {
 	return length
 }
 
-// 哈希表是否为空
+// IsEmpty checks whether the map is empty.
+// It returns true if map is empty, or else false.
 func (gm *StringStringMap) IsEmpty() bool {
 	gm.mu.RLock()
 	empty := len(gm.m) == 0
@@ -229,28 +282,28 @@ func (gm *StringStringMap) IsEmpty() bool {
 	return empty
 }
 
-// 清空哈希表
+// Clear deletes all data of the map, it will remake a new underlying map data map.
 func (gm *StringStringMap) Clear() {
     gm.mu.Lock()
     gm.m = make(map[string]string)
     gm.mu.Unlock()
 }
 
-// 并发安全写锁操作，使用自定义方法执行加锁修改操作
+// LockFunc locks writing with given callback function <f> and mutex.Lock.
 func (gm *StringStringMap) LockFunc(f func(m map[string]string)) {
-	gm.mu.Lock(true)
-	defer gm.mu.Unlock(true)
+	gm.mu.Lock()
+	defer gm.mu.Unlock()
 	f(gm.m)
 }
 
-// 并发安全读锁操作，使用自定义方法执行加锁读取操作
+// RLockFunc locks reading with given callback function <f> and mutex.RLock.
 func (gm *StringStringMap) RLockFunc(f func(m map[string]string)) {
-	gm.mu.RLock(true)
-	defer gm.mu.RUnlock(true)
+	gm.mu.RLock()
+	defer gm.mu.RUnlock()
 	f(gm.m)
 }
 
-// 交换Map中的键和值.
+// Flip exchanges key-value of the map, it will change key-value to value-key.
 func (gm *StringStringMap) Flip() {
 	gm.mu.Lock()
 	defer gm.mu.Unlock()
@@ -261,15 +314,16 @@ func (gm *StringStringMap) Flip() {
 	gm.m = n
 }
 
-// 合并两个Map.
-func (gm *StringStringMap) Merge(m *StringStringMap) {
+// Merge merges two hash maps.
+// The <other> map will be merged into the map <gm>.
+func (gm *StringStringMap) Merge(other *StringStringMap) {
 	gm.mu.Lock()
 	defer gm.mu.Unlock()
-	if m != gm {
-		m.mu.RLock()
-		defer m.mu.RUnlock()
+	if other != gm {
+		other.mu.RLock()
+		defer other.mu.RUnlock()
 	}
-	for k, v := range m.m {
+	for k, v := range other.m {
 		gm.m[k] = v
 	}
 }

g/container/gmap/gmap_z_int_bool_test.go

@@ -0,0 +1,123 @@
+package gmap_test
+
+import (
+	"github.com/gogf/gf/g/container/gmap"
+	"github.com/gogf/gf/g/test/gtest"
+	"testing"
+)
+
+func getBool() bool {
+	return true
+}
+func intBoolCallBack(int, bool) bool {
+	return true
+}
+func Test_IntBoolMap_Basic(t *testing.T) {
+	gtest.Case(t, func() {
+		m := gmap.NewIntBoolMap()
+		m.Set(1, true)
+
+		gtest.Assert(m.Get(1), true)
+		gtest.Assert(m.Size(), 1)
+		gtest.Assert(m.IsEmpty(), false)
+
+		gtest.Assert(m.GetOrSet(2, false), false)
+		gtest.Assert(m.SetIfNotExist(2, false), false)
+
+		gtest.Assert(m.SetIfNotExist(3, false), true)
+
+		gtest.Assert(m.Remove(2), false)
+		gtest.Assert(m.Contains(2), false)
+
+		gtest.AssertIN(3, m.Keys())
+		gtest.AssertIN(1, m.Keys())
+
+		m.Clear()
+		gtest.Assert(m.Size(), 0)
+		gtest.Assert(m.IsEmpty(), true)
+
+		m2 := gmap.NewIntBoolMapFrom(map[int]bool{1: true, 2: false})
+		gtest.Assert(m2.Map(), map[int]bool{1: true, 2: false})
+		m3 := gmap.NewIntBoolMapFromArray([]int{1, 2}, []bool{true, false})
+		gtest.Assert(m3.Map(), map[int]bool{1: true, 2: false})
+
+	})
+}
+func Test_IntBoolMap_Set_Fun(t *testing.T) {
+	m := gmap.NewIntBoolMap()
+
+	m.GetOrSetFunc(1, getBool)
+	m.GetOrSetFuncLock(2, getBool)
+	gtest.Assert(m.Get(1), true)
+	gtest.Assert(m.Get(2), true)
+	gtest.Assert(m.SetIfNotExistFunc(1, getBool), false)
+	gtest.Assert(m.SetIfNotExistFunc(4, getBool), true)
+
+	gtest.Assert(m.SetIfNotExistFuncLock(2, getBool), false)
+	gtest.Assert(m.SetIfNotExistFuncLock(3, getBool), true)
+
+}
+
+func Test_IntBoolMap_Batch(t *testing.T) {
+	m := gmap.NewIntBoolMap()
+
+	m.BatchSet(map[int]bool{1: true, 2: false, 3: true})
+	gtest.Assert(m.Map(), map[int]bool{1: true, 2: false, 3: true})
+	m.BatchRemove([]int{1, 2})
+	gtest.Assert(m.Map(), map[int]bool{3: true})
+}
+func Test_IntBoolMap_Iterator(t *testing.T){
+	expect := map[int]bool{1: true, 2: false}
+	m      := gmap.NewIntBoolMapFrom(expect)
+	m.Iterator(func(k int, v bool) bool {
+		gtest.Assert(expect[k], v)
+		return true
+	})
+	// 断言返回值对遍历控制
+	i := 0
+	j := 0
+	m.Iterator(func(k int, v bool) bool {
+		i++
+		return true
+	})
+	m.Iterator(func(k int, v bool) bool {
+		j++
+		return false
+	})
+	gtest.Assert(i, 2)
+	gtest.Assert(j, 1)
+}
+
+func Test_IntBoolMap_Lock(t *testing.T){
+	expect := map[int]bool{1: true, 2: false}
+	m      := gmap.NewIntBoolMapFrom(expect)
+	m.LockFunc(func(m map[int]bool) {
+		gtest.Assert(m, expect)
+	})
+	m.RLockFunc(func(m map[int]bool) {
+		gtest.Assert(m, expect)
+	})
+
+}
+
+func Test_IntBoolMap_Clone(t *testing.T) {
+	//clone 方法是深克隆
+	m := gmap.NewIntBoolMapFrom(map[int]bool{1: true, 2: false})
+
+	m_clone := m.Clone()
+	m.Remove(1)
+	//修改原 map,clone 后的 map 不影响
+	gtest.AssertIN(1, m_clone.Keys())
+
+	m_clone.Remove(2)
+	//修改clone map,原 map 不影响
+	gtest.AssertIN(2, m.Keys())
+}
+func Test_IntBoolMap_Merge(t *testing.T) {
+	m1 := gmap.NewIntBoolMap()
+	m2 := gmap.NewIntBoolMap()
+	m1.Set(1, true)
+	m2.Set(2, false)
+	m1.Merge(m2)
+	gtest.Assert(m1.Map(), map[int]bool{1: true, 2: false})
+}

g/container/gmap/gmap_z_int_int_test.go

@@ -0,0 +1,128 @@
+package gmap_test
+
+import (
+	"github.com/gogf/gf/g/container/gmap"
+	"github.com/gogf/gf/g/test/gtest"
+	"testing"
+)
+
+func getInt() int {
+	return 123
+}
+func intIntCallBack(int, int) bool {
+	return true
+}
+func Test_IntIntMap_Basic(t *testing.T) {
+	gtest.Case(t, func() {
+		m := gmap.NewIntIntMap()
+		m.Set(1, 1)
+
+		gtest.Assert(m.Get(1), 1)
+		gtest.Assert(m.Size(), 1)
+		gtest.Assert(m.IsEmpty(), false)
+
+		gtest.Assert(m.GetOrSet(2, 2), 2)
+		gtest.Assert(m.SetIfNotExist(2, 2), false)
+
+		gtest.Assert(m.SetIfNotExist(3, 3), true)
+
+		gtest.Assert(m.Remove(2), 2)
+		gtest.Assert(m.Contains(2), false)
+
+		gtest.AssertIN(3, m.Keys())
+		gtest.AssertIN(1, m.Keys())
+		gtest.AssertIN(3, m.Values())
+		gtest.AssertIN(1, m.Values())
+		m.Flip()
+		gtest.Assert(m.Map(), map[int]int{1: 1, 3: 3})
+
+		m.Clear()
+		gtest.Assert(m.Size(), 0)
+		gtest.Assert(m.IsEmpty(), true)
+
+		m2 := gmap.NewIntIntMapFrom(map[int]int{1: 1, 2: 2})
+		gtest.Assert(m2.Map(), map[int]int{1: 1, 2: 2})
+		m3 := gmap.NewIntIntMapFromArray([]int{1, 2}, []int{1, 2})
+		gtest.Assert(m3.Map(), map[int]int{1: 1, 2: 2})
+
+	})
+}
+func Test_IntIntMap_Set_Fun(t *testing.T) {
+	m := gmap.NewIntIntMap()
+
+	m.GetOrSetFunc(1, getInt)
+	m.GetOrSetFuncLock(2, getInt)
+	gtest.Assert(m.Get(1), 123)
+	gtest.Assert(m.Get(2), 123)
+	gtest.Assert(m.SetIfNotExistFunc(1, getInt), false)
+	gtest.Assert(m.SetIfNotExistFunc(3, getInt), true)
+
+	gtest.Assert(m.SetIfNotExistFuncLock(2, getInt), false)
+	gtest.Assert(m.SetIfNotExistFuncLock(4, getInt), true)
+
+}
+
+func Test_IntIntMap_Batch(t *testing.T) {
+	m := gmap.NewIntIntMap()
+
+	m.BatchSet(map[int]int{1: 1, 2: 2, 3: 3})
+	m.Iterator(intIntCallBack)
+	gtest.Assert(m.Map(), map[int]int{1: 1, 2: 2, 3: 3})
+	m.BatchRemove([]int{1, 2})
+	gtest.Assert(m.Map(), map[int]int{3: 3})
+}
+
+func Test_IntIntMap_Iterator(t *testing.T){
+	expect := map[int]int{1: 1, 2: 2}
+	m      := gmap.NewIntIntMapFrom(expect)
+	m.Iterator(func(k int, v int) bool {
+		gtest.Assert(expect[k], v)
+		return true
+	})
+	// 断言返回值对遍历控制
+	i := 0
+	j := 0
+	m.Iterator(func(k int, v int) bool {
+		i++
+		return true
+	})
+	m.Iterator(func(k int, v int) bool {
+		j++
+		return false
+	})
+	gtest.Assert(i, 2)
+	gtest.Assert(j, 1)
+}
+
+func Test_IntIntMap_Lock(t *testing.T){
+	expect := map[int]int{1: 1, 2: 2}
+	m      := gmap.NewIntIntMapFrom(expect)
+	m.LockFunc(func(m map[int]int) {
+		gtest.Assert(m, expect)
+	})
+	m.RLockFunc(func(m map[int]int) {
+		gtest.Assert(m, expect)
+	})
+
+}
+func Test_IntIntMap_Clone(t *testing.T) {
+	//clone 方法是深克隆
+	m := gmap.NewIntIntMapFrom(map[int]int{1: 1, 2: 2})
+
+	m_clone := m.Clone()
+	m.Remove(1)
+	//修改原 map,clone 后的 map 不影响
+	gtest.AssertIN(1, m_clone.Keys())
+
+	m_clone.Remove(2)
+	//修改clone map,原 map 不影响
+	gtest.AssertIN(2, m.Keys())
+}
+func Test_IntIntMap_Merge(t *testing.T) {
+	m1 := gmap.NewIntIntMap()
+	m2 := gmap.NewIntIntMap()
+	m1.Set(1, 1)
+	m2.Set(2, 2)
+	m1.Merge(m2)
+	gtest.Assert(m1.Map(), map[int]int{1: 1, 2: 2})
+}

g/container/gmap/gmap_z_int_interface_test.go

@@ -0,0 +1,128 @@
+package gmap_test
+
+import (
+	"github.com/gogf/gf/g/container/gmap"
+	"github.com/gogf/gf/g/test/gtest"
+	"testing"
+)
+
+func getInterface() interface{} {
+	return 123
+}
+func intInterfaceCallBack(int, interface{}) bool {
+	return true
+}
+func Test_IntInterfaceMap_Basic(t *testing.T) {
+	gtest.Case(t, func() {
+		m := gmap.NewIntInterfaceMap()
+		m.Set(1, 1)
+
+		gtest.Assert(m.Get(1), 1)
+		gtest.Assert(m.Size(), 1)
+		gtest.Assert(m.IsEmpty(), false)
+
+		gtest.Assert(m.GetOrSet(2, "2"), "2")
+		gtest.Assert(m.SetIfNotExist(2, "2"), false)
+
+		gtest.Assert(m.SetIfNotExist(3, 3), true)
+
+		gtest.Assert(m.Remove(2), "2")
+		gtest.Assert(m.Contains(2), false)
+
+		gtest.AssertIN(3, m.Keys())
+		gtest.AssertIN(1, m.Keys())
+		gtest.AssertIN(3, m.Values())
+		gtest.AssertIN(1, m.Values())
+		m.Flip()
+		gtest.Assert(m.Map(), map[interface{}]int{1: 1, 3: 3})
+
+		m.Clear()
+		gtest.Assert(m.Size(), 0)
+		gtest.Assert(m.IsEmpty(), true)
+
+		m2 := gmap.NewIntInterfaceMapFrom(map[int]interface{}{1: 1, 2: "2"})
+		gtest.Assert(m2.Map(), map[int]interface{}{1: 1, 2: "2"})
+		m3 := gmap.NewIntInterfaceMapFromArray([]int{1, 2}, []interface{}{1, "2"})
+		gtest.Assert(m3.Map(), map[int]interface{}{1: 1, 2: "2"})
+
+	})
+}
+func Test_IntInterfaceMap_Set_Fun(t *testing.T) {
+	m := gmap.NewIntInterfaceMap()
+
+	m.GetOrSetFunc(1, getInterface)
+	m.GetOrSetFuncLock(2, getInterface)
+	gtest.Assert(m.Get(1), 123)
+	gtest.Assert(m.Get(2), 123)
+
+	gtest.Assert(m.SetIfNotExistFunc(1, getInterface), false)
+	gtest.Assert(m.SetIfNotExistFunc(3, getInterface), true)
+
+	gtest.Assert(m.SetIfNotExistFuncLock(2, getInterface), false)
+	gtest.Assert(m.SetIfNotExistFuncLock(4, getInterface), true)
+
+}
+
+func Test_IntInterfaceMap_Batch(t *testing.T) {
+	m := gmap.NewIntInterfaceMap()
+
+	m.BatchSet(map[int]interface{}{1: 1, 2: "2", 3: 3})
+	gtest.Assert(m.Map(), map[int]interface{}{1: 1, 2: "2", 3: 3})
+	m.BatchRemove([]int{1, 2})
+	gtest.Assert(m.Map(), map[int]interface{}{3: 3})
+}
+func Test_IntInterfaceMap_Iterator(t *testing.T){
+	expect := map[int]interface{}{1: 1, 2: "2"}
+	m      := gmap.NewIntInterfaceMapFrom(expect)
+	m.Iterator(func(k int, v interface{}) bool {
+		gtest.Assert(expect[k], v)
+		return true
+	})
+	// 断言返回值对遍历控制
+	i := 0
+	j := 0
+	m.Iterator(func(k int, v interface{}) bool {
+		i++
+		return true
+	})
+	m.Iterator(func(k int, v interface{}) bool {
+		j++
+		return false
+	})
+	gtest.Assert(i, "2")
+	gtest.Assert(j, 1)
+
+
+}
+
+func Test_IntInterfaceMap_Lock(t *testing.T){
+	expect := map[int]interface{}{1: 1, 2: "2"}
+	m := gmap.NewIntInterfaceMapFrom(expect)
+	m.LockFunc(func(m map[int]interface{}) {
+		gtest.Assert(m, expect)
+	})
+	m.RLockFunc(func(m map[int]interface{}) {
+		gtest.Assert(m, expect)
+	})
+}
+func Test_IntInterfaceMap_Clone(t *testing.T) {
+	//clone 方法是深克隆
+	m := gmap.NewIntInterfaceMapFrom(map[int]interface{}{1: 1, 2: "2"})
+
+	m_clone := m.Clone()
+	m.Remove(1)
+	//修改原 map,clone 后的 map 不影响
+	gtest.AssertIN(1, m_clone.Keys())
+
+	m_clone.Remove(2)
+	//修改clone map,原 map 不影响
+	gtest.AssertIN(2, m.Keys())
+}
+func Test_IntInterfaceMap_Merge(t *testing.T) {
+	m1 := gmap.NewIntInterfaceMap()
+	m2 := gmap.NewIntInterfaceMap()
+	m1.Set(1, 1)
+	m2.Set(2, "2")
+	m1.Merge(m2)
+	gtest.Assert(m1.Map(), map[int]interface{}{1: 1, 2: "2"})
+}

g/container/gmap/gmap_z_int_string_test.go

@@ -0,0 +1,132 @@
+package gmap_test
+
+import (
+	"github.com/gogf/gf/g/container/gmap"
+	"github.com/gogf/gf/g/test/gtest"
+	"testing"
+)
+
+func getString() string {
+	return "z"
+}
+func intStringCallBack(int, string) bool {
+	return true
+}
+func Test_IntStringMap_Basic(t *testing.T) {
+	gtest.Case(t, func() {
+		m := gmap.NewIntStringMap()
+		m.Set(1, "a")
+
+		gtest.Assert(m.Get(1), "a")
+		gtest.Assert(m.Size(), 1)
+		gtest.Assert(m.IsEmpty(), false)
+
+		gtest.Assert(m.GetOrSet(2, "b"), "b")
+		gtest.Assert(m.SetIfNotExist(2, "b"), false)
+
+		gtest.Assert(m.SetIfNotExist(3, "c"), true)
+
+		gtest.Assert(m.Remove(2), "b")
+		gtest.Assert(m.Contains(2), false)
+
+		gtest.AssertIN(3, m.Keys())
+		gtest.AssertIN(1, m.Keys())
+		gtest.AssertIN("a", m.Values())
+		gtest.AssertIN("c", m.Values())
+
+		//反转之后不成为以下 map,flip 操作只是翻转原 map
+		//gtest.Assert(m.Map(), map[string]int{"a": 1, "c": 3})
+		m_f := gmap.NewIntStringMap()
+		m_f.Set(1, "2")
+		m_f.Flip()
+		gtest.Assert(m_f.Map(), map[int]string{2: "1"})
+
+		m.Clear()
+		gtest.Assert(m.Size(), 0)
+		gtest.Assert(m.IsEmpty(), true)
+
+		m2 := gmap.NewIntStringMapFrom(map[int]string{1: "a", 2: "b"})
+		gtest.Assert(m2.Map(), map[int]string{1: "a", 2: "b"})
+		m3 := gmap.NewIntStringMapFromArray([]int{1, 2}, []string{"a", "b"})
+		gtest.Assert(m3.Map(), map[int]string{1: "a", 2: "b"})
+
+	})
+}
+func Test_IntStringMap_Set_Fun(t *testing.T) {
+	m := gmap.NewIntStringMap()
+
+	m.GetOrSetFunc(1, getString)
+	m.GetOrSetFuncLock(2, getString)
+	gtest.Assert(m.Get(1), "z")
+	gtest.Assert(m.Get(2), "z")
+	gtest.Assert(m.SetIfNotExistFunc(1, getString), false)
+	gtest.Assert(m.SetIfNotExistFunc(3, getString), true)
+
+	gtest.Assert(m.SetIfNotExistFuncLock(2, getString), false)
+	gtest.Assert(m.SetIfNotExistFuncLock(4, getString), true)
+
+}
+
+func Test_IntStringMap_Batch(t *testing.T) {
+	m := gmap.NewIntStringMap()
+
+	m.BatchSet(map[int]string{1: "a", 2: "b", 3: "c"})
+	gtest.Assert(m.Map(), map[int]string{1: "a", 2: "b",3: "c"})
+	m.BatchRemove([]int{1, 2})
+	gtest.Assert(m.Map(), map[int]interface{}{3: "c"})
+}
+func Test_IntStringMap_Iterator(t *testing.T){
+	expect := map[int]string{1: "a", 2: "b"}
+	m      := gmap.NewIntStringMapFrom(expect)
+	m.Iterator(func(k int, v string) bool {
+		gtest.Assert(expect[k], v)
+		return true
+	})
+	// 断言返回值对遍历控制
+	i := 0
+	j := 0
+	m.Iterator(func(k int, v string) bool {
+		i++
+		return true
+	})
+	m.Iterator(func(k int, v string) bool {
+		j++
+		return false
+	})
+	gtest.Assert(i, 2)
+	gtest.Assert(j, 1)
+}
+
+func Test_IntStringMap_Lock(t *testing.T){
+
+	expect := map[int]string{1: "a", 2: "b", 3: "c"}
+	m      := gmap.NewIntStringMapFrom(expect)
+	m.LockFunc(func(m map[int]string) {
+		gtest.Assert(m, expect)
+	})
+	m.RLockFunc(func(m map[int]string) {
+		gtest.Assert(m, expect)
+	})
+
+}
+func Test_IntStringMap_Clone(t *testing.T) {
+	//clone 方法是深克隆
+	m := gmap.NewIntStringMapFrom(map[int]string{1: "a", 2: "b", 3: "c"})
+
+	m_clone := m.Clone()
+	m.Remove(1)
+	//修改原 map,clone 后的 map 不影响
+	gtest.AssertIN(1, m_clone.Keys())
+
+	m_clone.Remove(2)
+	//修改clone map,原 map 不影响
+	gtest.AssertIN(2, m.Keys())
+}
+func Test_IntStringMap_Merge(t *testing.T) {
+	m1 := gmap.NewIntStringMap()
+	m2 := gmap.NewIntStringMap()
+	m1.Set(1, "a")
+	m2.Set(2, "b")
+	m1.Merge(m2)
+	gtest.Assert(m1.Map(), map[int]string{1: "a", 2: "b"})
+}

g/container/gmap/gmap_z_interface_interface_basic_test.go

@@ -0,0 +1,125 @@
+package gmap_test
+
+import (
+	"github.com/gogf/gf/g/container/gmap"
+	"github.com/gogf/gf/g/test/gtest"
+	"testing"
+)
+
+func getValue() interface{} {
+	return 3
+}
+func callBack(k interface{}, v interface{}) bool {
+	return true
+}
+
+func Test_Map_Basic(t *testing.T) {
+	gtest.Case(t, func() {
+		m := gmap.New()
+		m.Set("key1", "val1")
+		gtest.Assert(m.Keys(), []interface{}{"key1"})
+
+		gtest.Assert(m.Get("key1"), "val1")
+		gtest.Assert(m.Size(), 1)
+		gtest.Assert(m.IsEmpty(), false)
+
+		gtest.Assert(m.GetOrSet("key2", "val2"), "val2")
+		gtest.Assert(m.SetIfNotExist("key2", "val2"), false)
+
+		gtest.Assert(m.SetIfNotExist("key3", "val3"), true)
+
+		gtest.Assert(m.Remove("key2"), "val2")
+		gtest.Assert(m.Contains("key2"), false)
+
+		gtest.AssertIN("key3", m.Keys())
+		gtest.AssertIN("key1", m.Keys())
+		gtest.AssertIN("val3", m.Values())
+		gtest.AssertIN("val1", m.Values())
+
+		m.Flip()
+		gtest.Assert(m.Map(), map[interface{}]interface{}{"val3": "key3", "val1": "key1"})
+
+		m.Clear()
+		gtest.Assert(m.Size(), 0)
+		gtest.Assert(m.IsEmpty(), true)
+
+		m2 := gmap.NewFrom(map[interface{}]interface{}{1: 1, "key1": "val1"})
+		gtest.Assert(m2.Map(), map[interface{}]interface{}{1: 1, "key1": "val1"})
+		m3 := gmap.NewFromArray([]interface{}{1, "key1"}, []interface{}{1, "val1"})
+		gtest.Assert(m3.Map(), map[interface{}]interface{}{1: 1, "key1": "val1"})
+
+	})
+}
+func Test_Map_Set_Fun(t *testing.T) {
+	m := gmap.New()
+	m.GetOrSetFunc("fun", getValue)
+	m.GetOrSetFuncLock("funlock", getValue)
+	gtest.Assert(m.Get("funlock"), 3)
+	gtest.Assert(m.Get("fun"), 3)
+	m.GetOrSetFunc("fun", getValue)
+	gtest.Assert(m.SetIfNotExistFunc("fun", getValue), false)
+	gtest.Assert(m.SetIfNotExistFuncLock("funlock", getValue), false)
+}
+
+func Test_Map_Batch(t *testing.T) {
+	m := gmap.New()
+	m.BatchSet(map[interface{}]interface{}{1: 1, "key1": "val1", "key2": "val2", "key3": "val3"})
+	gtest.Assert(m.Map(), map[interface{}]interface{}{1: 1, "key1": "val1", "key2": "val2", "key3": "val3"})
+	m.BatchRemove([]interface{}{"key1", 1})
+	gtest.Assert(m.Map(), map[interface{}]interface{}{"key2": "val2", "key3": "val3"})
+}
+func Test_Map_Iterator(t *testing.T){
+	expect :=map[interface{}]interface{}{1: 1, "key1": "val1"}
+
+	m := gmap.NewFrom(expect)
+	m.Iterator(func(k interface{}, v interface{}) bool {
+		gtest.Assert(expect[k], v)
+		return true
+	})
+	// 断言返回值对遍历控制
+	i := 0
+	j := 0
+	m.Iterator(func(k interface{}, v interface{}) bool {
+		i++
+		return true
+	})
+	m.Iterator(func(k interface{}, v interface{}) bool {
+		j++
+		return false
+	})
+	gtest.Assert(i, 2)
+	gtest.Assert(j, 1)
+}
+
+func Test_Map_Lock(t *testing.T){
+	expect :=map[interface{}]interface{}{1: 1, "key1": "val1"}
+
+	m := gmap.NewFrom(expect)
+	m.LockFunc(func(m map[interface{}]interface{}) {
+		gtest.Assert(m, expect)
+	})
+	m.RLockFunc(func(m map[interface{}]interface{}) {
+		gtest.Assert(m, expect)
+	})
+}
+
+func Test_Map_Clone(t *testing.T) {
+	//clone 方法是深克隆
+	m := gmap.NewFrom(map[interface{}]interface{}{1: 1, "key1": "val1"})
+	m_clone := m.Clone()
+	m.Remove(1)
+	//修改原 map,clone 后的 map 不影响
+	gtest.AssertIN(1, m_clone.Keys())
+
+	m_clone.Remove("key1")
+	//修改clone map,原 map 不影响
+	gtest.AssertIN("key1", m.Keys())
+}
+func Test_Map_Basic_Merge(t *testing.T) {
+	m1 := gmap.New()
+	m2 := gmap.New()
+	m1.Set("key1", "val1")
+	m2.Set("key2", "val2")
+	m1.Merge(m2)
+	gtest.Assert(m1.Map(), map[interface{}]interface{}{"key1": "val1", "key2": "val2"})
+}

g/container/gmap/gmap_z_normal_example_test.go

@@ -0,0 +1,71 @@
+package gmap_test
+
+import (
+	"fmt"
+	"github.com/gogf/gf/g/container/gmap"
+)
+
+func Example_Normal_Basic() {
+	m := gmap.New()
+
+	//Add data
+	m.Set("key1", "val1")
+
+	//Print size
+	fmt.Println(m.Size())
+	//output 1
+
+	add_map := make(map[interface{}]interface{})
+	add_map["key2"] = "val2"
+	add_map["key3"] = "val3"
+	add_map[1] = 1
+
+	fmt.Println(m.Values())
+
+	//Batch add data
+	m.BatchSet(add_map)
+
+	//Gets the value of the corresponding key
+	key3_val := m.Get("key3")
+	fmt.Println(key3_val)
+
+	//Get the value by key, or set it with given key-value if not exist.
+	get_or_set_val := m.GetOrSet("key4", "val4")
+	fmt.Println(get_or_set_val)
+
+	// Set key-value if the key does not exist, then return true; or else return false.
+	is_set := m.SetIfNotExist("key3", "val3")
+	fmt.Println(is_set)
+
+	//Remove key
+	m.Remove("key2")
+	fmt.Println(m.Keys())
+
+	//Batch remove keys
+	remove_keys := []interface{}{"key1", 1}
+	m.BatchRemove(remove_keys)
+	fmt.Println(m.Keys())
+
+	//Contains checks whether a key exists.
+	is_contain := m.Contains("key3")
+	fmt.Println(is_contain)
+
+	//Flip exchanges key-value of the map, it will change key-value to value-key.
+	m.Flip()
+	fmt.Println(m.Map())
+
+	// Clear deletes all data of the map,
+	m.Clear()
+
+	fmt.Println(m.Size())
+
+}
+func Example_Normal_Merge(){
+	m1 := gmap.New()
+	m2 := gmap.New()
+	m1.Set("key1","val1")
+	m2.Set("key2","val2")
+	m1.Merge(m2)
+	fmt.Println(m1.Map())
+}
+

g/container/gmap/gmap_z_string_bool_test.go

@@ -0,0 +1,122 @@
+package gmap_test
+
+import (
+	"github.com/gogf/gf/g/container/gmap"
+	"github.com/gogf/gf/g/test/gtest"
+	"testing"
+)
+
+func StringBoolCallBack(string, bool) bool {
+	return true
+}
+func Test_StringBoolMap_Basic(t *testing.T) {
+	gtest.Case(t, func() {
+		m := gmap.NewStringBoolMap()
+		m.Set("a", true)
+
+		gtest.Assert(m.Get("a"), true)
+		gtest.Assert(m.Size(), 1)
+		gtest.Assert(m.IsEmpty(), false)
+
+		gtest.Assert(m.GetOrSet("b", false), false)
+		gtest.Assert(m.SetIfNotExist("b", false), false)
+
+		gtest.Assert(m.SetIfNotExist("c", false), true)
+
+		gtest.Assert(m.Remove("b"), false)
+		gtest.Assert(m.Contains("b"), false)
+
+		gtest.AssertIN("c", m.Keys())
+		gtest.AssertIN("a", m.Keys())
+
+		m.Clear()
+		gtest.Assert(m.Size(), 0)
+		gtest.Assert(m.IsEmpty(), true)
+
+		m2 := gmap.NewStringBoolMapFrom(map[string]bool{"a": true, "b": false})
+		gtest.Assert(m2.Map(), map[string]bool{"a": true, "b": false})
+		m3 := gmap.NewStringBoolMapFromArray([]string{"a", "b"}, []bool{true, false})
+		gtest.Assert(m3.Map(), map[string]bool{"a": true, "b": false})
+
+	})
+}
+func Test_StringBoolMap_Set_Fun(t *testing.T) {
+	m := gmap.NewStringBoolMap()
+
+	m.GetOrSetFunc("a", getBool)
+	m.GetOrSetFuncLock("b", getBool)
+	gtest.Assert(m.Get("a"), true)
+	gtest.Assert(m.Get("b"), true)
+	gtest.Assert(m.SetIfNotExistFunc("a", getBool), false)
+	gtest.Assert(m.SetIfNotExistFunc("c", getBool), true)
+
+	gtest.Assert(m.SetIfNotExistFuncLock("b", getBool), false)
+	gtest.Assert(m.SetIfNotExistFuncLock("d", getBool), true)
+
+}
+
+func Test_StringBoolMap_Batch(t *testing.T) {
+	m := gmap.NewStringBoolMap()
+
+	m.BatchSet(map[string]bool{"a": true, "b": false, "c": true})
+	gtest.Assert(m.Map(), map[string]bool{"a": true, "b": false, "c": true})
+	m.BatchRemove([]string{"a", "b"})
+	gtest.Assert(m.Map(), map[string]bool{"c": true})
+}
+
+func Test_StringBoolMap_Iterator(t *testing.T) {
+	expect := map[string]bool{"a": true, "b": false}
+	m := gmap.NewStringBoolMapFrom(expect)
+	m.Iterator(func(k string, v bool) bool {
+		gtest.Assert(expect[k], v)
+		return true
+	})
+	// 断言返回值对遍历控制
+	i := 0
+	j := 0
+	m.Iterator(func(k string, v bool) bool {
+		i++
+		return true
+	})
+	m.Iterator(func(k string, v bool) bool {
+		j++
+		return false
+	})
+	gtest.Assert(i, 2)
+	gtest.Assert(j, 1)
+
+}
+
+func Test_StringBoolMap_Lock(t *testing.T) {
+	expect := map[string]bool{"a": true, "b": false}
+
+	m      := gmap.NewStringBoolMapFrom(expect)
+	m.LockFunc(func(m map[string]bool) {
+		gtest.Assert(m, expect)
+	})
+	m.RLockFunc(func(m map[string]bool) {
+		gtest.Assert(m, expect)
+	})
+}
+
+func Test_StringBoolMap_Clone(t *testing.T) {
+	//clone 方法是深克隆
+	m := gmap.NewStringBoolMapFrom(map[string]bool{"a": true, "b": false})
+
+	m_clone := m.Clone()
+	m.Remove("a")
+	//修改原 map,clone 后的 map 不影响
+	gtest.AssertIN("a", m_clone.Keys())
+
+	m_clone.Remove("b")
+	//修改clone map,原 map 不影响
+	gtest.AssertIN("b", m.Keys())
+}
+func Test_StringBoolMap_Merge(t *testing.T) {
+	m1 := gmap.NewStringBoolMap()
+	m2 := gmap.NewStringBoolMap()
+	m1.Set("a", true)
+	m2.Set("b", false)
+	m1.Merge(m2)
+	gtest.Assert(m1.Map(), map[string]bool{"a": true, "b": false})
+}

g/container/gmap/gmap_z_string_int_test.go

@@ -0,0 +1,128 @@
+package gmap_test
+
+import (
+	"github.com/gogf/gf/g/container/gmap"
+	"github.com/gogf/gf/g/test/gtest"
+	"testing"
+)
+
+func stringIntCallBack(string, int) bool {
+	return true
+}
+func Test_StringIntMap_Basic(t *testing.T) {
+	gtest.Case(t, func() {
+		m := gmap.NewStringIntMap()
+		m.Set("a", 1)
+
+		gtest.Assert(m.Get("a"), 1)
+		gtest.Assert(m.Size(), 1)
+		gtest.Assert(m.IsEmpty(), false)
+
+		gtest.Assert(m.GetOrSet("b", 2), 2)
+		gtest.Assert(m.SetIfNotExist("b", 2), false)
+
+		gtest.Assert(m.SetIfNotExist("c", 3), true)
+
+		gtest.Assert(m.Remove("b"), 2)
+		gtest.Assert(m.Contains("b"), false)
+
+		gtest.AssertIN("c", m.Keys())
+		gtest.AssertIN("a", m.Keys())
+		gtest.AssertIN(3, m.Values())
+		gtest.AssertIN(1, m.Values())
+
+		m_f := gmap.NewStringIntMap()
+		m_f.Set("1", 2)
+		m_f.Flip()
+		gtest.Assert(m_f.Map(), map[string]int{"2": 1})
+
+		m.Clear()
+		gtest.Assert(m.Size(), 0)
+		gtest.Assert(m.IsEmpty(), true)
+
+		m2 := gmap.NewStringIntMapFrom(map[string]int{"a": 1, "b": 2})
+		gtest.Assert(m2.Map(), map[string]int{"a": 1, "b": 2})
+		m3 := gmap.NewStringIntMapFromArray([]string{"a", "b"}, []int{1, 2})
+		gtest.Assert(m3.Map(), map[string]int{"a": 1, "b": 2})
+
+	})
+}
+func Test_StringIntMap_Set_Fun(t *testing.T) {
+	m := gmap.NewStringIntMap()
+
+	m.GetOrSetFunc("a", getInt)
+	m.GetOrSetFuncLock("b", getInt)
+	gtest.Assert(m.Get("a"), 123)
+	gtest.Assert(m.Get("b"), 123)
+	gtest.Assert(m.SetIfNotExistFunc("a", getInt), false)
+	gtest.Assert(m.SetIfNotExistFunc("c", getInt), true)
+
+	gtest.Assert(m.SetIfNotExistFuncLock("b", getInt), false)
+	gtest.Assert(m.SetIfNotExistFuncLock("d", getInt), true)
+
+}
+
+func Test_StringIntMap_Batch(t *testing.T) {
+	m := gmap.NewStringIntMap()
+
+	m.BatchSet(map[string]int{"a": 1, "b": 2, "c": 3})
+	gtest.Assert(m.Map(), map[string]int{"a": 1, "b": 2, "c": 3})
+	m.BatchRemove([]string{"a", "b"})
+	gtest.Assert(m.Map(), map[string]int{"c": 3})
+}
+func Test_StringIntMap_Iterator(t *testing.T) {
+	expect := map[string]int{"a": 1, "b": 2}
+	m := gmap.NewStringIntMapFrom(expect)
+	m.Iterator(func(k string, v int) bool {
+		gtest.Assert(expect[k], v)
+		return true
+	})
+	// 断言返回值对遍历控制
+	i := 0
+	j := 0
+	m.Iterator(func(k string, v int) bool {
+		i++
+		return true
+	})
+	m.Iterator(func(k string, v int) bool {
+		j++
+		return false
+	})
+	gtest.Assert(i, 2)
+	gtest.Assert(j, 1)
+
+}
+
+func Test_StringIntMap_Lock(t *testing.T) {
+	expect := map[string]int{"a": 1, "b": 2}
+
+	m      := gmap.NewStringIntMapFrom(expect)
+	m.LockFunc(func(m map[string]int) {
+		gtest.Assert(m, expect)
+	})
+	m.RLockFunc(func(m map[string]int) {
+		gtest.Assert(m, expect)
+	})
+}
+
+func Test_StringIntMap_Clone(t *testing.T) {
+	//clone 方法是深克隆
+	m := gmap.NewStringIntMapFrom(map[string]int{"a": 1, "b": 2, "c": 3})
+
+	m_clone := m.Clone()
+	m.Remove("a")
+	//修改原 map,clone 后的 map 不影响
+	gtest.AssertIN("a", m_clone.Keys())
+
+	m_clone.Remove("b")
+	//修改clone map,原 map 不影响
+	gtest.AssertIN("b", m.Keys())
+}
+func Test_StringIntMap_Merge(t *testing.T) {
+	m1 := gmap.NewStringIntMap()
+	m2 := gmap.NewStringIntMap()
+	m1.Set("a", 1)
+	m2.Set("b", 2)
+	m1.Merge(m2)
+	gtest.Assert(m1.Map(), map[string]int{"a": 1, "b": 2})
+}

g/container/gmap/gmap_z_string_interface_test.go

@@ -0,0 +1,125 @@
+package gmap_test
+
+import (
+	"github.com/gogf/gf/g/container/gmap"
+	"github.com/gogf/gf/g/test/gtest"
+	"testing"
+)
+
+func stringInterfaceCallBack(string, interface{}) bool {
+	return true
+}
+func Test_StringInterfaceMap_Basic(t *testing.T) {
+	gtest.Case(t, func() {
+		m := gmap.NewStringInterfaceMap()
+		m.Set("a", 1)
+
+		gtest.Assert(m.Get("a"), 1)
+		gtest.Assert(m.Size(), 1)
+		gtest.Assert(m.IsEmpty(), false)
+
+		gtest.Assert(m.GetOrSet("b", "2"), "2")
+		gtest.Assert(m.SetIfNotExist("b", "2"), false)
+
+		gtest.Assert(m.SetIfNotExist("c", 3), true)
+
+		gtest.Assert(m.Remove("b"), "2")
+		gtest.Assert(m.Contains("b"), false)
+
+		gtest.AssertIN("c", m.Keys())
+		gtest.AssertIN("a", m.Keys())
+		gtest.AssertIN(3, m.Values())
+		gtest.AssertIN(1, m.Values())
+
+		m.Flip()
+		gtest.Assert(m.Map(), map[string]interface{}{"1": "a", "3": "c"})
+
+		m.Clear()
+		gtest.Assert(m.Size(), 0)
+		gtest.Assert(m.IsEmpty(), true)
+
+		m2 := gmap.NewStringInterfaceMapFrom(map[string]interface{}{"a": 1, "b": "2"})
+		gtest.Assert(m2.Map(), map[string]interface{}{"a": 1, "b": "2"})
+		m3 := gmap.NewStringInterfaceMapFromArray([]string{"a", "b"}, []interface{}{1, "2"})
+		gtest.Assert(m3.Map(), map[string]interface{}{"a": 1, "b": "2"})
+
+	})
+}
+func Test_StringInterfaceMap_Set_Fun(t *testing.T) {
+	m := gmap.NewStringInterfaceMap()
+
+	m.GetOrSetFunc("a", getInterface)
+	m.GetOrSetFuncLock("b", getInterface)
+	gtest.Assert(m.Get("a"), 123)
+	gtest.Assert(m.Get("b"), 123)
+	gtest.Assert(m.SetIfNotExistFunc("a", getInterface), false)
+	gtest.Assert(m.SetIfNotExistFunc("c", getInterface), true)
+
+	gtest.Assert(m.SetIfNotExistFuncLock("b", getInterface), false)
+	gtest.Assert(m.SetIfNotExistFuncLock("d", getInterface), true)
+
+}
+
+func Test_StringInterfaceMap_Batch(t *testing.T) {
+	m := gmap.NewStringInterfaceMap()
+
+	m.BatchSet(map[string]interface{}{"a": 1, "b": "2", "c": 3})
+	gtest.Assert(m.Map(), map[string]interface{}{"a": 1, "b": "2", "c": 3})
+	m.BatchRemove([]string{"a", "b"})
+	gtest.Assert(m.Map(), map[string]interface{}{"c": 3})
+}
+
+func Test_StringInterfaceMap_Iterator(t *testing.T) {
+	expect := map[string]interface{}{"a": true, "b": false}
+	m := gmap.NewStringInterfaceMapFrom(expect)
+	m.Iterator(func(k string, v interface{}) bool {
+		gtest.Assert(expect[k], v)
+		return true
+	})
+	// 断言返回值对遍历控制
+	i := 0
+	j := 0
+	m.Iterator(func(k string, v interface{}) bool {
+		i++
+		return true
+	})
+	m.Iterator(func(k string, v interface{}) bool {
+		j++
+		return false
+	})
+	gtest.Assert(i, 2)
+	gtest.Assert(j, 1)
+}
+
+func Test_StringInterfaceMap_Lock(t *testing.T) {
+	expect := map[string]interface{}{"a": true, "b": false}
+
+	m      := gmap.NewStringInterfaceMapFrom(expect)
+	m.LockFunc(func(m map[string]interface{}) {
+		gtest.Assert(m, expect)
+	})
+	m.RLockFunc(func(m map[string]interface{}) {
+		gtest.Assert(m, expect)
+	})
+}
+func Test_StringInterfaceMap_Clone(t *testing.T) {
+	//clone 方法是深克隆
+	m := gmap.NewStringInterfaceMapFrom(map[string]interface{}{"a": 1, "b": "2"})
+
+	m_clone := m.Clone()
+	m.Remove("a")
+	//修改原 map,clone 后的 map 不影响
+	gtest.AssertIN("a", m_clone.Keys())
+
+	m_clone.Remove("b")
+	//修改clone map,原 map 不影响
+	gtest.AssertIN("b", m.Keys())
+}
+func Test_StringInterfaceMap_Merge(t *testing.T) {
+	m1 := gmap.NewStringInterfaceMap()
+	m2 := gmap.NewStringInterfaceMap()
+	m1.Set("a", 1)
+	m2.Set("b", "2")
+	m1.Merge(m2)
+	gtest.Assert(m1.Map(), map[string]interface{}{"a": 1, "b": "2"})
+}

g/container/gmap/gmap_z_string_string_test.go

@@ -0,0 +1,125 @@
+package gmap_test
+
+import (
+	"github.com/gogf/gf/g/container/gmap"
+	"github.com/gogf/gf/g/test/gtest"
+	"testing"
+)
+
+func stringStringCallBack(string, string) bool {
+	return true
+}
+func Test_StringStringMap_Basic(t *testing.T) {
+	gtest.Case(t, func() {
+		m := gmap.NewStringStringMap()
+		m.Set("a", "a")
+
+		gtest.Assert(m.Get("a"), "a")
+		gtest.Assert(m.Size(), 1)
+		gtest.Assert(m.IsEmpty(), false)
+
+		gtest.Assert(m.GetOrSet("b", "b"), "b")
+		gtest.Assert(m.SetIfNotExist("b", "b"), false)
+
+		gtest.Assert(m.SetIfNotExist("c", "c"), true)
+
+		gtest.Assert(m.Remove("b"), "b")
+		gtest.Assert(m.Contains("b"), false)
+
+		gtest.AssertIN("c", m.Keys())
+		gtest.AssertIN("a", m.Keys())
+		gtest.AssertIN("a", m.Values())
+		gtest.AssertIN("c", m.Values())
+
+		m.Flip()
+
+		gtest.Assert(m.Map(), map[string]string{"a": "a", "c": "c"})
+
+		m.Clear()
+		gtest.Assert(m.Size(), 0)
+		gtest.Assert(m.IsEmpty(), true)
+
+		m2 := gmap.NewStringStringMapFrom(map[string]string{"a": "a", "b": "b"})
+		gtest.Assert(m2.Map(), map[string]string{"a": "a", "b": "b"})
+		m3 := gmap.NewStringStringMapFromArray([]string{"a", "b"}, []string{"a", "b"})
+		gtest.Assert(m3.Map(), map[string]string{"a": "a", "b": "b"})
+
+	})
+}
+func Test_StringStringMap_Set_Fun(t *testing.T) {
+	m := gmap.NewStringStringMap()
+
+	m.GetOrSetFunc("a", getString)
+	m.GetOrSetFuncLock("b", getString)
+	gtest.Assert(m.Get("a"), "z")
+	gtest.Assert(m.Get("b"), "z")
+	gtest.Assert(m.SetIfNotExistFunc("a", getString), false)
+	gtest.Assert(m.SetIfNotExistFunc("c", getString), true)
+
+	gtest.Assert(m.SetIfNotExistFuncLock("b", getString), false)
+	gtest.Assert(m.SetIfNotExistFuncLock("d", getString), true)
+
+}
+
+func Test_StringStringMap_Batch(t *testing.T) {
+	m := gmap.NewStringStringMap()
+
+	m.BatchSet(map[string]string{"a": "a", "b": "b", "c": "c"})
+	gtest.Assert(m.Map(), map[string]string{"a": "a", "b": "b", "c": "c"})
+	m.BatchRemove([]string{"a", "b"})
+	gtest.Assert(m.Map(), map[string]string{"c": "c"})
+}
+func Test_StringStringMap_Iterator(t *testing.T) {
+	expect := map[string]string{"a": "a", "b": "b"}
+	m := gmap.NewStringStringMapFrom(expect)
+	m.Iterator(func(k string, v string) bool {
+		gtest.Assert(expect[k], v)
+		return true
+	})
+	// 断言返回值对遍历控制
+	i := 0
+	j := 0
+	m.Iterator(func(k string, v string) bool {
+		i++
+		return true
+	})
+	m.Iterator(func(k string, v string) bool {
+		j++
+		return false
+	})
+	gtest.Assert(i, 2)
+	gtest.Assert(j, 1)
+}
+
+func Test_StringStringMap_Lock(t *testing.T) {
+	expect := map[string]string{"a": "a", "b": "b"}
+
+	m      := gmap.NewStringStringMapFrom(expect)
+	m.LockFunc(func(m map[string]string) {
+		gtest.Assert(m, expect)
+	})
+	m.RLockFunc(func(m map[string]string) {
+		gtest.Assert(m, expect)
+	})
+}
+func Test_StringStringMap_Clone(t *testing.T) {
+	//clone 方法是深克隆
+	m := gmap.NewStringStringMapFrom(map[string]string{"a": "a", "b": "b", "c": "c"})
+
+	m_clone := m.Clone()
+	m.Remove("a")
+	//修改原 map,clone 后的 map 不影响
+	gtest.AssertIN("a", m_clone.Keys())
+
+	m_clone.Remove("b")
+	//修改clone map,原 map 不影响
+	gtest.AssertIN("b", m.Keys())
+}
+func Test_StringStringMap_Merge(t *testing.T) {
+	m1 := gmap.NewStringStringMap()
+	m2 := gmap.NewStringStringMap()
+	m1.Set("a", "a")
+	m2.Set("b", "b")
+	m1.Merge(m2)
+	gtest.Assert(m1.Map(), map[string]string{"a": "a", "b": "b"})
+}

g/container/gpool/gpool.go

@@ -5,8 +5,6 @@
 // You can obtain one at https://github.com/gogf/gf.
 
 // Package gpool provides a object-reusable concurrent-safe pool.
-//
-// 对象复用池.
 package gpool
 
 import (

g/container/gqueue/gqueue.go

@@ -4,44 +4,40 @@
 // If a copy of the MIT was not distributed with this file,
 // You can obtain one at https://github.com/gogf/gf.
 
-// Package gqueue provides a dynamic/static concurrent-safe(alternative) queue.
+// Package gqueue provides a dynamic/static concurrent-safe queue.
 //
-// 并发安全动态队列.
+// Features:
+//
+// 1. FIFO queue(data -> list -> chan);
+//
+// 2. Fast creation and initialization;
+//
+// 3. Support dynamic queue size(unlimited queue size);
+//
+// 4. Blocking when reading data from queue;
 //
-//   特点：
-//   1. 动态队列初始化速度快；
-//   2. 动态的队列大小(不限大小)；
-//   3. 取数据时如果队列为空那么会阻塞等待；
 package gqueue
 
 import (
-    "container/list"
+    "github.com/gogf/gf/g/container/glist"
     "math"
-    "sync"
 )
 
-// 1、这是一个先进先出的队列(chan <-- list)；
-//
-// 2、当创建Queue对象时限定大小，那么等同于一个同步的chan并发安全队列；
-//
-// 3、不限制大小时，list链表用以存储数据，临时chan负责为客户端读取数据，当从chan获取数据时，list往chan中不停补充数据；
-//
-// 4、由于功能主体是chan，那么操作仍然像chan那样具有阻塞效果；
 type Queue struct {
-    mu        sync.Mutex       // 底层链表写锁
-    limit     int              // 队列限制大小
-    list      *list.List       // 底层数据链表
-    events    chan struct{}    // 写入事件通知
-    closed    chan struct{}    // 队列关闭通知
-    C         chan interface{} // 队列数据读取
+    limit     int              // Limit for queue size.
+    list      *glist.List      // Underlying list structure for data maintaining.
+    events    chan struct{}    // Events for data writing.
+    closed    chan struct{}    // Events for queue closing.
+    C         chan interface{} // Underlying channel for data reading.
 }
 
 const (
-    // 动态队列缓冲区大小
+    // Size for queue buffer.
     gDEFAULT_QUEUE_SIZE = 10000
 )
 
-// 队列大小为非必须参数，默认不限制
+// New returns a queue object.
+// Param <limit> is optional and it is not limited by default.
 func New(limit...int) *Queue {
     q := &Queue {
         closed : make(chan struct{}, 0),
@@ -50,7 +46,7 @@ func New(limit...int) *Queue {
         q.limit  = limit[0]
         q.C      = make(chan interface{}, limit[0])
     } else {
-        q.list   = list.New()
+        q.list   = glist.New()
         q.events = make(chan struct{}, math.MaxInt32)
         q.C      = make(chan interface{}, gDEFAULT_QUEUE_SIZE)
         go q.startAsyncLoop()
@@ -58,7 +54,8 @@ func New(limit...int) *Queue {
     return q
 }
 
-// 异步list->chan同步队列
+// startAsyncLoop starts an asynchronous goroutine,
+// which handles the data synchronization from list <q.list> to channel <q.C>.
 func (q *Queue) startAsyncLoop() {
     for {
         select {
@@ -68,7 +65,6 @@ func (q *Queue) startAsyncLoop() {
                 for {
                     if length := q.list.Len(); length > 0 {
                         array := make([]interface{}, length)
-                        q.mu.Lock()
                         for i := 0; i < length; i++ {
                             if e := q.list.Front(); e != nil {
                                 array[i] = q.list.Remove(e)
@@ -76,7 +72,6 @@ func (q *Queue) startAsyncLoop() {
                                 break
                             }
                         }
-                        q.mu.Unlock()
                         for _, v := range array {
                            q.C <- v
                         }
@@ -88,31 +83,33 @@ func (q *Queue) startAsyncLoop() {
     }
 }
 
-// 将数据压入队列, 队尾
+// Push pushes the data <v> into the queue.
+// Note that it would panics if the Push method is called after the queue is closed.
 func (q *Queue) Push(v interface{}) {
     if q.limit > 0 {
         q.C <- v
     } else {
-        q.mu.Lock()
         q.list.PushBack(v)
-        q.mu.Unlock()
         q.events <- struct{}{}
     }
 }
 
-// 从队头先进先出地从队列取出一项数据
+// Pop pops an item from the queue in FIFO way.
+// Note that it would return nil immediately if the Pop method is called after the queue is closed.
 func (q *Queue) Pop() interface{} {
     return <- q.C
 }
 
-// 关闭队列(通知所有通过Pop*阻塞的协程退出)
+// Close closes the queue.
+// Notice: It would notify all goroutines exit immediately,
+// which are blocked reading by Pop method).
 func (q *Queue) Close() {
     close(q.C)
     close(q.events)
     close(q.closed)
 }
 
-// 获取当前队列大小
+// Size returns the length of the queue.
 func (q *Queue) Size() int {
     return len(q.C) + q.list.Len()
 }

g/container/gring/gring.go

@@ -4,9 +4,7 @@
 // If a copy of the MIT was not distributed with this file,
 // You can obtain one at https://github.com/gogf/gf.
 
-// Package gring provides a concurrent-safe(alternative) ring(circular lists).
-//
-// 并发安全环.
+// Package gring provides a concurrent-safe/unsafe ring(circular lists).
 package gring
 
 import (
@@ -149,8 +147,8 @@ func (r *Ring) Unlink(n int) *Ring {
 
 // 读锁遍历，往后只读遍历，回调函数返回true表示继续遍历，否则退出遍历
 func (r *Ring) RLockIteratorNext(f func(value interface{}) bool) {
-    r.mu.RLock(true)
-    defer r.mu.RUnlock(true)
+    r.mu.RLock()
+    defer r.mu.RUnlock()
     if !f(r.ring.Value) {
         return
     }
@@ -163,8 +161,8 @@ func (r *Ring) RLockIteratorNext(f func(value interface{}) bool) {
 
 // 读锁遍历，往前只读遍历，回调函数返回true表示继续遍历，否则退出遍历
 func (r *Ring) RLockIteratorPrev(f func(value interface{}) bool) {
-    r.mu.RLock(true)
-    defer r.mu.RUnlock(true)
+    r.mu.RLock()
+    defer r.mu.RUnlock()
     if !f(r.ring.Value) {
         return
     }
@@ -177,8 +175,8 @@ func (r *Ring) RLockIteratorPrev(f func(value interface{}) bool) {
 
 // 写锁遍历，往后写遍历，回调函数返回true表示继续遍历，否则退出遍历
 func (r *Ring) LockIteratorNext(f func(item *ring.Ring) bool) {
-    r.mu.RLock(true)
-    defer r.mu.RUnlock(true)
+    r.mu.RLock()
+    defer r.mu.RUnlock()
     if !f(r.ring) {
         return
     }
@@ -191,8 +189,8 @@ func (r *Ring) LockIteratorNext(f func(item *ring.Ring) bool) {
 
 // 写锁遍历，往前写遍历，回调函数返回true表示继续遍历，否则退出遍历
 func (r *Ring) LockIteratorPrev(f func(item *ring.Ring) bool) {
-    r.mu.RLock(true)
-    defer r.mu.RUnlock(true)
+    r.mu.RLock()
+    defer r.mu.RUnlock()
     if !f(r.ring) {
         return
     }

g/container/gring/gring_unit_test.go

@@ -0,0 +1,229 @@
+package gring_test
+
+import (
+	"container/ring"
+	"github.com/gogf/gf/g"
+	"github.com/gogf/gf/g/container/gring"
+	"github.com/gogf/gf/g/test/gtest"
+	"testing"
+)
+type Student struct {
+	position int
+	name    string
+	upgrade bool
+}
+
+func TestRing_Val(t *testing.T) {
+	gtest.Case(t, func() {
+		//定义cap 为3的ring类型数据
+		r := gring.New(3, true)
+		//分别给3个元素初始化赋值
+		r.Put(&Student{1,"jimmy", true})
+		r.Put(&Student{2,"tom", true})
+		r.Put(&Student{3,"alon", false})
+
+		//元素取值并判断和预设值是否相等
+		gtest.Assert(r.Val().(*Student).name,"jimmy")
+		//从当前位置往后移两个元素
+		r.Move(2)
+		gtest.Assert(r.Val().(*Student).name,"alon")
+		//更新元素值
+		//测试 value == nil
+		r.Set(nil)
+		gtest.Assert(r.Val(),nil)
+		//测试value != nil
+		r.Set(&Student{3, "jack", true})
+	})
+}
+func TestRing_CapLen(t *testing.T) {
+	gtest.Case(t, func() {
+		r := gring.New(10)
+		r.Put("goframe")
+		//cap长度 10
+		gtest.Assert(r.Cap(), 10)
+		//已有数据项 1
+		gtest.Assert(r.Len(), 1)
+	})
+}
+
+func TestRing_Position(t *testing.T) {
+	gtest.Case(t, func() {
+		r := gring.New(2)
+		r.Put(1)
+		r.Put(2)
+		//往后移动1个元素
+		r.Next()
+		gtest.Assert(r.Val(),2)
+		//往前移动1个元素
+		r.Prev()
+		gtest.Assert(r.Val(),1)
+
+	})
+}
+
+func TestRing_Link(t *testing.T) {
+	gtest.Case(t, func() {
+		r := gring.New(3)
+		r.Put(1)
+		r.Put(2)
+		r.Put(3)
+		s := gring.New(2)
+		s.Put("a")
+		s.Put("b")
+
+		rs := r.Link(s)
+		gtest.Assert(rs.Move(2).Val(), "b")
+
+	})
+}
+
+func TestRing_Unlink(t *testing.T) {
+	gtest.Case(t, func() {
+		r := gring.New(5)
+		for i := 0; i< 5; i++  {
+			r.Put(i+1)
+		}
+		// 1 2 3 4
+		// 删除当前位置往后的2个数据，返回被删除的数据
+		// 重新计算s len
+		s := r.Unlink(2)		// 2 3
+		gtest.Assert(s.Val(), 2)
+		gtest.Assert(s.Len(), 1)
+	})
+}
+
+func TestRing_Slice(t *testing.T) {
+	gtest.Case(t, func() {
+		ringLen := 5
+		r := gring.New(ringLen)
+		for i := 0; i< ringLen; i++  {
+			r.Put(i+1)
+		}
+		r.Move(2)	// 3
+		array := r.SliceNext()		// [3 4 5 1 2]
+		gtest.Assert(array[0], 3)
+		gtest.Assert(len(array), 5)
+
+		//判断array是否等于[3 4 5 1 2]
+		ra := []int{3,4,5,1,2}
+		gtest.Assert(ra, array)
+
+		//第3个元素设为nil
+		r.Set(nil)
+		array2 := r.SliceNext() 	//[4 5 1 2]
+		//返回当前位置往后不为空的元素数组，长度为4
+		gtest.Assert(array2, g.Slice{4,5,1,2})
+
+		array3 := r.SlicePrev() 	//[2 1 5 4]
+		gtest.Assert(array3, g.Slice{2,1,5,4})
+
+		s := gring.New(ringLen)
+		for i := 0; i< ringLen; i++  {
+			s.Put(i+1)
+		}
+		array4 := s.SlicePrev()	// []
+		gtest.Assert(array4, g.Slice{1,5,4,3,2})
+
+	})
+}
+
+func TestRing_RLockIterator(t *testing.T) {
+	gtest.Case(t, func() {
+		ringLen := 5
+		r := gring.New(ringLen)
+
+		//ring不存在有值元素
+		r.RLockIteratorNext(func(v interface{}) bool {
+			gtest.Assert(v, nil)
+			return false
+		})
+		r.RLockIteratorNext(func(v interface{}) bool {
+			gtest.Assert(v, nil)
+			return true
+		})
+
+		r.RLockIteratorPrev(func(v interface{}) bool {
+			gtest.Assert(v, nil)
+			return true
+		})
+
+		for i := 0; i< ringLen; i++  {
+			r.Put(i+1)
+		}
+
+		//回调函数返回true,RLockIteratorNext遍历5次,期望值分别是1、2、3、4、5
+		i := 0
+		r.RLockIteratorNext(func(v interface{}) bool {
+			gtest.Assert(v, i+1)
+			i++;
+			return true
+		})
+
+		//RLockIteratorPrev遍历1次返回 false,退出遍历
+		r.RLockIteratorPrev(func(v interface{}) bool {
+			gtest.Assert(v, 1)
+			return false
+		})
+
+	})
+}
+
+func TestRing_LockIterator(t *testing.T) {
+	gtest.Case(t, func() {
+		ringLen := 5
+		r := gring.New(ringLen)
+
+		//不存在有值元素
+		r.LockIteratorNext(func(item *ring.Ring) bool {
+			gtest.Assert(item.Value, nil)
+			return false
+		})
+		r.LockIteratorNext(func(item *ring.Ring) bool {
+			gtest.Assert(item.Value, nil)
+			return false
+		})
+		r.LockIteratorNext(func(item *ring.Ring) bool {
+			gtest.Assert(item.Value, nil)
+			return true
+		})
+
+		r.LockIteratorPrev(func(item *ring.Ring) bool {
+			gtest.Assert(item.Value, nil)
+			return false
+		})
+		r.LockIteratorPrev(func(item *ring.Ring) bool {
+			gtest.Assert(item.Value, nil)
+			return true
+		})
+
+		//ring初始化元素值
+		for i := 0; i< ringLen; i++  {
+			r.Put(i+1)
+		}
+
+		//往后遍历组成数据 [1,2,3,4,5]
+		array1 := g.Slice{1,2,3,4,5}
+		ii := 0
+		r.LockIteratorNext(func(item *ring.Ring) bool {
+			//校验每一次遍历取值是否是期望值
+			gtest.Assert(item.Value, array1[ii])
+			ii++;
+			return true
+		})
+
+		//往后取3个元素组成数组
+		//获得 [1,5,4]
+		i := 0
+		a := g.Slice{1,5,4}
+		r.LockIteratorPrev(func(item *ring.Ring) bool {
+			if i > 2 {
+				return false
+			}
+			gtest.Assert(item.Value, a[i])
+			i++;
+			return true
+		})
+
+
+	})
+}

g/container/gset/gset.go

@@ -4,9 +4,7 @@
 // If a copy of the MIT was not distributed with this file,
 // You can obtain one at https://github.com/gogf/gf.
 
-// Package gset provides kinds of concurrent-safe(alternative) sets.
-//
-// 并发安全集合.
+// Package gset provides kinds of concurrent-safe/unsafe sets.
 package gset
 
 import (
@@ -20,18 +18,14 @@ type Set struct {
     m  map[interface{}]struct{}
 }
 
-// Create a set, which contains un-repeated items.
-// The param <unsafe> used to specify whether using array with un-concurrent-safety,
-// which is false in default, means concurrent-safe in default.
-//
-// 创建一个空的集合对象，参数unsafe用于指定是否用于非并发安全场景，默认为false，表示并发安全。
+// New create and returns a new set, which contains un-repeated items.
+// The param <unsafe> used to specify whether using set in un-concurrent-safety,
+// which is false in default.
 func New(unsafe...bool) *Set {
     return NewSet(unsafe...)
 }
 
 // See New.
-//
-// 同New.
 func NewSet(unsafe...bool) *Set {
     return &Set{
         m  : make(map[interface{}]struct{}),
@@ -39,10 +33,21 @@ func NewSet(unsafe...bool) *Set {
     }
 }
 
-// Iterate the set by given callback <f>,
+// NewFrom returns a new set from <items>.
+// Parameter <items> can be either a variable of any type, or a slice.
+func NewFrom(items interface{}, unsafe...bool) *Set {
+	m := make(map[interface{}]struct{})
+	for _, v := range gconv.Interfaces(items) {
+		m[v] = struct{}{}
+	}
+	return &Set{
+		m  : m,
+		mu : rwmutex.New(unsafe...),
+	}
+}
+
+// Iterator iterates the set with given callback function <f>,
 // if <f> returns true then continue iterating; or false to stop.
-//
-// 给定回调函数对原始内容进行遍历，回调函数返回true表示继续遍历，否则停止遍历。
 func (set *Set) Iterator(f func (v interface{}) bool) *Set {
     set.mu.RLock()
     defer set.mu.RUnlock()
@@ -54,9 +59,7 @@ func (set *Set) Iterator(f func (v interface{}) bool) *Set {
     return set
 }
 
-// Add one or multiple items to the set.
-//
-// 添加元素项到集合中(支持多个).
+// Add adds one or multiple items to the set.
 func (set *Set) Add(item...interface{}) *Set {
     set.mu.Lock()
     for _, v := range item {
@@ -66,9 +69,7 @@ func (set *Set) Add(item...interface{}) *Set {
     return set
 }
 
-// Check whether the set contains <item>.
-//
-// 键是否存在.
+// Contains checks whether the set contains <item>.
 func (set *Set) Contains(item interface{}) bool {
     set.mu.RLock()
     _, exists := set.m[item]
@@ -76,9 +77,7 @@ func (set *Set) Contains(item interface{}) bool {
     return exists
 }
 
-// Remove <item> from set.
-//
-// 删除元素项。
+// Remove deletes <item> from set.
 func (set *Set) Remove(item interface{}) *Set {
     set.mu.Lock()
     delete(set.m, item)
@@ -86,9 +85,7 @@ func (set *Set) Remove(item interface{}) *Set {
     return set
 }
 
-// Get size of the set.
-//
-// 获得集合大小。
+// Size returns the size of the set.
 func (set *Set) Size() int {
     set.mu.RLock()
     l := len(set.m)
@@ -96,9 +93,7 @@ func (set *Set) Size() int {
     return l
 }
 
-// Clear the set.
-//
-// 清空集合。
+// Clear deletes all items of the set.
 func (set *Set) Clear() *Set {
     set.mu.Lock()
     set.m = make(map[interface{}]struct{})
@@ -106,9 +101,7 @@ func (set *Set) Clear() *Set {
     return set
 }
 
-// Get the copy of items from set as slice.
-//
-// 获得集合元素项列表.
+// Slice returns the a of items of the set as slice.
 func (set *Set) Slice() []interface{} {
     set.mu.RLock()
     i   := 0
@@ -121,43 +114,33 @@ func (set *Set) Slice() []interface{} {
     return ret
 }
 
-// Join set items with a string.
-//
-// 使用glue字符串串连当前集合的元素项，构造成新的字符串返回。
+// Join joins items with a string <glue>.
 func (set *Set) Join(glue string) string {
     return strings.Join(gconv.Strings(set.Slice()), ",")
 }
 
-// Return set items as a string, which are joined by char ','.
-//
-// 使用glue字符串串连当前集合的元素项，构造成新的字符串返回。
+// String returns items as a string, which are joined by char ','.
 func (set *Set) String() string {
     return set.Join(",")
 }
 
-// Lock writing by callback function f.
-//
-// 使用自定义方法执行加锁修改操作。
+// LockFunc locks writing with callback function <f>.
 func (set *Set) LockFunc(f func(m map[interface{}]struct{})) *Set {
-    set.mu.Lock(true)
-    defer set.mu.Unlock(true)
+    set.mu.Lock()
+    defer set.mu.Unlock()
     f(set.m)
     return set
 }
 
-// Lock reading by callback function f.
-//
-// 使用自定义方法执行加锁读取操作。
+// RLockFunc locks reading with callback function <f>.
 func (set *Set) RLockFunc(f func(m map[interface{}]struct{})) *Set {
-    set.mu.RLock(true)
-    defer set.mu.RUnlock(true)
+    set.mu.RLock()
+    defer set.mu.RUnlock()
     f(set.m)
     return set
 }
 
-// Check whether the two sets equal.
-//
-// 判断两个集合是否相等.
+// Equal checks whether the two sets equal.
 func (set *Set) Equal(other *Set) bool {
     if set == other {
         return true
@@ -177,9 +160,7 @@ func (set *Set) Equal(other *Set) bool {
     return true
 }
 
-// Check whether the current set is sub-set of <other>.
-//
-// 判断当前集合是否为other集合的子集.
+// IsSubsetOf checks whether the current set is a sub-set of <other>.
 func (set *Set) IsSubsetOf(other *Set) bool {
     if set == other {
         return true
@@ -196,10 +177,8 @@ func (set *Set) IsSubsetOf(other *Set) bool {
     return true
 }
 
-// Returns a new set which is the union of <set> and <other>.
-// Which means, all the items in <newSet> is in <set> or in <other>.
-//
-// 并集, 返回新的集合：属于set或属于others的元素为元素的集合.
+// Union returns a new set which is the union of <set> and <others>.
+// Which means, all the items in <newSet> are in <set> or in <others>.
 func (set *Set) Union(others ... *Set) (newSet *Set) {
     newSet = NewSet(true)
     set.mu.RLock()
@@ -224,10 +203,8 @@ func (set *Set) Union(others ... *Set) (newSet *Set) {
     return
 }
 
-// Returns a new set which is the difference set from <set> to <other>.
-// Which means, all the items in <newSet> is in <set> and not in <other>.
-//
-// 差集, 返回新的集合: 属于set且不属于others的元素为元素的集合.
+// Diff returns a new set which is the difference set from <set> to <others>.
+// Which means, all the items in <newSet> are in <set> but not in <others>.
 func (set *Set) Diff(others...*Set) (newSet *Set) {
     newSet = NewSet(true)
     set.mu.RLock()
@@ -247,10 +224,8 @@ func (set *Set) Diff(others...*Set) (newSet *Set) {
     return
 }
 
-// Returns a new set which is the intersection from <set> to <other>.
-// Which means, all the items in <newSet> is in <set> and also in <other>.
-//
-// 交集, 返回新的集合: 属于set且属于others的元素为元素的集合.
+// Intersect returns a new set which is the intersection from <set> to <others>.
+// Which means, all the items in <newSet> are in <set> and also in <others>.
 func (set *Set) Intersect(others...*Set) (newSet *Set) {
     newSet = NewSet(true)
     set.mu.RLock()
@@ -271,11 +246,11 @@ func (set *Set) Intersect(others...*Set) (newSet *Set) {
     return
 }
 
-// Returns a new set which is the complement from <set> to <full>.
-// Which means, all the items in <newSet> is in <full> and not in <set>.
+// Complement returns a new set which is the complement from <set> to <full>.
+// Which means, all the items in <newSet> are in <full> and not in <set>.
 //
-// 补集, 返回新的集合: (前提: set应当为full的子集)属于全集full不属于集合set的元素组成的集合.
-// 如果给定的full集合不是set的全集时，返回full与set的差集.
+// It returns the difference between <full> and <set>
+// if the given set <full> is not the full set of <set>.
 func (set *Set) Complement(full *Set) (newSet *Set) {
     newSet = NewSet(true)
     set.mu.RLock()
@@ -290,4 +265,63 @@ func (set *Set) Complement(full *Set) (newSet *Set) {
         }
     }
     return
+}
+
+// Merge adds items from <others> sets into <set>.
+func (set *Set) Merge(others ... *Set) *Set {
+	set.mu.Lock()
+	defer set.mu.Unlock()
+	for _, other := range others {
+		if set != other {
+			other.mu.RLock()
+		}
+		for k, v := range other.m {
+			set.m[k] = v
+		}
+		if set != other {
+			other.mu.RUnlock()
+		}
+	}
+	return set
+}
+
+// Sum sums items.
+// Note: The items should be converted to int type,
+// or you'd get a result that you unexpected.
+func (set *Set) Sum() (sum int) {
+	set.mu.RLock()
+	defer set.mu.RUnlock()
+	for k, _ := range set.m {
+		sum += gconv.Int(k)
+	}
+	return
+}
+
+// Pops randomly pops an item from set.
+func (set *Set) Pop(size int) interface{} {
+	set.mu.RLock()
+	defer set.mu.RUnlock()
+	for k, _ := range set.m {
+		return k
+	}
+	return nil
+}
+
+// Pops randomly pops <size> items from set.
+func (set *Set) Pops(size int) []interface{} {
+	set.mu.RLock()
+	defer set.mu.RUnlock()
+	if size > len(set.m) {
+		size = len(set.m)
+	}
+	index := 0
+	array := make([]interface{}, size)
+	for k, _ := range set.m {
+		array[index] = k
+		index++
+		if index == size {
+			break
+		}
+	}
+	return array
 }

g/container/gset/gset_int_set.go

@@ -18,11 +18,9 @@ type IntSet struct {
 	m  map[int]struct{}
 }
 
-// Create a set, which contains un-repeated items.
-// The param <unsafe> used to specify whether using array with un-concurrent-safety,
-// which is false in default, means concurrent-safe in default.
-//
-// 创建一个空的集合对象，参数unsafe用于指定是否用于非并发安全场景，默认为false，表示并发安全。
+// New create and returns a new set, which contains un-repeated items.
+// The param <unsafe> used to specify whether using set in un-concurrent-safety,
+// which is false in default.
 func NewIntSet(unsafe...bool) *IntSet {
 	return &IntSet{
 		m  : make(map[int]struct{}),
@@ -30,10 +28,20 @@ func NewIntSet(unsafe...bool) *IntSet {
 	}
 }
 
-// Iterate the set by given callback <f>,
+// NewIntSetFrom returns a new set from <items>.
+func NewIntSetFrom(items []int, unsafe...bool) *IntSet {
+	m := make(map[int]struct{})
+	for _, v := range items {
+		m[v] = struct{}{}
+	}
+	return &IntSet{
+		m  : m,
+		mu : rwmutex.New(unsafe...),
+	}
+}
+
+// Iterator iterates the set with given callback function <f>,
 // if <f> returns true then continue iterating; or false to stop.
-//
-// 给定回调函数对原始内容进行遍历，回调函数返回true表示继续遍历，否则停止遍历。
 func (set *IntSet) Iterator(f func (v int) bool) *IntSet {
     set.mu.RLock()
     defer set.mu.RUnlock()
@@ -45,9 +53,7 @@ func (set *IntSet) Iterator(f func (v int) bool) *IntSet {
     return set
 }
 
-// Add one or multiple items to the set.
-//
-// 添加元素项到集合中(支持多个).
+// Add adds one or multiple items to the set.
 func (set *IntSet) Add(item...int) *IntSet {
 	set.mu.Lock()
     for _, v := range item {
@@ -57,9 +63,7 @@ func (set *IntSet) Add(item...int) *IntSet {
 	return set
 }
 
-// Check whether the set contains <item>.
-//
-// 键是否存在.
+// Contains checks whether the set contains <item>.
 func (set *IntSet) Contains(item int) bool {
 	set.mu.RLock()
 	_, exists := set.m[item]
@@ -67,9 +71,7 @@ func (set *IntSet) Contains(item int) bool {
 	return exists
 }
 
-// Remove <item> from set.
-//
-// 删除元素项。
+// Remove deletes <item> from set.
 func (set *IntSet) Remove(item int) *IntSet {
 	set.mu.Lock()
 	delete(set.m, item)
@@ -77,9 +79,7 @@ func (set *IntSet) Remove(item int) *IntSet {
 	return set
 }
 
-// Get size of the set.
-//
-// 获得集合大小。
+// Size returns the size of the set.
 func (set *IntSet) Size() int {
 	set.mu.RLock()
 	l := len(set.m)
@@ -87,9 +87,7 @@ func (set *IntSet) Size() int {
 	return l
 }
 
-// Clear the set.
-//
-// 清空集合。
+// Clear deletes all items of the set.
 func (set *IntSet) Clear() *IntSet {
 	set.mu.Lock()
 	set.m = make(map[int]struct{})
@@ -97,9 +95,7 @@ func (set *IntSet) Clear() *IntSet {
     return set
 }
 
-// Get the copy of items from set as slice.
-//
-// 获得集合元素项列表.
+// Slice returns the a of items of the set as slice.
 func (set *IntSet) Slice() []int {
 	set.mu.RLock()
 	ret := make([]int, len(set.m))
@@ -112,43 +108,33 @@ func (set *IntSet) Slice() []int {
 	return ret
 }
 
-// Join set items with a string.
-//
-// 使用glue字符串串连当前集合的元素项，构造成新的字符串返回。
+// Join joins items with a string <glue>.
 func (set *IntSet) Join(glue string) string {
     return strings.Join(gconv.Strings(set.Slice()), ",")
 }
 
-// Return set items as a string, which are joined by char ','.
-//
-// 使用glue字符串串连当前集合的元素项，构造成新的字符串返回。
+// String returns items as a string, which are joined by char ','.
 func (set *IntSet) String() string {
     return set.Join(",")
 }
 
-// Lock writing by callback function f.
-//
-// 使用自定义方法执行加锁修改操作。
+// LockFunc locks writing with callback function <f>.
 func (set *IntSet) LockFunc(f func(m map[int]struct{})) *IntSet {
-	set.mu.Lock(true)
-	defer set.mu.Unlock(true)
+	set.mu.Lock()
+	defer set.mu.Unlock()
 	f(set.m)
     return set
 }
 
-// Lock reading by callback function f.
-//
-// 使用自定义方法执行加锁读取操作。
+// RLockFunc locks reading with callback function <f>.
 func (set *IntSet) RLockFunc(f func(m map[int]struct{})) *IntSet {
-    set.mu.RLock(true)
-    defer set.mu.RUnlock(true)
+    set.mu.RLock()
+    defer set.mu.RUnlock()
     f(set.m)
     return set
 }
 
-// Check whether the two sets equal.
-//
-// 判断两个集合是否相等.
+// Equal checks whether the two sets equal.
 func (set *IntSet) Equal(other *IntSet) bool {
     if set == other {
         return true
@@ -168,9 +154,7 @@ func (set *IntSet) Equal(other *IntSet) bool {
 	return true
 }
 
-// Check whether the current set is sub-set of <other>.
-//
-// 判断当前集合是否为other集合的子集.
+// IsSubsetOf checks whether the current set is a sub-set of <other>.
 func (set *IntSet) IsSubsetOf(other *IntSet) bool {
     if set == other {
         return true
@@ -187,10 +171,8 @@ func (set *IntSet) IsSubsetOf(other *IntSet) bool {
     return true
 }
 
-// Returns a new set which is the union of <set> and <other>.
-// Which means, all the items in <newSet> is in <set> or in <other>.
-//
-// 并集, 返回新的集合：属于set或属于others的元素为元素的集合.
+// Union returns a new set which is the union of <set> and <other>.
+// Which means, all the items in <newSet> are in <set> or in <other>.
 func (set *IntSet) Union(others ... *IntSet) (newSet *IntSet) {
     newSet = NewIntSet(true)
     set.mu.RLock()
@@ -215,10 +197,8 @@ func (set *IntSet) Union(others ... *IntSet) (newSet *IntSet) {
     return
 }
 
-// Returns a new set which is the difference set from <set> to <other>.
-// Which means, all the items in <newSet> is in <set> and not in <other>.
-//
-// 差集, 返回新的集合: 属于set且不属于others的元素为元素的集合.
+// Diff returns a new set which is the difference set from <set> to <other>.
+// Which means, all the items in <newSet> are in <set> but not in <other>.
 func (set *IntSet) Diff(others...*IntSet) (newSet *IntSet) {
     newSet = NewIntSet(true)
     set.mu.RLock()
@@ -238,10 +218,8 @@ func (set *IntSet) Diff(others...*IntSet) (newSet *IntSet) {
     return
 }
 
-// Returns a new set which is the intersection from <set> to <other>.
-// Which means, all the items in <newSet> is in <set> and also in <other>.
-//
-// 交集, 返回新的集合: 属于set且属于others的元素为元素的集合.
+// Intersect returns a new set which is the intersection from <set> to <other>.
+// Which means, all the items in <newSet> are in <set> and also in <other>.
 func (set *IntSet) Intersect(others...*IntSet) (newSet *IntSet) {
     newSet = NewIntSet(true)
     set.mu.RLock()
@@ -262,11 +240,11 @@ func (set *IntSet) Intersect(others...*IntSet) (newSet *IntSet) {
     return
 }
 
-// Returns a new set which is the complement from <set> to <full>.
-// Which means, all the items in <newSet> is in <full> and not in <set>.
+// Complement returns a new set which is the complement from <set> to <full>.
+// Which means, all the items in <newSet> are in <full> and not in <set>.
 //
-// 补集, 返回新的集合: (前提: set应当为full的子集)属于全集full不属于集合set的元素组成的集合.
-// 如果给定的full集合不是set的全集时，返回full与set的差集.
+// It returns the difference between <full> and <set>
+// if the given set <full> is not the full set of <set>.
 func (set *IntSet) Complement(full *IntSet) (newSet *IntSet) {
     newSet = NewIntSet(true)
     set.mu.RLock()
@@ -282,3 +260,62 @@ func (set *IntSet) Complement(full *IntSet) (newSet *IntSet) {
     }
     return
 }
+
+// Merge adds items from <others> sets into <set>.
+func (set *IntSet) Merge(others ... *IntSet) *IntSet {
+	set.mu.Lock()
+	defer set.mu.Unlock()
+	for _, other := range others {
+		if set != other {
+			other.mu.RLock()
+		}
+		for k, v := range other.m {
+			set.m[k] = v
+		}
+		if set != other {
+			other.mu.RUnlock()
+		}
+	}
+	return set
+}
+
+// Sum sums items.
+// Note: The items should be converted to int type,
+// or you'd get a result that you unexpected.
+func (set *IntSet) Sum() (sum int) {
+	set.mu.RLock()
+	defer set.mu.RUnlock()
+	for k, _ := range set.m {
+		sum += k
+	}
+	return
+}
+
+// Pops randomly pops an item from set.
+func (set *IntSet) Pop(size int) int {
+	set.mu.RLock()
+	defer set.mu.RUnlock()
+	for k, _ := range set.m {
+		return k
+	}
+	return 0
+}
+
+// Pops randomly pops <size> items from set.
+func (set *IntSet) Pops(size int) []int {
+	set.mu.RLock()
+	defer set.mu.RUnlock()
+	if size > len(set.m) {
+		size = len(set.m)
+	}
+	index := 0
+	array := make([]int, size)
+	for k, _ := range set.m {
+		array[index] = k
+		index++
+		if index == size {
+			break
+		}
+	}
+	return array
+}

g/container/gset/gset_string_set.go

@@ -9,7 +9,8 @@ package gset
 
 import (
     "github.com/gogf/gf/g/internal/rwmutex"
-    "strings"
+	"github.com/gogf/gf/g/util/gconv"
+	"strings"
 )
 
 type StringSet struct {
@@ -17,11 +18,9 @@ type StringSet struct {
 	m  map[string]struct{}
 }
 
-// Create a set, which contains un-repeated items.
-// The param <unsafe> used to specify whether using array with un-concurrent-safety,
-// which is false in default, means concurrent-safe in default.
-//
-// 创建一个空的集合对象，参数unsafe用于指定是否用于非并发安全场景，默认为false，表示并发安全。
+// New create and returns a new set, which contains un-repeated items.
+// The param <unsafe> used to specify whether using set in un-concurrent-safety,
+// which is false in default.
 func NewStringSet(unsafe...bool) *StringSet {
 	return &StringSet {
 		m  : make(map[string]struct{}),
@@ -29,10 +28,20 @@ func NewStringSet(unsafe...bool) *StringSet {
 	}
 }
 
-// Iterate the set by given callback <f>,
+// NewStringSetFrom returns a new set from <items>.
+func NewStringSetFrom(items []string, unsafe...bool) *StringSet {
+	m := make(map[string]struct{})
+	for _, v := range items {
+		m[v] = struct{}{}
+	}
+	return &StringSet{
+		m  : m,
+		mu : rwmutex.New(unsafe...),
+	}
+}
+
+// Iterator iterates the set with given callback function <f>,
 // if <f> returns true then continue iterating; or false to stop.
-//
-// 给定回调函数对原始内容进行遍历，回调函数返回true表示继续遍历，否则停止遍历。
 func (set *StringSet) Iterator(f func (v string) bool) *StringSet {
     set.mu.RLock()
     defer set.mu.RUnlock()
@@ -44,9 +53,7 @@ func (set *StringSet) Iterator(f func (v string) bool) *StringSet {
 	return set
 }
 
-// Add one or multiple items to the set.
-//
-// 添加元素项到集合中(支持多个).
+// Add adds one or multiple items to the set.
 func (set *StringSet) Add(item...string) *StringSet {
 	set.mu.Lock()
 	for _, v := range item {
@@ -56,9 +63,7 @@ func (set *StringSet) Add(item...string) *StringSet {
 	return set
 }
 
-// Check whether the set contains <item>.
-//
-// 键是否存在.
+// Contains checks whether the set contains <item>.
 func (set *StringSet) Contains(item string) bool {
 	set.mu.RLock()
 	_, exists := set.m[item]
@@ -66,9 +71,7 @@ func (set *StringSet) Contains(item string) bool {
 	return exists
 }
 
-// Remove <item> from set.
-//
-// 删除元素项。
+// Remove deletes <item> from set.
 func (set *StringSet) Remove(item string) *StringSet {
 	set.mu.Lock()
 	delete(set.m, item)
@@ -76,9 +79,7 @@ func (set *StringSet) Remove(item string) *StringSet {
     return set
 }
 
-// Get size of the set.
-//
-// 获得集合大小。
+// Size returns the size of the set.
 func (set *StringSet) Size() int {
 	set.mu.RLock()
 	l := len(set.m)
@@ -86,9 +87,7 @@ func (set *StringSet) Size() int {
 	return l
 }
 
-// Clear the set.
-//
-// 清空集合。
+// Clear deletes all items of the set.
 func (set *StringSet) Clear() *StringSet {
 	set.mu.Lock()
 	set.m = make(map[string]struct{})
@@ -96,9 +95,7 @@ func (set *StringSet) Clear() *StringSet {
     return set
 }
 
-// Get the copy of items from set as slice.
-//
-// 获得集合元素项列表.
+// Slice returns the a of items of the set as slice.
 func (set *StringSet) Slice() []string {
 	set.mu.RLock()
 	ret := make([]string, len(set.m))
@@ -112,43 +109,33 @@ func (set *StringSet) Slice() []string {
 	return ret
 }
 
-// Join set items with a string.
-//
-// 使用glue字符串串连当前集合的元素项，构造成新的字符串返回。
+// Join joins items with a string <glue>.
 func (set *StringSet) Join(glue string) string {
     return strings.Join(set.Slice(), ",")
 }
 
-// Return set items as a string, which are joined by char ','.
-//
-// 使用glue字符串串连当前集合的元素项，构造成新的字符串返回。
+// String returns items as a string, which are joined by char ','.
 func (set *StringSet) String() string {
     return set.Join(",")
 }
 
-// Lock writing by callback function f.
-//
-// 使用自定义方法执行加锁修改操作。
+// LockFunc locks writing with callback function <f>.
 func (set *StringSet) LockFunc(f func(m map[string]struct{})) *StringSet {
-	set.mu.Lock(true)
-	defer set.mu.Unlock(true)
+	set.mu.Lock()
+	defer set.mu.Unlock()
 	f(set.m)
     return set
 }
 
-// Lock reading by callback function f.
-//
-// 使用自定义方法执行加锁读取操作。
+// RLockFunc locks reading with callback function <f>.
 func (set *StringSet) RLockFunc(f func(m map[string]struct{})) *StringSet {
-	set.mu.RLock(true)
-	defer set.mu.RUnlock(true)
+	set.mu.RLock()
+	defer set.mu.RUnlock()
 	f(set.m)
     return set
 }
 
-// Check whether the two sets equal.
-//
-// 判断两个集合是否相等.
+// Equal checks whether the two sets equal.
 func (set *StringSet) Equal(other *StringSet) bool {
 	if set == other {
 		return true
@@ -168,9 +155,7 @@ func (set *StringSet) Equal(other *StringSet) bool {
 	return true
 }
 
-// Check whether the current set is sub-set of <other>.
-//
-// 判断当前集合是否为other集合的子集.
+// IsSubsetOf checks whether the current set is a sub-set of <other>.
 func (set *StringSet) IsSubsetOf(other *StringSet) bool {
 	if set == other {
 		return true
@@ -187,10 +172,8 @@ func (set *StringSet) IsSubsetOf(other *StringSet) bool {
 	return true
 }
 
-// Returns a new set which is the union of <set> and <other>.
-// Which means, all the items in <newSet> is in <set> or in <other>.
-//
-// 并集, 返回新的集合：属于set或属于others的元素为元素的集合.
+// Union returns a new set which is the union of <set> and <other>.
+// Which means, all the items in <newSet> are in <set> or in <other>.
 func (set *StringSet) Union(others ... *StringSet) (newSet *StringSet) {
     newSet = NewStringSet(true)
     set.mu.RLock()
@@ -215,10 +198,8 @@ func (set *StringSet) Union(others ... *StringSet) (newSet *StringSet) {
     return
 }
 
-// Returns a new set which is the difference set from <set> to <other>.
-// Which means, all the items in <newSet> is in <set> and not in <other>.
-//
-// 差集, 返回新的集合: 属于set且不属于others的元素为元素的集合.
+// Diff returns a new set which is the difference set from <set> to <other>.
+// Which means, all the items in <newSet> are in <set> but not in <other>.
 func (set *StringSet) Diff(others...*StringSet) (newSet *StringSet) {
     newSet = NewStringSet(true)
     set.mu.RLock()
@@ -238,10 +219,8 @@ func (set *StringSet) Diff(others...*StringSet) (newSet *StringSet) {
     return
 }
 
-// Returns a new set which is the intersection from <set> to <other>.
-// Which means, all the items in <newSet> is in <set> and also in <other>.
-//
-// 交集, 返回新的集合: 属于set且属于others的元素为元素的集合.
+// Intersect returns a new set which is the intersection from <set> to <other>.
+// Which means, all the items in <newSet> are in <set> and also in <other>.
 func (set *StringSet) Intersect(others...*StringSet) (newSet *StringSet) {
     newSet = NewStringSet(true)
     set.mu.RLock()
@@ -262,11 +241,11 @@ func (set *StringSet) Intersect(others...*StringSet) (newSet *StringSet) {
     return
 }
 
-// Returns a new set which is the complement from <set> to <full>.
-// Which means, all the items in <newSet> is in <full> and not in <set>.
+// Complement returns a new set which is the complement from <set> to <full>.
+// Which means, all the items in <newSet> are in <full> and not in <set>.
 //
-// 补集, 返回新的集合: (前提: set应当为full的子集)属于全集full不属于集合set的元素组成的集合.
-// 如果给定的full集合不是set的全集时，返回full与set的差集.
+// It returns the difference between <full> and <set>
+// if the given set <full> is not the full set of <set>.
 func (set *StringSet) Complement(full *StringSet) (newSet *StringSet) {
     newSet = NewStringSet(true)
     set.mu.RLock()
@@ -282,3 +261,62 @@ func (set *StringSet) Complement(full *StringSet) (newSet *StringSet) {
     }
     return
 }
+
+// Merge adds items from <others> sets into <set>.
+func (set *StringSet) Merge(others ... *StringSet) *StringSet {
+	set.mu.Lock()
+	defer set.mu.Unlock()
+	for _, other := range others {
+		if set != other {
+			other.mu.RLock()
+		}
+		for k, v := range other.m {
+			set.m[k] = v
+		}
+		if set != other {
+			other.mu.RUnlock()
+		}
+	}
+	return set
+}
+
+// Sum sums items.
+// Note: The items should be converted to int type,
+// or you'd get a result that you unexpected.
+func (set *StringSet) Sum() (sum int) {
+	set.mu.RLock()
+	defer set.mu.RUnlock()
+	for k, _ := range set.m {
+		sum += gconv.Int(k)
+	}
+	return
+}
+
+// Pops randomly pops an item from set.
+func (set *StringSet) Pop(size int) string {
+	set.mu.RLock()
+	defer set.mu.RUnlock()
+	for k, _ := range set.m {
+		return k
+	}
+	return ""
+}
+
+// Pops randomly pops <size> items from set.
+func (set *StringSet) Pops(size int) []string {
+	set.mu.RLock()
+	defer set.mu.RUnlock()
+	if size > len(set.m) {
+		size = len(set.m)
+	}
+	index := 0
+	array := make([]string, size)
+	for k, _ := range set.m {
+		array[index] = k
+		index++
+		if index == size {
+			break
+		}
+	}
+	return array
+}

g/container/gtype/bool.go

@@ -11,35 +11,39 @@ import (
 )
 
 type Bool struct {
-    val int32
+    value int32
 }
 
+// NewBool returns a concurrent-safe object for bool type,
+// with given initial value <value>.
 func NewBool(value...bool) *Bool {
     t := &Bool{}
     if len(value) > 0 {
         if value[0] {
-            t.val = 1
+            t.value = 1
         } else {
-            t.val = 0
+            t.value = 0
         }
     }
     return t
 }
 
+// Clone clones and returns a new concurrent-safe object for bool type.
 func (t *Bool) Clone() *Bool {
     return NewBool(t.Val())
 }
 
-// 并发安全设置变量值，返回之前的旧值
+// Set atomically stores value into t.valueue and returns the previous t.value value.
 func (t *Bool) Set(value bool) (old bool) {
     if value {
-        old = atomic.SwapInt32(&t.val, 1) == 1
+        old = atomic.SwapInt32(&t.value, 1) == 1
     } else {
-        old = atomic.SwapInt32(&t.val, 0) == 1
+        old = atomic.SwapInt32(&t.value, 0) == 1
     }
     return
 }
 
+// Val atomically loads t.valueue.
 func (t *Bool) Val() bool {
-    return atomic.LoadInt32(&t.val) > 0
+    return atomic.LoadInt32(&t.value) > 0
 }

g/container/gtype/byte.go

@@ -11,29 +11,36 @@ import (
 )
 
 type Byte struct {
-    val int32
+	value int32
 }
 
+// NewByte returns a concurrent-safe object for byte type,
+// with given initial value <value>.
 func NewByte(value...byte) *Byte {
     if len(value) > 0 {
-        return &Byte{val : int32(value[0])}
+        return &Byte{
+	        value : int32(value[0]),
+		}
     }
     return &Byte{}
 }
 
+// Clone clones and returns a new concurrent-safe object for byte type.
 func (t *Byte) Clone() *Byte {
     return NewByte(t.Val())
 }
 
-// 并发安全设置变量值，返回之前的旧值
+// Set atomically stores value into t.value and returns the previous t.value value.
 func (t *Byte) Set(value byte) (old byte) {
-    return byte(atomic.SwapInt32(&t.val, int32(value)))
+    return byte(atomic.SwapInt32(&t.value, int32(value)))
 }
 
+// Val atomically loads t.value.
 func (t *Byte) Val() byte {
-    return byte(atomic.LoadInt32(&t.val))
+    return byte(atomic.LoadInt32(&t.value))
 }
 
-func (t *Byte) Add(delta int) byte {
-    return byte(atomic.AddInt32(&t.val, int32(delta)))
+// Add atomically adds delta to t.value and returns the new value.
+func (t *Byte) Add(delta int) (new byte) {
+    return byte(atomic.AddInt32(&t.value, int32(delta)))
 }

g/container/gtype/bytes.go

@@ -9,29 +9,35 @@ package gtype
 import "sync/atomic"
 
 type Bytes struct {
-    val atomic.Value
+	value atomic.Value
 }
 
+// NewBytes returns a concurrent-safe object for []byte type,
+// with given initial value <value>.
 func NewBytes(value...[]byte) *Bytes {
     t := &Bytes{}
     if len(value) > 0 {
-        t.val.Store(value[0])
+        t.value.Store(value[0])
     }
     return t
 }
 
+// Clone clones and returns a new concurrent-safe object for []byte type.
 func (t *Bytes) Clone() *Bytes {
     return NewBytes(t.Val())
 }
 
+// Set atomically stores value into t.value and returns the previous t.value value.
+// Note: The parameter <value> cannot be nil.
 func (t *Bytes) Set(value []byte) (old []byte) {
     old = t.Val()
-    t.val.Store(value)
+    t.value.Store(value)
     return
 }
 
+// Val atomically loads t.value.
 func (t *Bytes) Val() []byte {
-    if s := t.val.Load(); s != nil {
+    if s := t.value.Load(); s != nil {
         return s.([]byte)
     }
     return nil

g/container/gtype/float32.go

@@ -7,47 +7,53 @@
 package gtype
 
 import (
-    "sync/atomic"
-    "github.com/gogf/gf/g/encoding/gbinary"
+	"math"
+	"sync/atomic"
+	"unsafe"
 )
 
 type Float32 struct {
-    val uint32
+	value uint32
 }
 
+// NewFloat32 returns a concurrent-safe object for float32 type,
+// with given initial value <value>.
 func NewFloat32(value...float32) *Float32 {
     if len(value) > 0 {
-        return &Float32{ val : float32ToUint32InBits(value[0]) }
+        return &Float32{
+	        value : math.Float32bits(value[0]),
+		}
     }
     return &Float32{}
 }
 
+// Clone clones and returns a new concurrent-safe object for float32 type.
 func (t *Float32) Clone() *Float32 {
     return NewFloat32(t.Val())
 }
 
+// Set atomically stores value into t.value and returns the previous t.value value.
 func (t *Float32) Set(value float32) (old float32) {
-    return uint32ToFloat32InBits(atomic.SwapUint32(&t.val, float32ToUint32InBits(value)))
+    return math.Float32frombits(atomic.SwapUint32(&t.value, math.Float32bits(value)))
 }
 
+// Val atomically loads t.value.
 func (t *Float32) Val() float32 {
-    return uint32ToFloat32InBits(atomic.LoadUint32(&t.val))
+    return math.Float32frombits(atomic.LoadUint32(&t.value))
 }
 
-func (t *Float32) Add(delta float32) float32 {
-    return uint32ToFloat32InBits(atomic.AddUint32(&t.val, float32ToUint32InBits(delta)))
-}
-
-// 通过二进制的方式将float32转换为uint32(都是32bits)
-func float32ToUint32InBits(value float32) uint32 {
-    b := gbinary.Encode(value)
-    i := gbinary.DecodeToUint32(b)
-    return i
-}
-
-// 通过二进制的方式将uint32转换为float32(都是32bits)
-func uint32ToFloat32InBits(value uint32) float32 {
-    b := gbinary.Encode(value)
-    f := gbinary.DecodeToFloat32(b)
-    return f
+// Add atomically adds delta to t.value and returns the new value.
+func (t *Float32) Add(delta float32) (new float32) {
+	for {
+		old := math.Float32frombits(t.value)
+		new  = old + delta
+		if atomic.CompareAndSwapUint32(
+			(*uint32)(unsafe.Pointer(&t.value)),
+			math.Float32bits(old),
+			math.Float32bits(new),
+		) {
+			break
+		}
+	}
+	return
 }

g/container/gtype/float64.go

@@ -7,47 +7,53 @@
 package gtype
 
 import (
-    "sync/atomic"
-    "github.com/gogf/gf/g/encoding/gbinary"
+	"math"
+	"sync/atomic"
+	"unsafe"
 )
 
 type Float64 struct {
-    val uint64
+	value uint64
 }
 
+// NewFloat64 returns a concurrent-safe object for float64 type,
+// with given initial value <value>.
 func NewFloat64(value...float64) *Float64 {
     if len(value) > 0 {
-        return &Float64{ val : float64ToUint64InBits(value[0]) }
+        return &Float64{
+	        value : math.Float64bits(value[0]),
+		}
     }
     return &Float64{}
 }
 
+// Clone clones and returns a new concurrent-safe object for float64 type.
 func (t *Float64) Clone() *Float64 {
     return NewFloat64(t.Val())
 }
 
+// Set atomically stores value into t.value and returns the previous t.value value.
 func (t *Float64) Set(value float64) (old float64) {
-    return uint64ToFloat64InBits(atomic.SwapUint64(&t.val, float64ToUint64InBits(value)))
+    return math.Float64frombits(atomic.SwapUint64(&t.value, math.Float64bits(value)))
 }
 
+// Val atomically loads t.value.
 func (t *Float64) Val() float64 {
-    return uint64ToFloat64InBits(atomic.LoadUint64(&t.val))
+    return math.Float64frombits(atomic.LoadUint64(&t.value))
 }
 
-func (t *Float64) Add(delta float64) float64 {
-    return uint64ToFloat64InBits(atomic.AddUint64(&t.val, float64ToUint64InBits(delta)))
+// Add atomically adds delta to t.value and returns the new value.
+func (t *Float64) Add(delta float64) (new float64) {
+	for {
+		old := math.Float64frombits(t.value)
+		new  = old + delta
+		if atomic.CompareAndSwapUint64(
+			(*uint64)(unsafe.Pointer(&t.value)),
+			math.Float64bits(old),
+			math.Float64bits(new),
+		) {
+			break
+		}
+	}
+	return
 }
-
-// 通过二进制的方式将float64转换为uint64(都是64bits)
-func float64ToUint64InBits(value float64) uint64 {
-    b := gbinary.Encode(value)
-    i := gbinary.DecodeToUint64(b)
-    return i
-}
-
-// 通过二进制的方式将uint64转换为float64(都是64bits)
-func uint64ToFloat64InBits(value uint64) float64 {
-    b := gbinary.Encode(value)
-    f := gbinary.DecodeToFloat64(b)
-    return f
-}

g/container/gtype/gtype.go

@@ -4,13 +4,12 @@
 // If a copy of the MIT was not distributed with this file,
 // You can obtain one at https://github.com/gogf/gf.
 
-// Package gtype provides kinds of high performance, concurrent-safe basic variable types.
-//
-// 并发安全基本类型.
+// Package gtype provides kinds of high performance and concurrent-safe basic variable types.
 package gtype
 
 type Type = Interface
 
+// See NewInterface.
 func New(value ... interface{}) *Type {
     return NewInterface(value...)
 }

g/container/gtype/int.go

@@ -11,30 +11,36 @@ import (
 )
 
 type Int struct {
-    val int64
+	value int64
 }
 
+// NewInt returns a concurrent-safe object for int type,
+// with given initial value <value>.
 func NewInt(value...int) *Int {
     if len(value) > 0 {
-        return &Int{val:int64(value[0])}
+        return &Int{
+	        value : int64(value[0]),
+		}
     }
     return &Int{}
 }
 
+// Clone clones and returns a new concurrent-safe object for int type.
 func (t *Int) Clone() *Int {
     return NewInt(t.Val())
 }
 
-// 并发安全设置变量值，返回之前的旧值
+// Set atomically stores value into t.value and returns the previous t.value value.
 func (t *Int) Set(value int) (old int) {
-    return int(atomic.SwapInt64(&t.val, int64(value)))
+    return int(atomic.SwapInt64(&t.value, int64(value)))
 }
 
+// Val atomically loads t.value.
 func (t *Int) Val() int {
-    return int(atomic.LoadInt64(&t.val))
+    return int(atomic.LoadInt64(&t.value))
 }
 
-// 数值增加delta，并返回**新**的数值
-func (t *Int) Add(delta int) int {
-    return int(atomic.AddInt64(&t.val, int64(delta)))
+// Add atomically adds delta to t.value and returns the new value.
+func (t *Int) Add(delta int) (new int) {
+    return int(atomic.AddInt64(&t.value, int64(delta)))
 }

g/container/gtype/int32.go

@@ -11,28 +11,36 @@ import (
 )
 
 type Int32 struct {
-    val int32
+	value int32
 }
 
+// NewInt32 returns a concurrent-safe object for int32 type,
+// with given initial value <value>.
 func NewInt32(value...int32) *Int32 {
     if len(value) > 0 {
-        return &Int32{val: value[0]}
+        return &Int32{
+	        value : value[0],
+		}
     }
     return &Int32{}
 }
 
+// Clone clones and returns a new concurrent-safe object for int32 type.
 func (t *Int32) Clone() *Int32 {
     return NewInt32(t.Val())
 }
 
+// Set atomically stores value into t.value and returns the previous t.value value.
 func (t *Int32) Set(value int32) (old int32) {
-    return atomic.SwapInt32(&t.val, value)
+    return atomic.SwapInt32(&t.value, value)
 }
 
+// Val atomically loads t.value.
 func (t *Int32) Val() int32 {
-    return atomic.LoadInt32(&t.val)
+    return atomic.LoadInt32(&t.value)
 }
 
-func (t *Int32) Add(delta int32) int32 {
-    return atomic.AddInt32(&t.val, delta)
+// Add atomically adds delta to t.value and returns the new value.
+func (t *Int32) Add(delta int32) (new int32) {
+    return atomic.AddInt32(&t.value, delta)
 }

g/container/gtype/int64.go

@@ -11,28 +11,36 @@ import (
 )
 
 type Int64 struct {
-    val int64
+	value int64
 }
 
+// NewInt64 returns a concurrent-safe object for int64 type,
+// with given initial value <value>.
 func NewInt64(value...int64) *Int64 {
     if len(value) > 0 {
-        return &Int64{val:value[0]}
+        return &Int64{
+	        value : value[0],
+		}
     }
     return &Int64{}
 }
 
+// Clone clones and returns a new concurrent-safe object for int64 type.
 func (t *Int64) Clone() *Int64 {
     return NewInt64(t.Val())
 }
 
+// Set atomically stores value into t.value and returns the previous t.value value.
 func (t *Int64) Set(value int64) (old int64) {
-    return atomic.SwapInt64(&t.val, value)
+    return atomic.SwapInt64(&t.value, value)
 }
 
+// Val atomically loads t.value.
 func (t *Int64) Val() int64 {
-    return atomic.LoadInt64(&t.val)
+    return atomic.LoadInt64(&t.value)
 }
 
+// Add atomically adds delta to t.value and returns the new value.
 func (t *Int64) Add(delta int64) int64 {
-    return atomic.AddInt64(&t.val, delta)
+    return atomic.AddInt64(&t.value, delta)
 }

g/container/gtype/interface.go

@@ -10,32 +10,34 @@ import (
     "sync/atomic"
 )
 
-// 比较通用的并发安全数据类型
 type Interface struct {
-    val atomic.Value
+	value atomic.Value
 }
 
+// NewInterface returns a concurrent-safe object for interface{} type,
+// with given initial value <value>.
 func NewInterface(value...interface{}) *Interface {
     t := &Interface{}
     if len(value) > 0 && value[0] != nil {
-        t.val.Store(value[0])
+        t.value.Store(value[0])
     }
     return t
 }
 
+// Clone clones and returns a new concurrent-safe object for interface{} type.
 func (t *Interface) Clone() *Interface {
     return NewInterface(t.Val())
 }
 
+// Set atomically stores value into t.value and returns the previous t.value value.
+// Note: The parameter <value> cannot be nil.
 func (t *Interface) Set(value interface{}) (old interface{}) {
-    if value == nil {
-        return
-    }
     old = t.Val()
-    t.val.Store(value)
+    t.value.Store(value)
     return
 }
 
+// Val atomically loads t.value.
 func (t *Interface) Val() interface{} {
-    return t.val.Load()
+    return t.value.Load()
 }

g/container/gtype/string.go

@@ -11,29 +11,34 @@ import (
 )
 
 type String struct {
-    val atomic.Value
+	value atomic.Value
 }
 
+// NewString returns a concurrent-safe object for string type,
+// with given initial value <value>.
 func NewString(value...string) *String {
     t := &String{}
     if len(value) > 0 {
-        t.val.Store(value[0])
+        t.value.Store(value[0])
     }
     return t
 }
 
+// Clone clones and returns a new concurrent-safe object for string type.
 func (t *String) Clone() *String {
     return NewString(t.Val())
 }
 
+// Set atomically stores value into t.value and returns the previous t.value value.
 func (t *String) Set(value string) (old string) {
     old = t.Val()
-    t.val.Store(value)
+    t.value.Store(value)
     return
 }
 
+// Val atomically loads t.value.
 func (t *String) Val() string {
-    s := t.val.Load()
+    s := t.value.Load()
     if s != nil {
         return s.(string)
     }

g/container/gtype/uint.go

@@ -11,28 +11,36 @@ import (
 )
 
 type Uint struct {
-    val uint64
+	value uint64
 }
 
+// NewUint returns a concurrent-safe object for uint type,
+// with given initial value <value>.
 func NewUint(value...uint) *Uint {
     if len(value) > 0 {
-        return &Uint{val:uint64(value[0])}
+        return &Uint{
+	        value : uint64(value[0]),
+		}
     }
     return &Uint{}
 }
 
+// Clone clones and returns a new concurrent-safe object for uint type.
 func (t *Uint) Clone() *Uint {
     return NewUint(t.Val())
 }
 
+// Set atomically stores value into t.value and returns the previous t.value value.
 func (t *Uint) Set(value uint) (old uint) {
-    return uint(atomic.SwapUint64(&t.val, uint64(value)))
+    return uint(atomic.SwapUint64(&t.value, uint64(value)))
 }
 
+// Val atomically loads t.value.
 func (t *Uint) Val() uint {
-    return uint(atomic.LoadUint64(&t.val))
+    return uint(atomic.LoadUint64(&t.value))
 }
 
-func (t *Uint) Add(delta uint) int {
-    return int(atomic.AddUint64(&t.val, uint64(delta)))
+// Add atomically adds delta to t.value and returns the new value.
+func (t *Uint) Add(delta uint) (new uint) {
+    return uint(atomic.AddUint64(&t.value, uint64(delta)))
 }

g/container/gtype/uint32.go

@@ -11,28 +11,36 @@ import (
 )
 
 type Uint32 struct {
-    val uint32
+	value uint32
 }
 
+// NewUint32 returns a concurrent-safe object for uint32 type,
+// with given initial value <value>.
 func NewUint32(value...uint32) *Uint32 {
     if len(value) > 0 {
-        return &Uint32{val:value[0]}
+        return &Uint32{
+        	value : value[0],
+		}
     }
     return &Uint32{}
 }
 
+// Clone clones and returns a new concurrent-safe object for uint32 type.
 func (t *Uint32) Clone() *Uint32 {
     return NewUint32(t.Val())
 }
 
+// Set atomically stores value into t.value and returns the previous t.value value.
 func (t *Uint32) Set(value uint32) (old uint32) {
-    return atomic.SwapUint32(&t.val, value)
+    return atomic.SwapUint32(&t.value, value)
 }
 
+// Val atomically loads t.value.
 func (t *Uint32) Val() uint32 {
-    return atomic.LoadUint32(&t.val)
+    return atomic.LoadUint32(&t.value)
 }
 
-func (t *Uint32) Add(delta uint32) uint32 {
-    return atomic.AddUint32(&t.val, delta)
+// Add atomically adds delta to t.value and returns the new value.
+func (t *Uint32) Add(delta uint32) (new uint32) {
+    return atomic.AddUint32(&t.value, delta)
 }

g/container/gtype/uint64.go

@@ -11,28 +11,36 @@ import (
 )
 
 type Uint64 struct {
-    val uint64
+	value uint64
 }
 
+// NewUint64 returns a concurrent-safe object for uint64 type,
+// with given initial value <value>.
 func NewUint64(value...uint64) *Uint64 {
     if len(value) > 0 {
-        return &Uint64{val:value[0]}
+        return &Uint64{
+	        value : value[0],
+		}
     }
     return &Uint64{}
 }
 
+// Clone clones and returns a new concurrent-safe object for uint64 type.
 func (t *Uint64) Clone() *Uint64 {
     return NewUint64(t.Val())
 }
 
+// Set atomically stores value into t.value and returns the previous t.value value.
 func (t *Uint64) Set(value uint64) (old uint64) {
-    return atomic.SwapUint64(&t.val, value)
+    return atomic.SwapUint64(&t.value, value)
 }
 
+// Val atomically loads t.value.
 func (t *Uint64) Val() uint64 {
-    return atomic.LoadUint64(&t.val)
+    return atomic.LoadUint64(&t.value)
 }
 
-func (t *Uint64) Add(delta uint64) uint64 {
-    return atomic.AddUint64(&t.val, delta)
+// Add atomically adds delta to t.value and returns the new value.
+func (t *Uint64) Add(delta uint64) (new uint64) {
+    return atomic.AddUint64(&t.value, delta)
 }

g/container/gvar/gvar.go

@@ -5,8 +5,6 @@
 // You can obtain one at https://github.com/gogf/gf.
 
 // Package gvar provides an universal variable type, like generics.
-//
-// 通用动态变量.
 package gvar
 
 import (
@@ -18,7 +16,7 @@ import (
 
 type Var struct {
     value interface{} // 变量值
-    safe  bool        // 当为true时,value为 *gtype.Interface 类型
+    safe  bool        // 当为true时, value为 *gtype.Interface 类型
 }
 
 // 创建一个动态变量，value参数可以为nil

g/container/gvar/gvar_test.go

@@ -0,0 +1,265 @@
+package gvar_test
+
+import (
+	"bytes"
+	"encoding/binary"
+	"testing"
+
+	"github.com/gogf/gf/g/container/gvar"
+	"github.com/gogf/gf/g/test/gtest"
+)
+
+func TestReadOnly(t *testing.T) {
+	gtest.Case(t, func() {
+		obj := gvar.New(nil, true)
+		var result string
+
+		switch obj.ReadOnly().(type) {
+		case gvar.VarRead:
+			result = "yes"
+		default:
+			result = "no"
+		}
+
+		gtest.Assert(result, "yes")
+	})
+}
+
+func TestSet(t *testing.T) {
+	gtest.Case(t, func() {
+		objOne := gvar.New("old", true)
+		objOneOld, _ := objOne.Set("new").(string)
+		gtest.Assert(objOneOld, "old")
+
+		objTwo := gvar.New("old", false)
+		objTwoOld, _ := objTwo.Set("new").(string)
+		gtest.Assert(objTwoOld, "old")
+	})
+}
+
+func TestVal(t *testing.T) {
+	gtest.Case(t, func() {
+		objOne := gvar.New(1, true)
+		objOneOld, _ := objOne.Val().(int)
+		gtest.Assert(objOneOld, 1)
+
+		objTwo := gvar.New(1, false)
+		objTwoOld, _ := objTwo.Val().(int)
+		gtest.Assert(objTwoOld, 1)
+	})
+}
+func TestInterface(t *testing.T) {
+	gtest.Case(t, func() {
+		objOne := gvar.New(1, true)
+		objOneOld, _ := objOne.Interface().(int)
+		gtest.Assert(objOneOld, 1)
+
+		objTwo := gvar.New(1, false)
+		objTwoOld, _ := objTwo.Interface().(int)
+		gtest.Assert(objTwoOld, 1)
+	})
+}
+func TestIsNil(t *testing.T) {
+	gtest.Case(t, func() {
+		objOne := gvar.New(nil, true)
+		gtest.Assert(objOne.IsNil(), true)
+
+		objTwo := gvar.New("noNil", false)
+		gtest.Assert(objTwo.IsNil(), false)
+
+	})
+}
+
+func TestBytes(t *testing.T) {
+	gtest.Case(t, func() {
+		x := int32(1)
+		bytesBuffer := bytes.NewBuffer([]byte{})
+		binary.Write(bytesBuffer, binary.BigEndian, x)
+
+		objOne := gvar.New(bytesBuffer.Bytes(), true)
+
+		bBuf := bytes.NewBuffer(objOne.Bytes())
+		var y int32
+		binary.Read(bBuf, binary.BigEndian, &y)
+
+		gtest.Assert(x, y)
+
+	})
+}
+
+func TestString(t *testing.T) {
+	gtest.Case(t, func() {
+		var str string = "hello"
+		objOne := gvar.New(str, true)
+		gtest.Assert(objOne.String(), str)
+
+	})
+}
+func TestBool(t *testing.T) {
+	gtest.Case(t, func() {
+		var ok bool = true
+		objOne := gvar.New(ok, true)
+		gtest.Assert(objOne.Bool(), ok)
+
+		ok = false
+		objTwo := gvar.New(ok, true)
+		gtest.Assert(objTwo.Bool(), ok)
+
+	})
+}
+
+func TestInt(t *testing.T) {
+	gtest.Case(t, func() {
+		var num int = 1
+		objOne := gvar.New(num, true)
+		gtest.Assert(objOne.Int(), num)
+
+	})
+}
+
+func TestInt8(t *testing.T) {
+	gtest.Case(t, func() {
+		var num int8 = 1
+		objOne := gvar.New(num, true)
+		gtest.Assert(objOne.Int8(), num)
+
+	})
+}
+
+func TestInt16(t *testing.T) {
+	gtest.Case(t, func() {
+		var num int16 = 1
+		objOne := gvar.New(num, true)
+		gtest.Assert(objOne.Int16(), num)
+
+	})
+}
+
+func TestInt32(t *testing.T) {
+	gtest.Case(t, func() {
+		var num int32 = 1
+		objOne := gvar.New(num, true)
+		gtest.Assert(objOne.Int32(), num)
+
+	})
+}
+
+func TestInt64(t *testing.T) {
+	gtest.Case(t, func() {
+		var num int64 = 1
+		objOne := gvar.New(num, true)
+		gtest.Assert(objOne.Int64(), num)
+
+	})
+}
+
+func TestUint(t *testing.T) {
+	gtest.Case(t, func() {
+		var num uint = 1
+		objOne := gvar.New(num, true)
+		gtest.Assert(objOne.Uint(), num)
+
+	})
+}
+
+func TestUint8(t *testing.T) {
+	gtest.Case(t, func() {
+		var num uint8 = 1
+		objOne := gvar.New(num, true)
+		gtest.Assert(objOne.Uint8(), num)
+
+	})
+}
+
+func TestUint16(t *testing.T) {
+	gtest.Case(t, func() {
+		var num uint16 = 1
+		objOne := gvar.New(num, true)
+		gtest.Assert(objOne.Uint16(), num)
+
+	})
+}
+
+func TestUint32(t *testing.T) {
+	gtest.Case(t, func() {
+		var num uint32 = 1
+		objOne := gvar.New(num, true)
+		gtest.Assert(objOne.Uint32(), num)
+
+	})
+}
+
+func TestUint64(t *testing.T) {
+	gtest.Case(t, func() {
+		var num uint64 = 1
+		objOne := gvar.New(num, true)
+		gtest.Assert(objOne.Uint64(), num)
+
+	})
+}
+func TestFloat32(t *testing.T) {
+	gtest.Case(t, func() {
+		var num float32 = 1.1
+		objOne := gvar.New(num, true)
+		gtest.Assert(objOne.Float32(), num)
+
+	})
+}
+
+func TestFloat64(t *testing.T) {
+	gtest.Case(t, func() {
+		var num float64 = 1.1
+		objOne := gvar.New(num, true)
+		gtest.Assert(objOne.Float64(), num)
+
+	})
+}
+
+func TestInts(t *testing.T) {
+	gtest.Case(t, func() {
+		var arr = []int{1, 2, 3, 4, 5}
+		objOne := gvar.New(arr, true)
+		gtest.Assert(objOne.Ints()[0], arr[0])
+	})
+}
+func TestFloats(t *testing.T) {
+	gtest.Case(t, func() {
+		var arr = []float64{1, 2, 3, 4, 5}
+		objOne := gvar.New(arr, true)
+		gtest.Assert(objOne.Floats()[0], arr[0])
+	})
+}
+func TestStrings(t *testing.T) {
+	gtest.Case(t, func() {
+		var arr = []string{"hello", "world"}
+		objOne := gvar.New(arr, true)
+		gtest.Assert(objOne.Strings()[0], arr[0])
+	})
+}
+
+func TestTime(t *testing.T) {
+	gtest.Case(t, func() {
+		var timeUnix int64 = 1556242660
+		objOne := gvar.New(timeUnix, true)
+		gtest.Assert(objOne.Time().Unix(), timeUnix)
+	})
+}
+
+type StTest struct {
+	Test int
+}
+
+func TestStruct(t *testing.T) {
+	gtest.Case(t, func() {
+		Kv := make(map[string]int, 1)
+		Kv["Test"] = 100
+
+		testObj := &StTest{}
+
+		objOne := gvar.New(Kv, true)
+
+		objOne.Struct(testObj)
+
+		gtest.Assert(testObj.Test, Kv["Test"])
+	})
+}

g/crypto/crypto.go

@@ -1,7 +0,0 @@
-// Copyright 2019 gf Author(https://github.com/gogf/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://github.com/gogf/gf.
-
-package crypto

g/crypto/gaes/gaes.go

@@ -61,7 +61,10 @@ func Decrypt(cipherText []byte, key []byte, iv...[]byte) ([]byte, error) {
     blockModel := cipher.NewCBCDecrypter(block, ivValue)
     plainText  := make([]byte, len(cipherText))
     blockModel.CryptBlocks(plainText, cipherText)
-    plainText = PKCS5UnPadding(plainText)
+    plainText, e := PKCS5UnPadding(plainText, blockSize)
+	if e != nil {
+		return nil, e
+	}
 
     return plainText, nil
 }
@@ -72,8 +75,27 @@ func PKCS5Padding(src []byte, blockSize int) []byte {
     return append(src, padtext...)
 }
 
-func PKCS5UnPadding(src []byte) []byte {
+func PKCS5UnPadding(src []byte, blockSize int) ([]byte, error) {
     length    := len(src)
+    if blockSize <= 0 {
+        return nil, errors.New("invalid blocklen")
+    }
+
+	if length%blockSize != 0 || length == 0 {
+		return nil, errors.New("invalid data len")
+	}
+
     unpadding := int(src[length - 1])
-    return src[:(length - unpadding)]
-}
+	if unpadding > blockSize || unpadding == 0 {
+		return nil, errors.New("invalid padding")
+	}
+
+    padding := src[length - unpadding:]
+	for i := 0; i < unpadding; i++ {
+		if padding[i] != byte(unpadding) {
+			return nil, errors.New("invalid padding")
+		}
+	}
+
+    return src[:(length - unpadding)], nil
+}

g/crypto/gaes/gaes_test.go

@@ -0,0 +1,67 @@
+// Copyright 2019 gf Author(https://github.com/gogf/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://github.com/gogf/gf.
+
+// go test *.go -bench=".*"
+
+package gaes_test
+
+import (
+	"testing"
+
+	"github.com/gogf/gf/g/crypto/gaes"
+	"github.com/gogf/gf/g/test/gtest"
+)
+
+var (
+	content = []byte("pibigstar")
+	// iv 长度必须等于blockSize，只能为16
+	iv     = []byte("Hello My GoFrame")
+	key_16 = []byte("1234567891234567")
+	key_24 = []byte("123456789123456789123456")
+	key_32 = []byte("12345678912345678912345678912345")
+	keys   = []byte("12345678912345678912345678912346")
+)
+
+func TestEncrypt(t *testing.T) {
+	gtest.Case(t, func() {
+		_, err := gaes.Encrypt(content, key_16)
+		gtest.Assert(err, nil)
+		_, err = gaes.Encrypt(content, key_24)
+		gtest.Assert(err, nil)
+		_, err = gaes.Encrypt(content, key_32)
+		gtest.Assert(err, nil)
+		_, err = gaes.Encrypt(content, key_16, iv)
+		gtest.Assert(err, nil)
+	})
+}
+
+func TestDecrypt(t *testing.T) {
+	gtest.Case(t, func() {
+		encrypt, err := gaes.Encrypt(content, key_16)
+		decrypt, err := gaes.Decrypt(encrypt, key_16)
+		gtest.Assert(err, nil)
+		gtest.Assert(string(decrypt), string(content))
+
+		encrypt, err = gaes.Encrypt(content, key_24)
+		decrypt, err = gaes.Decrypt(encrypt, key_24)
+		gtest.Assert(err, nil)
+		gtest.Assert(string(decrypt), string(content))
+
+		encrypt, err = gaes.Encrypt(content, key_32)
+		decrypt, err = gaes.Decrypt(encrypt, key_32)
+		gtest.Assert(err, nil)
+		gtest.Assert(string(decrypt), string(content))
+
+		encrypt, err = gaes.Encrypt(content, key_32, iv)
+		decrypt, err = gaes.Decrypt(encrypt, key_32, iv)
+		gtest.Assert(err, nil)
+		gtest.Assert(string(decrypt), string(content))
+
+		encrypt, err = gaes.Encrypt(content, key_32, iv)
+		decrypt, err = gaes.Decrypt(encrypt, keys, iv)
+		gtest.Assert(err, "invalid padding")
+	})
+}

g/crypto/gcrc32/gcrc32_test.go

@@ -0,0 +1,27 @@
+// Copyright 2019 gf Author(https://github.com/gogf/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://github.com/gogf/gf.
+
+// go test *.go -bench=".*"
+
+package gcrc32_test
+
+import (
+	"testing"
+
+	"github.com/gogf/gf/g/crypto/gcrc32"
+	"github.com/gogf/gf/g/test/gtest"
+)
+
+func TestEncrypt(t *testing.T) {
+	gtest.Case(t, func() {
+		s := "pibigstar"
+		result := 693191136
+		encrypt1 := gcrc32.EncryptString(s)
+		encrypt2 := gcrc32.EncryptBytes([]byte(s))
+		gtest.AssertEQ(int(encrypt1), result)
+		gtest.AssertEQ(int(encrypt2), result)
+	})
+}

g/crypto/gdes/gdes_test.go

@@ -1,185 +1,239 @@
 package gdes_test
 
 import (
-	"testing"
-	"bytes"
 	"encoding/hex"
-	"fmt"
+	"testing"
+
 	"github.com/gogf/gf/g/crypto/gdes"
+	"github.com/gogf/gf/g/test/gtest"
 )
 
-func TestDesECB(t *testing.T){
-	{
+var (
+	errKey     = []byte("1111111111111234123456789")
+	errIv      = []byte("123456789")
+	errPadding = 5
+)
+
+func TestDesECB(t *testing.T) {
+	gtest.Case(t, func() {
 		key := []byte("11111111")
 		text := []byte("12345678")
 		padding := gdes.NOPADDING
+		result := "858b176da8b12503"
+		// encrypt test
 		cipherText, err := gdes.DesECBEncrypt(key, text, padding)
-		if err != nil {
-			t.Errorf("%v", err)
-		}
-  
+		gtest.AssertEQ(err, nil)
+		gtest.AssertEQ(hex.EncodeToString(cipherText),result)
+		// decrypt test
 		clearText, err := gdes.DesECBDecrypt(key, cipherText, padding)
-		if err != nil {
-			t.Errorf("%v", err)
-		}
+		gtest.AssertEQ(err, nil)
+		gtest.AssertEQ(string(clearText), "12345678")
 
-		if bytes.Equal(clearText, text) == false {
-			t.Errorf("text:%v, clearText:%v", hex.EncodeToString(text), hex.EncodeToString(clearText))
-		}
-		fmt.Println("clearText:", hex.EncodeToString(clearText), "cipherText:", hex.EncodeToString(cipherText))
+		// encrypt err test. when throw exception,the err is not equal nil and the string is nil
+		errEncrypt, err := gdes.DesECBEncrypt(key, text, errPadding)
+		gtest.AssertNE(err, nil)
+		gtest.AssertEQ(errEncrypt, nil)
+		errEncrypt, err = gdes.DesECBEncrypt(errKey, text, padding)
+		gtest.AssertNE(err, nil)
+		gtest.AssertEQ(errEncrypt, nil)
+		// err decrypt test.
+		errDecrypt, err := gdes.DesECBDecrypt(errKey, cipherText, padding)
+		gtest.AssertNE(err, nil)
+		gtest.AssertEQ(errDecrypt, nil)
+		errDecrypt, err = gdes.DesECBDecrypt(key, cipherText, errPadding)
+		gtest.AssertNE(err, nil)
+		gtest.AssertEQ(errDecrypt, nil)
+	})
 
-	}
-
-	{
+	gtest.Case(t, func() {
 		key := []byte("11111111")
 		text := []byte("12345678")
 		padding := gdes.PKCS5PADDING
+		errPadding := 5
+		result := "858b176da8b12503ad6a88b4fa37833d"
 		cipherText, err := gdes.DesECBEncrypt(key, text, padding)
-		if err != nil {
-			t.Errorf("%v", err)
-		}
-
+		gtest.AssertEQ(err,nil)
+		gtest.AssertEQ(hex.EncodeToString(cipherText),result)
+		// decrypt test
 		clearText, err := gdes.DesECBDecrypt(key, cipherText, padding)
-		if err != nil {
-			t.Errorf("%v", err)
-		}
+		gtest.AssertEQ(err,nil)
+		gtest.AssertEQ(string(clearText),"12345678")
 
-		if bytes.Equal(clearText, text) == false {
-			t.Errorf("text:%v, clearText:%v", hex.EncodeToString(text), hex.EncodeToString(clearText))
-		}
-		fmt.Println("clearText:", hex.EncodeToString(clearText), "cipherText:", hex.EncodeToString(cipherText))
-	}
+		// err test
+		errEncrypt, err := gdes.DesECBEncrypt(key, text, errPadding)
+		gtest.AssertNE(err, nil)
+		gtest.AssertEQ(errEncrypt, nil)
+		errDecrypt, err := gdes.DesECBDecrypt(errKey, cipherText, padding)
+		gtest.AssertNE(err, nil)
+		gtest.AssertEQ(errDecrypt, nil)
+	})
 }
 
-func Test3DesECB(t *testing.T){
-	{
+func Test3DesECB(t *testing.T) {
+	gtest.Case(t, func() {
 		key := []byte("1111111111111234")
 		text := []byte("1234567812345678")
 		padding := gdes.NOPADDING
+		result := "a23ee24b98c26263a23ee24b98c26263"
+		// encrypt test
 		cipherText, err := gdes.TripleDesECBEncrypt(key, text, padding)
-		if err != nil {
-			t.Errorf("%v", err)
-		}
-
+		gtest.AssertEQ(err,nil)
+		gtest.AssertEQ(hex.EncodeToString(cipherText),result)
+		// decrypt test
 		clearText, err := gdes.TripleDesECBDecrypt(key, cipherText, padding)
-		if err != nil {
-			t.Errorf("%v", err)
-		}
+		gtest.AssertEQ(err,nil)
+		gtest.AssertEQ(string(clearText),"1234567812345678")
+		// err test
+		errEncrypt, err := gdes.DesECBEncrypt(key, text, errPadding)
+		gtest.AssertNE(err, nil)
+		gtest.AssertEQ(errEncrypt, nil)
+	})
 
-		if bytes.Equal(clearText, text) == false {
-			t.Errorf("text:%v, clearText:%v", hex.EncodeToString(text), hex.EncodeToString(clearText))
-		}
-		fmt.Println("key:", hex.EncodeToString(key),"clearText:", hex.EncodeToString(clearText), "cipherText:", hex.EncodeToString(cipherText))
-
-	}
-
-	{
+	gtest.Case(t, func() {
 		key := []byte("111111111111123412345678")
 		text := []byte("123456789")
 		padding := gdes.PKCS5PADDING
+		errPadding := 5
+		result := "37989b1effc07a6d00ff89a7d052e79f"
+		// encrypt test
 		cipherText, err := gdes.TripleDesECBEncrypt(key, text, padding)
-		if err != nil {
-			t.Errorf("%v", err)
-		}
-
+		gtest.AssertEQ(err,nil)
+		gtest.AssertEQ(hex.EncodeToString(cipherText),result)
+		// decrypt test
 		clearText, err := gdes.TripleDesECBDecrypt(key, cipherText, padding)
-		if err != nil {
-			t.Errorf("%v", err)
-		}
-
-		if bytes.Equal(clearText, text) == false {
-			t.Errorf("text:%v, clearText:%v", hex.EncodeToString(text), hex.EncodeToString(clearText))
-		}
-		fmt.Println("key:", hex.EncodeToString(key),"clearText:", hex.EncodeToString(clearText), "cipherText:", hex.EncodeToString(cipherText))
-	}
+		gtest.AssertEQ(err,nil)
+		gtest.AssertEQ(string(clearText),"123456789")
+		// err test, when key is err, but text and padding is right
+		errEncrypt, err := gdes.TripleDesECBEncrypt(errKey, text, padding)
+		gtest.AssertNE(err, nil)
+		gtest.AssertEQ(errEncrypt, nil)
+		// when padding is err,but key and text is right
+		errEncrypt, err = gdes.TripleDesECBEncrypt(key, text, errPadding)
+		gtest.AssertNE(err, nil)
+		gtest.AssertEQ(errEncrypt, nil)
+		// decrypt err test,when key is err
+		errEncrypt, err = gdes.TripleDesECBDecrypt(errKey, text, padding)
+		gtest.AssertNE(err, nil)
+		gtest.AssertEQ(errEncrypt, nil)
+	})
 }
 
-func TestDesCBC(t *testing.T){
-	{
+func TestDesCBC(t *testing.T) {
+	gtest.Case(t, func() {
 		key := []byte("11111111")
 		text := []byte("1234567812345678")
 		padding := gdes.NOPADDING
 		iv := []byte("12345678")
-		cipherText, err := gdes.DesCBCEncrypt(key, text, iv,padding)
-		if err != nil {
-			t.Errorf("%v", err)
-		}
-
+		result := "40826a5800608c87585ca7c9efabee47"
+		// encrypt test
+		cipherText, err := gdes.DesCBCEncrypt(key, text, iv, padding)
+		gtest.AssertEQ(err,nil)
+		gtest.AssertEQ(hex.EncodeToString(cipherText),result)
+		// decrypt test
 		clearText, err := gdes.DesCBCDecrypt(key, cipherText, iv, padding)
-		if err != nil {
-			t.Errorf("%v", err)
-		}
+		gtest.AssertEQ(err,nil)
+		gtest.AssertEQ(string(clearText),"1234567812345678")
+		// encrypt err test.
+		errEncrypt, err := gdes.DesCBCEncrypt(errKey, text, iv, padding)
+		gtest.AssertNE(err, nil)
+		gtest.AssertEQ(errEncrypt, nil)
+		// the iv is err
+		errEncrypt, err = gdes.DesCBCEncrypt(key, text, errIv, padding)
+		//gtest.AssertNE(err,nil)
+		gtest.AssertEQ(errEncrypt, nil)
+		// the padding is err
+		errEncrypt, err = gdes.DesCBCEncrypt(key, text, iv, errPadding)
+		gtest.AssertNE(err, nil)
+		gtest.AssertEQ(errEncrypt, nil)
+		// decrypt err test. the key is err
+		errDecrypt, err := gdes.DesCBCDecrypt(errKey, cipherText, iv, padding)
+		gtest.AssertNE(err, nil)
+		gtest.AssertEQ(errDecrypt, nil)
+		// the iv is err
+		errDecrypt, err = gdes.DesCBCDecrypt(key, cipherText, errIv, padding)
+		gtest.AssertNE(err, nil)
+		gtest.AssertEQ(errDecrypt, nil)
+		// the padding is err
+		errDecrypt, err = gdes.DesCBCDecrypt(key, cipherText, iv, errPadding)
+		gtest.AssertNE(err, nil)
+		gtest.AssertEQ(errDecrypt, nil)
+	})
 
-		if bytes.Equal(clearText, text) == false {
-			t.Errorf("text:%v, clearText:%v", hex.EncodeToString(text), hex.EncodeToString(clearText))
-		}
-		fmt.Println("key:", hex.EncodeToString(key),"clearText:", hex.EncodeToString(clearText), "cipherText:", hex.EncodeToString(cipherText))
-
-	}
-
-	{
+	gtest.Case(t, func() {
 		key := []byte("11111111")
 		text := []byte("12345678")
 		padding := gdes.PKCS5PADDING
 		iv := []byte("12345678")
+		result := "40826a5800608c87100a25d86ac7c52c"
+		// encrypt test
 		cipherText, err := gdes.DesCBCEncrypt(key, text, iv, padding)
-		if err != nil {
-			t.Errorf("%v", err)
-		}
-
+		gtest.AssertEQ(err,nil)
+		gtest.AssertEQ(hex.EncodeToString(cipherText),result)
+		// decrypt test
 		clearText, err := gdes.DesCBCDecrypt(key, cipherText, iv, padding)
-		if err != nil {
-			t.Errorf("%v", err)
-		}
-
-		if bytes.Equal(clearText, text) == false {
-			t.Errorf("text:%v, clearText:%v", hex.EncodeToString(text), hex.EncodeToString(clearText))
-		}
-		fmt.Println("key:", hex.EncodeToString(key),"clearText:", hex.EncodeToString(clearText), "cipherText:", hex.EncodeToString(cipherText))
-	}
+		gtest.AssertEQ(err,nil)
+		gtest.AssertEQ(string(clearText),"12345678")
+		// err test
+		errEncrypt, err := gdes.DesCBCEncrypt(key, text, errIv, padding)
+		gtest.AssertNE(err, nil)
+		gtest.AssertEQ(errEncrypt, nil)
+	})
 }
 
-func Test3DesCBC(t *testing.T){
-	{
+func Test3DesCBC(t *testing.T) {
+	gtest.Case(t, func() {
 		key := []byte("1111111112345678")
 		text := []byte("1234567812345678")
 		padding := gdes.NOPADDING
 		iv := []byte("12345678")
-		cipherText, err := gdes.TripleDesCBCEncrypt(key, text, iv,padding)
-		if err != nil {
-			t.Errorf("%v", err)
-		}
-
+		result := "bfde1394e265d5f738d5cab170c77c88"
+		// encrypt test
+		cipherText, err := gdes.TripleDesCBCEncrypt(key, text, iv, padding)
+		gtest.AssertEQ(err,nil)
+		gtest.AssertEQ(hex.EncodeToString(cipherText),result)
+		// decrypt test
 		clearText, err := gdes.TripleDesCBCDecrypt(key, cipherText, iv, padding)
-		if err != nil {
-			t.Errorf("%v", err)
-		}
-
-		if bytes.Equal(clearText, text) == false {
-			t.Errorf("text:%v, clearText:%v", hex.EncodeToString(text), hex.EncodeToString(clearText))
-		}
-		fmt.Println("key:", hex.EncodeToString(key),"clearText:", hex.EncodeToString(clearText), "cipherText:", hex.EncodeToString(cipherText))
-
-	}
-
-	{
+		gtest.AssertEQ(err,nil)
+		gtest.AssertEQ(string(clearText),"1234567812345678")
+		// encrypt err test
+		errEncrypt, err := gdes.TripleDesCBCEncrypt(errKey, text, iv, padding)
+		gtest.AssertNE(err, nil)
+		gtest.AssertEQ(errEncrypt, nil)
+		// the iv is err
+		errEncrypt, err = gdes.TripleDesCBCEncrypt(key, text, errIv, padding)
+		gtest.AssertNE(err, nil)
+		gtest.AssertEQ(errEncrypt, nil)
+		// the padding is err
+		errEncrypt, err = gdes.TripleDesCBCEncrypt(key, text, iv, errPadding)
+		gtest.AssertNE(err, nil)
+		gtest.AssertEQ(errEncrypt, nil)
+		// decrypt err test
+		errDecrypt, err := gdes.TripleDesCBCDecrypt(errKey, cipherText, iv, padding)
+		gtest.AssertNE(err, nil)
+		gtest.AssertEQ(errDecrypt, nil)
+		// the iv is err
+		errDecrypt, err = gdes.TripleDesCBCDecrypt(key, cipherText, errIv, padding)
+		gtest.AssertNE(err, nil)
+		gtest.AssertEQ(errDecrypt, nil)
+		// the padding is err
+		errDecrypt, err = gdes.TripleDesCBCDecrypt(key, cipherText, iv, errPadding)
+		gtest.AssertNE(err, nil)
+		gtest.AssertEQ(errDecrypt, nil)
+	})
+	gtest.Case(t, func() {
 		key := []byte("111111111234567812345678")
 		text := []byte("12345678")
 		padding := gdes.PKCS5PADDING
 		iv := []byte("12345678")
+		result := "40826a5800608c87100a25d86ac7c52c"
+		// encrypt test
 		cipherText, err := gdes.TripleDesCBCEncrypt(key, text, iv, padding)
-		if err != nil {
-			t.Errorf("%v", err)
-		}
-
+		gtest.AssertEQ(err,nil)
+		gtest.AssertEQ(hex.EncodeToString(cipherText),result)
+		// decrypt test
 		clearText, err := gdes.TripleDesCBCDecrypt(key, cipherText, iv, padding)
-		if err != nil {
-			t.Errorf("%v", err)
-		}
+		gtest.AssertEQ(err,nil)
+		gtest.AssertEQ(string(clearText),"12345678")
+	})
 
-		if bytes.Equal(clearText, text) == false {
-			t.Errorf("text:%v, clearText:%v", hex.EncodeToString(text), hex.EncodeToString(clearText))
-		}
-		fmt.Println("key:", hex.EncodeToString(key),"clearText:", hex.EncodeToString(clearText), "cipherText:", hex.EncodeToString(cipherText))
-	}
-}
+}

g/crypto/gmd5/gmd5_test.go

@@ -0,0 +1,78 @@
+// Copyright 2019 gf Author(https://github.com/gogf/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://github.com/gogf/gf.
+
+// go test *.go -bench=".*"
+
+package gmd5_test
+
+import (
+	"os"
+	"testing"
+
+	"github.com/gogf/gf/g/crypto/gmd5"
+	"github.com/gogf/gf/g/test/gtest"
+)
+
+var (
+	s = "pibigstar"
+	// online generated MD5 value
+	result = "d175a1ff66aedde64344785f7f7a3df8"
+)
+
+type user struct {
+	name     string
+	password string
+	age      int
+}
+
+func TestEncrypt(t *testing.T) {
+	gtest.Case(t, func() {
+		encryptString := gmd5.Encrypt(s)
+		gtest.Assert(encryptString, result)
+
+		result := "1427562bb29f88a1161590b76398ab72"
+		encrypt := gmd5.Encrypt(123456)
+		gtest.AssertEQ(encrypt,result)
+	})
+
+	gtest.Case(t, func() {
+		user := &user{
+			name:     "派大星",
+			password: "123456",
+			age:      23,
+		}
+		result := "70917ebce8bd2f78c736cda63870fb39"
+		encrypt := gmd5.Encrypt(user)
+		gtest.AssertEQ(encrypt,result)
+	})
+}
+
+func TestEncryptString(t *testing.T) {
+	gtest.Case(t, func() {
+		encryptString := gmd5.EncryptString(s)
+		gtest.Assert(encryptString, result)
+	})
+}
+
+func TestEncryptFile(t *testing.T) {
+	path := "test.text"
+	errorPath := "err.txt"
+	result := "e6e6e1cd41895beebff16d5452dfce12"
+	gtest.Case(t, func() {
+		file, err := os.Create(path)
+		defer os.Remove(path)
+		defer file.Close()
+		gtest.Assert(err, nil)
+		file.Write([]byte("Hello Go Frame"))
+		encryptFile := gmd5.EncryptFile(path)
+		gtest.AssertEQ(encryptFile, result)
+		// when the file is not exist,encrypt will return empty string
+		errEncrypt := gmd5.EncryptFile(errorPath)
+		gtest.AssertEQ(errEncrypt, "")
+	})
+
+
+}

g/crypto/gsha1/gsha1_test.go

@@ -0,0 +1,67 @@
+// Copyright 2019 gf Author(https://github.com/gogf/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://github.com/gogf/gf.
+
+// go test *.go -bench=".*"
+
+package gsha1_test
+
+import (
+	"os"
+	"testing"
+
+	"github.com/gogf/gf/g/crypto/gsha1"
+	"github.com/gogf/gf/g/test/gtest"
+)
+
+type user struct {
+	name     string
+	password string
+	age      int
+}
+
+func TestEncrypt(t *testing.T) {
+	gtest.Case(t, func() {
+		user := &user{
+			name:     "派大星",
+			password: "123456",
+			age:      23,
+		}
+		result := "97386736e3ee4adee5ca595c78c12129f6032cad"
+		encrypt := gsha1.Encrypt(user)
+		gtest.AssertEQ(encrypt, result)
+	})
+	gtest.Case(t, func() {
+		result := "5b4c1c2a08ca85ddd031ef8627414f4cb2620b41"
+		s := gsha1.Encrypt("pibigstar")
+		gtest.AssertEQ(s, result)
+	})
+}
+
+func TestEncryptString(t *testing.T) {
+	gtest.Case(t, func() {
+		result := "5b4c1c2a08ca85ddd031ef8627414f4cb2620b41"
+		s := gsha1.EncryptString("pibigstar")
+		gtest.AssertEQ(s, result)
+	})
+}
+
+func TestEncryptFile(t *testing.T) {
+	path := "test.text"
+	errPath := "err.text"
+	gtest.Case(t, func() {
+		result := "8b05d3ba24b8d2374b8f5149d9f3fbada14ea984"
+		file, err := os.Create(path)
+		defer os.Remove(path)
+		defer file.Close()
+		gtest.Assert(err, nil)
+		file.Write([]byte("Hello Go Frame"))
+		encryptFile := gsha1.EncryptFile(path)
+		gtest.AssertEQ(encryptFile, result)
+		// when the file is not exist,encrypt will return empty string
+		errEncrypt := gsha1.EncryptFile(errPath)
+		gtest.AssertEQ(errEncrypt,"")
+	})
+}

g/database/database.go

@@ -1,7 +0,0 @@
-// Copyright 2017 gf Author(https://github.com/gogf/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://github.com/gogf/gf.
-
-package database

g/database/gdb/gdb.go

@@ -14,12 +14,12 @@ import (
     "database/sql"
     "errors"
     "fmt"
+    "github.com/gogf/gf/g/container/gmap"
     "github.com/gogf/gf/g/container/gring"
     "github.com/gogf/gf/g/container/gtype"
     "github.com/gogf/gf/g/container/gvar"
     "github.com/gogf/gf/g/os/gcache"
     "github.com/gogf/gf/g/util/grand"
-    _ "github.com/gogf/gf/third/github.com/go-sql-driver/mysql"
     "time"
 )
 
@@ -39,15 +39,17 @@ type DB interface {
     doPrepare(link dbLink, query string) (*sql.Stmt, error)
     doInsert(link dbLink, table string, data interface{}, option int, batch...int) (result sql.Result, err error)
     doBatchInsert(link dbLink, table string, list interface{}, option int, batch...int) (result sql.Result, err error)
-    doUpdate(link dbLink, table string, data interface{}, condition interface{}, args ...interface{}) (result sql.Result, err error)
-    doDelete(link dbLink, table string, condition interface{}, args ...interface{}) (result sql.Result, err error)
+    doUpdate(link dbLink, table string, data interface{}, condition string, args ...interface{}) (result sql.Result, err error)
+    doDelete(link dbLink, table string, condition string, args ...interface{}) (result sql.Result, err error)
 
 	// 数据库查询
 	GetAll(query string, args ...interface{}) (Result, error)
 	GetOne(query string, args ...interface{}) (Record, error)
 	GetValue(query string, args ...interface{}) (Value, error)
     GetCount(query string, args ...interface{}) (int, error)
-    GetStruct(obj interface{}, query string, args ...interface{}) error
+    GetStruct(objPointer interface{}, query string, args ...interface{}) error
+    GetStructs(objPointerSlice interface{}, query string, args ...interface{}) error
+    GetScan(objPointer interface{}, query string, args ...interface{}) error
 
     // 创建底层数据库master/slave链接对象
     Master() (*sql.DB, error)
@@ -145,30 +147,34 @@ type Map  = map[string]interface{}
 type List = []Map
 
 const (
-    OPTION_INSERT  = 0
-    OPTION_REPLACE = 1
-    OPTION_SAVE    = 2
-    OPTION_IGNORE  = 3
-    // 默认批量操作的数量值(Batch*操作)
-    gDEFAULT_BATCH_NUM          = 10
-    // 默认的连接池连接存活时间(秒)
-    gDEFAULT_CONN_MAX_LIFE_TIME = 30
-
+    OPTION_INSERT               = 0
+    OPTION_REPLACE              = 1
+    OPTION_SAVE                 = 2
+    OPTION_IGNORE               = 3
+    gDEFAULT_BATCH_NUM          = 10 // Per count for batch insert/replace/save
+    gDEFAULT_CONN_MAX_LIFE_TIME = 30 // Max life time for per connection in pool.
 )
 
-// 使用默认/指定分组配置进行连接，数据库集群配置项：default
-func New(groupName ...string) (db DB, err error) {
-	group := config.d
-	if len(groupName) > 0 {
-        group = groupName[0]
-	}
-	config.RLock()
-	defer config.RUnlock()
+var (
+    // Instance map.
+    instances = gmap.NewStringInterfaceMap()
+)
 
-	if len(config.c) < 1 {
+// New creates ORM DB object with global configurations.
+// The param <name> specifies the configuration group name,
+// which is DEFAULT_GROUP_NAME in default.
+func New(name ...string) (db DB, err error) {
+	group := configs.defaultGroup
+	if len(name) > 0 {
+        group = name[0]
+	}
+	configs.RLock()
+	defer configs.RUnlock()
+
+	if len(configs.config) < 1 {
 		return nil, errors.New("empty database configuration")
 	}
-	if _, ok := config.c[group]; ok {
+	if _, ok := configs.config[group]; ok {
 	    if node, err := getConfigNodeByGroup(group, true); err == nil {
 	        base := &dbBase {
                 group            : group,
@@ -202,9 +208,27 @@ func New(groupName ...string) (db DB, err error) {
 	}
 }
 
+// Instance returns an instance for DB operations.
+// The param <name> specifies the configuration group name,
+// which is DEFAULT_GROUP_NAME in default.
+func Instance(name ...string) (db DB, err error) {
+    group := configs.defaultGroup
+    if len(name) > 0 {
+        group = name[0]
+    }
+    v := instances.GetOrSetFuncLock(group, func() interface{} {
+        db, err = New(group)
+        return db
+    })
+    if v != nil {
+        return v.(DB), nil
+    }
+    return
+}
+
 // 获取指定数据库角色的一个配置项，内部根据权重计算负载均衡
 func getConfigNodeByGroup(group string, master bool) (*ConfigNode, error) {
-    if list, ok := config.c[group]; ok {
+    if list, ok := configs.config[group]; ok {
         // 将master, slave集群列表拆分出来
         masterList := make(ConfigGroup, 0)
         slaveList  := make(ConfigGroup, 0)
@@ -317,17 +341,17 @@ func (bs *dbBase) getSqlDb(master bool) (sqlDb *sql.DB, err error) {
     return
 }
 
-// 切换操作的数据库(注意该切换是全局的)
+// 切换当前数据库对象操作的数据库。
 func (bs *dbBase) SetSchema(schema string) {
     bs.schema.Set(schema)
 }
 
-// 创建底层数据库master链接对象
+// 创建底层数据库master链接对象。
 func (bs *dbBase) Master() (*sql.DB, error) {
 	return bs.getSqlDb(true)
 }
 
-// 创建底层数据库slave链接对象
+// 创建底层数据库slave链接对象。
 func (bs *dbBase) Slave() (*sql.DB, error) {
     return bs.getSqlDb(false)
 }

g/database/gdb/gdb_base.go

@@ -165,13 +165,44 @@ func (bs *dbBase) GetOne(query string, args ...interface{}) (Record, error) {
     return nil, nil
 }
 
-// 数据库查询，获取查询结果记录，自动映射数据到给定的struct对象中
-func (bs *dbBase) GetStruct(obj interface{}, query string, args ...interface{}) error {
+// 数据库查询，查询单条记录，自动映射数据到给定的struct对象中
+func (bs *dbBase) GetStruct(objPointer interface{}, query string, args ...interface{}) error {
     one, err := bs.GetOne(query, args...)
     if err != nil {
         return err
     }
-    return one.ToStruct(obj)
+    return one.ToStruct(objPointer)
+}
+
+// 数据库查询，查询多条记录，并自动转换为指定的slice对象, 如: []struct/[]*struct。
+func (bs *dbBase) GetStructs(objPointerSlice interface{}, query string, args ...interface{}) error {
+    all, err := bs.GetAll(query, args...)
+    if err != nil {
+        return err
+    }
+    return all.ToStructs(objPointerSlice)
+}
+
+// 将结果转换为指定的struct/*struct/[]struct/[]*struct,
+// 参数应该为指针类型，否则返回失败。
+// 该方法自动识别参数类型，调用Struct/Structs方法。
+func (bs *dbBase) GetScan(objPointer interface{}, query string, args ...interface{}) error {
+    t := reflect.TypeOf(objPointer)
+    k := t.Kind()
+    if k != reflect.Ptr {
+        return fmt.Errorf("params should be type of pointer, but got: %v", k)
+    }
+    k = t.Elem().Kind()
+    switch k {
+        case reflect.Array:
+        case reflect.Slice:
+            return bs.db.GetStructs(objPointer, query, args ...)
+        case reflect.Struct:
+            return bs.db.GetStruct(objPointer, query, args ...)
+        default:
+            return fmt.Errorf("element type should be type of struct/slice, unsupported: %v", k)
+    }
+    return nil
 }
 
 // 数据库查询，获取查询字段值
@@ -281,7 +312,7 @@ func (bs *dbBase) doInsert(link dbLink, table string, data interface{}, option i
             return bs.db.doBatchInsert(link, table, data, option, batch...)
         case reflect.Map:   fallthrough
         case reflect.Struct:
-            dataMap = Map(gconv.Map(data))
+            dataMap = gconv.Map(data)
         default:
             return result, errors.New(fmt.Sprint("unsupported data type:", kind))
     }
@@ -289,7 +320,7 @@ func (bs *dbBase) doInsert(link dbLink, table string, data interface{}, option i
     for k, v := range dataMap {
         fields = append(fields, charL + k + charR)
         values = append(values, "?")
-        params = append(params, v)
+        params = append(params, convertParam(v))
     }
     operation := getInsertOperationByOption(option)
     updateStr := ""
@@ -338,6 +369,10 @@ func (bs *dbBase) doBatchInsert(link dbLink, table string, list interface{}, opt
     var params []interface{}
     listMap := (List)(nil)
     switch v := list.(type) {
+        case Result:
+            listMap = v.ToList()
+        case Record:
+            listMap = List{v.ToMap()}
         case List:
             listMap = v
         case Map:
@@ -405,7 +440,7 @@ func (bs *dbBase) doBatchInsert(link dbLink, table string, list interface{}, opt
     }
     for i := 0; i < len(listMap); i++ {
         for _, k := range keys {
-            params = append(params, listMap[i][k])
+            params = append(params, convertParam(listMap[i][k]))
         }
         values = append(values, valueHolderStr)
         if len(values) == batchNum {
@@ -448,17 +483,13 @@ func (bs *dbBase) doBatchInsert(link dbLink, table string, list interface{}, opt
 // CURD操作:数据更新，统一采用sql预处理。
 // data参数支持string/map/struct/*struct类型。
 func (bs *dbBase) Update(table string, data interface{}, condition interface{}, args ...interface{}) (sql.Result, error) {
-    link, err := bs.db.Master()
-    if err != nil {
-        return nil, err
-    }
-    return bs.db.doUpdate(link, table, data, condition, args ...)
+    newWhere, newArgs := formatCondition(condition, args)
+    return bs.db.doUpdate(nil, table, data, newWhere, newArgs ...)
 }
 
 // CURD操作:数据更新，统一采用sql预处理。
 // data参数支持string/map/struct/*struct类型类型。
-func (bs *dbBase) doUpdate(link dbLink, table string, data interface{}, condition interface{}, args ...interface{}) (result sql.Result, err error) {
-    params       := ([]interface{})(nil)
+func (bs *dbBase) doUpdate(link dbLink, table string, data interface{}, condition string, args ...interface{}) (result sql.Result, err error) {
     updates      := ""
     charL, charR := bs.db.getChars()
     // 使用反射进行类型判断
@@ -468,43 +499,51 @@ func (bs *dbBase) doUpdate(link dbLink, table string, data interface{}, conditio
         rv   = rv.Elem()
         kind = rv.Kind()
     }
+    params := []interface{}(nil)
     switch kind {
         case reflect.Map:   fallthrough
         case reflect.Struct:
             var fields []string
             for k, v := range gconv.Map(data) {
                 fields = append(fields, fmt.Sprintf("%s%s%s=?", charL, k, charR))
-                params = append(params, gconv.String(v))
+                params = append(params, convertParam(v))
             }
             updates = strings.Join(fields, ",")
         default:
             updates = gconv.String(data)
     }
-    for _, v := range args {
-        params = append(params, gconv.String(v))
+    if len(params) > 0 {
+        args = append(params, args...)
     }
+    // 如果没有传递link，那么使用默认的写库对象
     if link == nil {
         if link, err = bs.db.Master(); err != nil {
             return nil, err
         }
     }
-    newWhere, newArgs := formatCondition(condition, params)
-    return bs.db.doExec(link, fmt.Sprintf("UPDATE %s SET %s WHERE %s", table, updates, newWhere), newArgs...)
+    if len(condition) == 0 {
+        return bs.db.doExec(link, fmt.Sprintf("UPDATE %s SET %s", table, updates), args...)
+    }
+    return bs.db.doExec(link, fmt.Sprintf("UPDATE %s SET %s WHERE %s", table, updates, condition), args...)
 }
 
 // CURD操作:删除数据
 func (bs *dbBase) Delete(table string, condition interface{}, args ...interface{}) (result sql.Result, err error) {
-    link, err := bs.db.Master()
-    if err != nil {
-        return nil, err
-    }
-    return bs.db.doDelete(link, table, condition, args ...)
+    newWhere, newArgs := formatCondition(condition, args)
+    return bs.db.doDelete(nil, table, newWhere, newArgs ...)
 }
 
 // CURD操作:删除数据
-func (bs *dbBase) doDelete(link dbLink, table string, condition interface{}, args ...interface{}) (result sql.Result, err error) {
-    newWhere, newArgs := formatCondition(condition, args)
-    return bs.db.doExec(link, fmt.Sprintf("DELETE FROM %s WHERE %s", table, newWhere), newArgs...)
+func (bs *dbBase) doDelete(link dbLink, table string, condition string, args ...interface{}) (result sql.Result, err error) {
+    if link == nil {
+        if link, err = bs.db.Master(); err != nil {
+            return nil, err
+        }
+    }
+    if len(condition) == 0 {
+        return bs.db.doExec(link, fmt.Sprintf("DELETE FROM %s", table), args...)
+    }
+    return bs.db.doExec(link, fmt.Sprintf("DELETE FROM %s WHERE %s", table, condition), args...)
 }
 
 // 获得缓存对象

g/database/gdb/gdb_config.go

@@ -17,14 +17,7 @@ const (
     DEFAULT_GROUP_NAME = "default" // 默认配置名称
 )
 
-// 数据库配置包内对象
-var config struct {
-    sync.RWMutex
-    c  Config // 数据库配置
-    d  string // 默认数据库分组名称
-}
-
-// 数据库配置
+// 数据库分组配置
 type Config      map[string]ConfigGroup
 
 // 数据库集群配置
@@ -41,12 +34,19 @@ type ConfigNode  struct {
     Role             string   // (可选，默认为master)数据库的角色，用于主从操作分离，至少需要有一个master，参数值：master, slave
     Charset          string   // (可选，默认为 utf8)编码，默认为 utf8
     Priority         int      // (可选)用于负载均衡的权重计算，当集群中只有一个节点时，权重没有任何意义
-    Linkinfo         string   // (可选)自定义链接信息，当该字段被设置值时，以上链接字段(Host,Port,User,Pass,Name)将失效(该字段是一个扩展功能)
+    LinkInfo         string   // (可选)自定义链接信息，当该字段被设置值时，以上链接字段(Host,Port,User,Pass,Name)将失效(该字段是一个扩展功能)
     MaxIdleConnCount int      // (可选)连接池最大限制的连接数
     MaxOpenConnCount int      // (可选)连接池最大打开的连接数
     MaxConnLifetime  int      // (可选，单位秒)连接对象可重复使用的时间长度
 }
 
+// 数据库配置包内对象
+var configs struct {
+    sync.RWMutex        // 并发安全互斥锁
+    config       Config // 数据库分组配置
+    defaultGroup string // 默认数据库分组名称
+}
+
 // 数据库集群配置示例，支持主从处理，多数据库集群支持
 /*
 var DatabaseConfiguration = Config {
@@ -80,29 +80,32 @@ var DatabaseConfiguration = Config {
 
 // 包初始化
 func init() {
-    config.c = make(Config)
-    config.d = DEFAULT_GROUP_NAME
+    configs.config       = make(Config)
+    configs.defaultGroup = DEFAULT_GROUP_NAME
 }
 
 // 设置当前应用的数据库配置信息，进行全局数据库配置覆盖操作
-func SetConfig (c Config) {
-    config.Lock()
-    defer config.Unlock()
-    config.c = c
+func SetConfig (config Config) {
+    defer instances.Clear()
+    configs.Lock()
+    defer configs.Unlock()
+    configs.config = config
 }
 
 // 添加数据库服务器集群配置
 func AddConfigGroup (group string, nodes ConfigGroup) {
-    config.Lock()
-    config.c[group] = nodes
-    config.Unlock()
+    defer instances.Clear()
+    configs.Lock()
+    defer configs.Unlock()
+    configs.config[group] = nodes
 }
 
 // 添加一台数据库服务器配置
 func AddConfigNode (group string, node ConfigNode) {
-    config.Lock()
-    config.c[group] = append(config.c[group], node)
-    config.Unlock()
+    defer instances.Clear()
+    configs.Lock()
+    defer configs.Unlock()
+    configs.config[group] = append(configs.config[group], node)
 }
 
 // 添加默认链接的一台数据库服务器配置
@@ -117,16 +120,25 @@ func AddDefaultConfigGroup (nodes ConfigGroup) {
 
 // 添加一台数据库服务器配置
 func GetConfig (group string) ConfigGroup {
-    config.RLock()
-    defer config.RUnlock()
-    return config.c[group]
+    configs.RLock()
+    defer configs.RUnlock()
+    return configs.config[group]
 }
 
 // 设置默认链接的数据库链接配置项(默认是 default)
-func SetDefaultGroup (groupName string) {
-    config.Lock()
-    config.d = groupName
-    config.Unlock()
+func SetDefaultGroup (name string) {
+    defer instances.Clear()
+    configs.Lock()
+    defer configs.Unlock()
+    configs.defaultGroup = name
+}
+
+// 获取默认链接的数据库链接配置项(默认是 default)
+func GetDefaultGroup() string {
+    defer instances.Clear()
+    configs.Lock()
+    defer configs.Unlock()
+    return configs.defaultGroup
 }
 
 // 设置数据库连接池中空闲链接的大小
@@ -147,8 +159,8 @@ func (bs *dbBase) SetConnMaxLifetime(n int) {
 
 // 节点配置转换为字符串
 func (node *ConfigNode) String() string {
-    if node.Linkinfo != "" {
-        return node.Linkinfo
+    if node.LinkInfo != "" {
+        return node.LinkInfo
     }
     return fmt.Sprintf(`%s@%s:%s,%s,%s,%s,%s,%d-%d-%d`, node.User, node.Host, node.Port,
         node.Name, node.Type, node.Role, node.Charset,

g/database/gdb/gdb_func.go

@@ -13,8 +13,8 @@ import (
     "github.com/gogf/gf/g/os/glog"
     "github.com/gogf/gf/g/os/gtime"
     "github.com/gogf/gf/g/text/gregex"
+    "github.com/gogf/gf/g/text/gstr"
     "github.com/gogf/gf/g/util/gconv"
-    _ "github.com/gogf/gf/third/github.com/go-sql-driver/mysql"
     "reflect"
     "strings"
 )
@@ -30,28 +30,62 @@ func formatCondition(where interface{}, args []interface{}) (newWhere string, ne
         rv   = rv.Elem()
         kind = rv.Kind()
     }
+    tmpArgs := []interface{}(nil)
     switch kind {
-        // 注意当where为map/struct类型时，args参数必须为空。
+        // map/struct类型
         case reflect.Map:   fallthrough
         case reflect.Struct:
-            for k, v := range gconv.Map(where) {
+            for key, value := range gconv.Map(where) {
                 if buffer.Len() > 0 {
                     buffer.WriteString(" AND ")
                 }
-                buffer.WriteString(k + "=?")
-                newArgs = append(newArgs, v)
+                // 支持slice键值/属性，如果只有一个?占位符号，那么作为IN查询，否则打散作为多个查询参数
+                rv := reflect.ValueOf(value)
+                switch rv.Kind() {
+                    case reflect.Slice: fallthrough
+                    case reflect.Array:
+                        count := gstr.Count(key, "?")
+                        if count == 0 {
+                            buffer.WriteString(key + " IN(?)")
+                            tmpArgs = append(tmpArgs, value)
+                        } else if count != rv.Len() {
+                            buffer.WriteString(key)
+                            tmpArgs = append(tmpArgs, value)
+                        } else {
+                            buffer.WriteString(key)
+                            // 如果键名/属性名称中带有多个?占位符号，那么将参数打散
+                            tmpArgs = append(tmpArgs, gconv.Interfaces(value)...)
+                        }
+                    default:
+                        if value == nil {
+                            buffer.WriteString(key)
+                        } else {
+                            if gstr.Pos(key, "?") == -1 {
+                                if gstr.Pos(key, "<") == -1 && gstr.Pos(key, ">") == -1 && gstr.Pos(key, "=") == -1 {
+                                    buffer.WriteString(key + "=?")
+                                } else {
+                                    buffer.WriteString(key + "?")
+                                }
+                            } else {
+                                buffer.WriteString(key)
+                            }
+                            tmpArgs = append(tmpArgs, value)
+                        }
+                }
             }
-            newWhere = buffer.String()
+
         default:
             buffer.WriteString(gconv.String(where))
     }
+    // 没有任何条件查询参数，直接返回
     if buffer.Len() == 0 {
-        buffer.WriteString("1=1")
+        return "", args
     }
-    // 查询条件参数处理，主要处理slice参数类型
     newWhere = buffer.String()
-    if len(args) > 0 {
-        for index, arg := range args {
+    tmpArgs  = append(tmpArgs, args...)
+    // 查询条件参数处理，主要处理slice参数类型
+    if len(tmpArgs) > 0 {
+        for index, arg := range tmpArgs {
             rv   := reflect.ValueOf(arg)
             kind := rv.Kind()
             if kind == reflect.Ptr {
@@ -66,6 +100,7 @@ func formatCondition(where interface{}, args []interface{}) (newWhere string, ne
                     for i := 0; i < rv.Len(); i++ {
                         newArgs = append(newArgs, rv.Index(i).Interface())
                     }
+                    // counter用于匹配该参数的位置(与index对应)
                     counter    := 0
                     newWhere, _ = gregex.ReplaceStringFunc(`\?`, newWhere, func(s string) string {
                         counter++
@@ -75,6 +110,14 @@ func formatCondition(where interface{}, args []interface{}) (newWhere string, ne
                         return s
                     })
                 default:
+                    // 支持例如 Where/And/Or("uid", 1) 这种格式
+                    if gstr.Pos(newWhere, "?") == -1 {
+                        if gstr.Pos(newWhere, "<") == -1 && gstr.Pos(newWhere, ">") == -1 && gstr.Pos(newWhere, "=") == -1 {
+                            newWhere += "=?"
+                        } else {
+                            newWhere += "?"
+                        }
+                    }
                     newArgs = append(newArgs, arg)
             }
         }
@@ -82,6 +125,22 @@ func formatCondition(where interface{}, args []interface{}) (newWhere string, ne
     return
 }
 
+// 将预处理参数转换为底层数据库引擎支持的格式。
+// 主要是判断参数是否为复杂数据类型，如果是，那么转换为基础类型。
+func convertParam(value interface{}) interface{} {
+    rv   := reflect.ValueOf(value)
+    kind := rv.Kind()
+    if kind == reflect.Ptr {
+        rv   = rv.Elem()
+        kind = rv.Kind()
+    }
+    switch kind {
+        case reflect.Struct:
+            return gconv.String(value)
+    }
+    return value
+}
+
 // 打印SQL对象(仅在debug=true时有效)
 func printSql(v *Sql) {
     s := fmt.Sprintf("%s, %v, %s, %s, %d ms, %s", v.Sql, v.Args,

g/database/gdb/gdb_model.go

@@ -3,17 +3,17 @@
 // 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://github.com/gogf/gf.
+//
+// @author john, ymrjqyy
 
 package gdb
 
 import (
-	"fmt"
-	"errors"
-	"database/sql"
-	"github.com/gogf/gf/g/util/gconv"
-	_ "github.com/gogf/gf/third/github.com/go-sql-driver/mysql"
+    "database/sql"
+    "errors"
+    "fmt"
+    "github.com/gogf/gf/g/util/gconv"
     "reflect"
-    "strings"
 )
 
 // 数据库链式操作模型对象
@@ -35,6 +35,7 @@ type Model struct {
 	cacheEnabled bool          // 当前SQL操作是否开启查询缓存功能
 	cacheTime    int           // 查询缓存时间
 	cacheName    string        // 查询缓存名称
+    safe         bool          // 当前模型是否运行安全模式（可修改当前模型，否则每一次链式操作都是返回新的模型对象）
 }
 
 // 链式操作，数据表字段，可支持多个表，以半角逗号连接
@@ -44,6 +45,7 @@ func (bs *dbBase) Table(tables string) (*Model) {
         tablesInit : tables,
 		tables     : tables,
 		fields     : "*",
+        safe       : false,
 	}
 }
 
@@ -59,6 +61,7 @@ func (tx *TX) Table(tables string) (*Model) {
 		tx         : tx,
         tablesInit : tables,
 		tables     : tables,
+        safe       : false,
 	}
 }
 
@@ -79,98 +82,130 @@ func (md *Model) Clone() *Model {
     return newModel
 }
 
+// 标识当前对象运行安全模式(可被修改)。
+// 1. 默认情况下，模型对象的对象属性无法被修改，
+// 每一次链式操作都是克隆一个新的模型对象，这样所有的操作都不会污染模型对象。
+// 但是链式操作如果需要分开执行，那么需要将新的克隆对象赋值给旧的模型对象继续操作。
+// 2. 当标识模型对象为可修改，那么在当前模型对象的所有链式操作均会影响下一次的链式操作，
+// 即使是链式操作分开执行。
+// 3. 大部分ORM框架默认模型对象是可修改的，但是GF框架的ORM提供给开发者更灵活，更安全的链式操作选项。
+func (md *Model) Safe(safe...bool) *Model {
+    if len(safe) > 0 {
+        md.safe = safe[0]
+    } else {
+        md.safe = true
+    }
+    return md
+}
+
+// 返回操作的模型对象，可能是当前对象，也可能是新的克隆对象，根据alterable决定。
+func (md *Model) getModel() *Model {
+    if !md.safe {
+        return md
+    } else {
+        return md.Clone()
+    }
+}
+
 // 链式操作，左联表
 func (md *Model) LeftJoin(joinTable string, on string) (*Model) {
-    model        := md.Clone()
+    model        := md.getModel()
     model.tables += fmt.Sprintf(" LEFT JOIN %s ON (%s)", joinTable, on)
 	return model
 }
 
 // 链式操作，右联表
 func (md *Model) RightJoin(joinTable string, on string) (*Model) {
-    model        := md.Clone()
+    model        := md.getModel()
     model.tables += fmt.Sprintf(" RIGHT JOIN %s ON (%s)", joinTable, on)
 	return model
 }
 
 // 链式操作，内联表
 func (md *Model) InnerJoin(joinTable string, on string) (*Model) {
-    model        := md.Clone()
+    model        := md.getModel()
     model.tables += fmt.Sprintf(" INNER JOIN %s ON (%s)", joinTable, on)
 	return model
 }
 
 // 链式操作，查询字段
 func (md *Model) Fields(fields string) (*Model) {
-    model       := md.Clone()
+    model       := md.getModel()
     model.fields = fields
 	return model
 }
 
 // 链式操作，过滤字段
 func (md *Model) Filter() (*Model) {
-    model       := md.Clone()
+    model       := md.getModel()
     model.filter = true
     return model
 }
 
-// 链式操作，condition，支持string & gdb.Map
+// 链式操作，condition，支持string & gdb.Map.
+// 注意，多个Where调用时，会自动转换为And条件调用。
 func (md *Model) Where(where interface{}, args ...interface{}) (*Model) {
-    model             := md.Clone()
+    model := md.getModel()
+    if model.where != "" {
+        return md.And(where, args...)
+    }
     newWhere, newArgs := formatCondition(where, args)
     model.where        = newWhere
-    model.whereArgs    = append(model.whereArgs, newArgs...)
-	// 支持 Where("uid", 1)这种格式
-	if len(args) == 1 && strings.Index(model.where , "?") < 0 {
-        model.where += "=?"
-    }
+    model.whereArgs    = newArgs
 	return model
 }
 
 // 链式操作，添加AND条件到Where中
 func (md *Model) And(where interface{}, args ...interface{}) (*Model) {
-    model             := md.Clone()
+    model             := md.getModel()
     newWhere, newArgs := formatCondition(where, args)
-    model.where       += " AND " + newWhere
-    model.whereArgs    = append(model.whereArgs, newArgs...)
+    if len(model.where) > 0 && model.where[0] == '(' {
+        model.where = fmt.Sprintf(`%s AND (%s)`, model.where, newWhere)
+    } else {
+        model.where = fmt.Sprintf(`(%s) AND (%s)`, model.where, newWhere)
+    }
+    model.whereArgs = append(model.whereArgs, newArgs...)
 	return model
 }
 
 // 链式操作，添加OR条件到Where中
 func (md *Model) Or(where interface{}, args ...interface{}) (*Model) {
-    model             := md.Clone()
+    model             := md.getModel()
     newWhere, newArgs := formatCondition(where, args)
-    model.where       += " OR " + newWhere
-    model.whereArgs    = append(model.whereArgs, newArgs...)
+    if len(model.where) > 0 && model.where[0] == '(' {
+        model.where = fmt.Sprintf(`%s OR (%s)`, model.where, newWhere)
+    } else {
+        model.where = fmt.Sprintf(`(%s) OR (%s)`, model.where, newWhere)
+    }
+    model.whereArgs = append(model.whereArgs, newArgs...)
 	return model
 }
 
 // 链式操作，group by
 func (md *Model) GroupBy(groupBy string) (*Model) {
-    model        := md.Clone()
+    model        := md.getModel()
     model.groupBy = groupBy
 	return model
 }
 
 // 链式操作，order by
 func (md *Model) OrderBy(orderBy string) (*Model) {
-    model        := md.Clone()
+    model        := md.getModel()
     model.orderBy = orderBy
 	return model
 }
 
 // 链式操作，limit
 func (md *Model) Limit(start int, limit int) (*Model) {
-    model      := md.Clone()
+    model      := md.getModel()
     model.start = start
     model.limit = limit
 	return model
 }
 
-// 链式操作，翻页
-// @author ymrjqyy
+// 链式操作，翻页，注意分页页码从1开始，而Limit方法从0开始。
 func (md *Model) ForPage(page, limit int) (*Model) {
-    model      := md.Clone()
+    model      := md.getModel()
     model.start = (page - 1) * limit
     model.limit = limit
 	return model
@@ -178,7 +213,7 @@ func (md *Model) ForPage(page, limit int) (*Model) {
 
 // 设置批处理的大小
 func (md *Model) Batch(batch int) *Model {
-    model      := md.Clone()
+    model      := md.getModel()
     model.batch = batch
     return model
 }
@@ -188,7 +223,7 @@ func (md *Model) Batch(batch int) *Model {
 // name表示自定义的缓存名称，便于业务层精准定位缓存项(如果业务层需要手动清理时，必须指定缓存名称)，
 // 例如：查询缓存时设置名称，清理缓存时可以给定清理的缓存名称进行精准清理。
 func (md *Model) Cache(time int, name ... string) *Model {
-    model          := md.Clone()
+    model          := md.getModel()
     model.cacheTime = time
     if len(name) > 0 {
         model.cacheName = name[0]
@@ -203,7 +238,7 @@ func (md *Model) Cache(time int, name ... string) *Model {
 // 链式操作，操作数据项，参数data类型支持 string/map/slice/struct/*struct ,
 // 也可以是：key,value,key,value,...。
 func (md *Model) Data(data ...interface{}) *Model {
-    model := md.Clone()
+    model := md.getModel()
 	if len(data) > 1 {
 		m := make(map[string]interface{})
 		for i := 0; i < len(data); i += 2 {
@@ -211,13 +246,17 @@ func (md *Model) Data(data ...interface{}) *Model {
 		}
         model.data = m
 	} else {
-		switch data[0].(type) {
+		switch params := data[0].(type) {
+			case Result:
+				model.data = params.ToList()
+			case Record:
+				model.data = params.ToMap()
 			case List:
-                model.data = data[0]
+                model.data = params
 			case Map:
-                model.data = data[0]
+                model.data = params
 			default:
-                rv   := reflect.ValueOf(data[0])
+                rv   := reflect.ValueOf(params)
                 kind := rv.Kind()
                 if kind == reflect.Ptr {
                     rv   = rv.Elem()
@@ -384,9 +423,9 @@ func (md *Model) Update() (result sql.Result, err error) {
         }
     }
 	if md.tx == nil {
-		return md.db.Update(md.tables, md.data, md.where, md.whereArgs ...)
+		return md.db.doUpdate(nil, md.tables, md.data, md.where, md.whereArgs ...)
 	} else {
-		return md.tx.Update(md.tables, md.data, md.where, md.whereArgs ...)
+		return md.tx.doUpdate(md.tables, md.data, md.where, md.whereArgs ...)
 	}
 }
 
@@ -398,9 +437,9 @@ func (md *Model) Delete() (result sql.Result, err error) {
 		}
 	}()
 	if md.tx == nil {
-		return md.db.Delete(md.tables, md.where, md.whereArgs...)
+		return md.db.doDelete(nil, md.tables, md.where, md.whereArgs...)
 	} else {
-		return md.tx.Delete(md.tables, md.where, md.whereArgs...)
+		return md.tx.doDelete(md.tables, md.where, md.whereArgs...)
 	}
 }
 
@@ -438,13 +477,44 @@ func (md *Model) Value() (Value, error) {
 	return nil, nil
 }
 
-// 链式操作，查询单条记录，并自动转换为struct对象
-func (md *Model) Struct(obj interface{}) error {
+// 链式操作，查询单条记录，并自动转换为struct对象, 参数必须为对象的指针，不能为空指针。
+func (md *Model) Struct(objPointer interface{}) error {
 	one, err := md.One()
 	if err != nil {
 		return err
 	}
-	return one.ToStruct(obj)
+	return one.ToStruct(objPointer)
+}
+
+// 链式操作，查询多条记录，并自动转换为指定的slice对象, 如: []struct/[]*struct。
+func (md *Model) Structs(objPointerSlice interface{}) error {
+	r, err := md.All()
+	if err != nil {
+		return err
+	}
+	return r.ToStructs(objPointerSlice)
+}
+
+// 链式操作，将结果转换为指定的struct/*struct/[]struct/[]*struct,
+// 参数应该为指针类型，否则返回失败。
+// 该方法自动识别参数类型，调用Struct/Structs方法。
+func (md *Model) Scan(objPointer interface{}) error {
+    t := reflect.TypeOf(objPointer)
+    k := t.Kind()
+    if k != reflect.Ptr {
+        return fmt.Errorf("params should be type of pointer, but got: %v", k)
+    }
+    k = t.Elem().Kind()
+    switch k {
+        case reflect.Array:
+        case reflect.Slice:
+            return md.Structs(objPointer)
+        case reflect.Struct:
+            return md.Struct(objPointer)
+        default:
+            return fmt.Errorf("element type should be type of struct/slice, unsupported: %v", k)
+    }
+    return nil
 }
 
 // 链式操作，查询数量，fields可以为空，也可以自定义查询字段，
@@ -532,14 +602,13 @@ func (md *Model) getFormattedSql() string {
 	return s
 }
 
-// 组块结果集
-// @author ymrjqyy
-// @author 2018-08-15
+// 组块结果集。
 func (md *Model) Chunk(limit int, callback func(result Result, err error) bool) {
-	page := 1
+	page  := 1
+	model := md
 	for {
-		md.ForPage(page, limit)
-		data, err := md.getAll(md.getFormattedSql(), md.whereArgs...)
+        model      = model.ForPage(page, limit)
+		data, err := model.All()
 		if err != nil {
 			callback(nil, err)
 			break

g/database/gdb/gdb_mssql.go

@@ -11,6 +11,7 @@
     2.不支持save/replace方法
     3.不支持LastInsertId方法
 */
+
 package gdb
 
 import (
@@ -29,8 +30,8 @@ type dbMssql struct {
 // 创建SQL操作对象
 func (db *dbMssql) Open(config *ConfigNode) (*sql.DB, error) {
 	source := ""
-	if config.Linkinfo != "" {
-		source = config.Linkinfo
+	if config.LinkInfo != "" {
+		source = config.LinkInfo
 	} else {
 		source = fmt.Sprintf("user id=%s;password=%s;server=%s;port=%s;database=%s;encrypt=disable",
 			config.User, config.Pass, config.Host, config.Port, config.Name)

g/database/gdb/gdb_mysql.go

@@ -8,8 +8,9 @@
 package gdb
 
 import (
-    "fmt"
-    "database/sql"
+	"database/sql"
+	"fmt"
+	_ "github.com/gf-third/mysql"
 )
 
 // 数据库链接对象
@@ -20,13 +21,13 @@ type dbMysql struct {
 // 创建SQL操作对象，内部采用了lazy link处理
 func (db *dbMysql) Open (config *ConfigNode) (*sql.DB, error) {
     var source string
-    if config.Linkinfo != "" {
-        source = config.Linkinfo
+    if config.LinkInfo != "" {
+        source = config.LinkInfo
     } else {
         source = fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=%s&multiStatements=true",
             config.User, config.Pass, config.Host, config.Port, config.Name, config.Charset)
     }
-    if db, err := sql.Open("mysql", source); err == nil {
+    if db, err := sql.Open("gf-mysql", source); err == nil {
         return db, nil
     } else {
         return nil, err

g/database/gdb/gdb_oracle.go

@@ -11,6 +11,7 @@
     2.不支持save/replace方法，可以调用这2个方法估计会报错，还没测试过,(应该是可以通过oracle的merge来实现这2个功能的，还没仔细研究)
     3.不支持LastInsertId方法
 */
+
 package gdb
 
 import (
@@ -29,8 +30,8 @@ type dbOracle struct {
 // 创建SQL操作对象
 func (db *dbOracle) Open(config *ConfigNode) (*sql.DB, error) {
 	var source string
-	if config.Linkinfo != "" {
-		source = config.Linkinfo
+	if config.LinkInfo != "" {
+		source = config.LinkInfo
 	} else {
 		source = fmt.Sprintf("%s/%s@%s", config.User, config.Pass, config.Name)
 	}

g/database/gdb/gdb_pgsql.go

@@ -26,8 +26,8 @@ type dbPgsql struct {
 // 创建SQL操作对象，内部采用了lazy link处理
 func (db *dbPgsql) Open (config *ConfigNode) (*sql.DB, error) {
     var source string
-    if config.Linkinfo != "" {
-        source = config.Linkinfo
+    if config.LinkInfo != "" {
+        source = config.LinkInfo
     } else {
         source = fmt.Sprintf("user=%s password=%s host=%s port=%s dbname=%s", config.User, config.Pass, config.Host, config.Port, config.Name)
     }

g/database/gdb/gdb_sqlite.go

@@ -24,8 +24,8 @@ type dbSqlite struct {
 
 func (db *dbSqlite) Open(config *ConfigNode) (*sql.DB, error) {
 	var source string
-	if config.Linkinfo != "" {
-		source = config.Linkinfo
+	if config.LinkInfo != "" {
+		source = config.LinkInfo
 	} else {
 		source = config.Name
 	}

g/database/gdb/gdb_structure.go

@@ -4,7 +4,6 @@
 // If a copy of the MIT was not distributed with this file,
 // You can obtain one at https://github.com/gogf/gf.
 
-
 package gdb
 
 import (

g/database/gdb/gdb_transaction.go

@@ -8,8 +8,9 @@ package gdb
 
 import (
     "database/sql"
+    "fmt"
     "github.com/gogf/gf/g/text/gregex"
-    _ "github.com/gogf/gf/third/github.com/go-sql-driver/mysql"
+    "reflect"
 )
 
 // 数据库事务对象
@@ -75,6 +76,37 @@ func (tx *TX) GetStruct(obj interface{}, query string, args ...interface{}) erro
     return one.ToStruct(obj)
 }
 
+// 数据库查询，查询多条记录，并自动转换为指定的slice对象, 如: []struct/[]*struct。
+func (tx *TX) GetStructs(objPointerSlice interface{}, query string, args ...interface{}) error {
+    all, err := tx.GetAll(query, args...)
+    if err != nil {
+        return err
+    }
+    return all.ToStructs(objPointerSlice)
+}
+
+// 将结果转换为指定的struct/*struct/[]struct/[]*struct,
+// 参数应该为指针类型，否则返回失败。
+// 该方法自动识别参数类型，调用Struct/Structs方法。
+func (tx *TX) GetScan(objPointer interface{}, query string, args ...interface{}) error {
+    t := reflect.TypeOf(objPointer)
+    k := t.Kind()
+    if k != reflect.Ptr {
+        return fmt.Errorf("params should be type of pointer, but got: %v", k)
+    }
+    k = t.Elem().Kind()
+    switch k {
+        case reflect.Array:
+        case reflect.Slice:
+            return tx.db.GetStructs(objPointer, query, args ...)
+        case reflect.Struct:
+            return tx.db.GetStruct(objPointer, query, args ...)
+        default:
+            return fmt.Errorf("element type should be type of struct/slice, unsupported: %v", k)
+    }
+    return nil
+}
+
 // 数据库查询，获取查询字段值
 func (tx *TX) GetValue(query string, args ...interface{}) (Value, error) {
     one, err := tx.GetOne(query, args ...)
@@ -129,14 +161,28 @@ func (tx *TX) BatchSave(table string, list interface{}, batch...int) (sql.Result
     return tx.db.doBatchInsert(tx.tx, table, list, OPTION_SAVE, batch...)
 }
 
-// CURD操作:数据更新，统一采用sql预处理
-// data参数支持字符串或者关联数组类型，内部会自行做判断处理
+// CURD操作:数据更新，统一采用sql预处理,
+// data参数支持字符串或者关联数组类型，内部会自行做判断处理.
 func (tx *TX) Update(table string, data interface{}, condition interface{}, args ...interface{}) (sql.Result, error) {
+    newWhere, newArgs := formatCondition(condition, args)
+    return tx.doUpdate(table, data, newWhere, newArgs ...)
+}
+
+// 与Update方法的区别是不处理条件参数
+func (tx *TX) doUpdate(table string, data interface{}, condition string, args ...interface{}) (sql.Result, error) {
     return tx.db.doUpdate(tx.tx, table, data, condition, args ...)
 }
 
 // CURD操作:删除数据
 func (tx *TX) Delete(table string, condition interface{}, args ...interface{}) (sql.Result, error) {
+    newWhere, newArgs := formatCondition(condition, args)
+    return tx.doDelete(table, newWhere, newArgs ...)
+}
+
+// 与Delete方法的区别是不处理条件参数
+func (tx *TX) doDelete(table string, condition string, args ...interface{}) (sql.Result, error) {
     return tx.db.doDelete(tx.tx, table, condition, args ...)
 }
 
+
+

g/database/gdb/gdb_type_record.go

@@ -33,10 +33,6 @@ func (r Record) ToMap() Map {
 }
 
 // 将Map变量映射到指定的struct对象中，注意参数应当是一个对象的指针
-func (r Record) ToStruct(obj interface{}) error {
-    m := make(map[string]interface{})
-    for k, v := range r {
-        m[k] = v.Val()
-    }
-    return gconv.Struct(m, obj)
+func (r Record) ToStruct(objPointer interface{}) error {
+    return gconv.Struct(r.ToMap(), objPointer)
 }

g/database/gdb/gdb_type_result.go

@@ -7,7 +7,9 @@
 package gdb
 
 import (
+    "fmt"
     "github.com/gogf/gf/g/encoding/gparser"
+    "reflect"
 )
 
 // 将结果集转换为JSON字符串
@@ -96,3 +98,30 @@ func (r Result) ToUintRecord(key string) map[uint]Record {
     }
     return m
 }
+
+// 将结果列表转换为指定对象的slice。
+func (r Result) ToStructs(objPointerSlice interface{}) error {
+    l := len(r)
+    if l == 0 {
+        return nil
+    }
+    t := reflect.TypeOf(objPointerSlice)
+    if t.Kind() != reflect.Ptr {
+        return fmt.Errorf("params should be type of pointer, but got: %v", t.Kind())
+    }
+    a := reflect.MakeSlice(t.Elem(), l, l)
+    itemType := a.Index(0).Type()
+    for i := 0; i < l; i++ {
+        if itemType.Kind() == reflect.Ptr {
+            e := reflect.New(itemType.Elem()).Elem()
+            r[i].ToStruct(e)
+            a.Index(i).Set(e.Addr())
+        } else {
+            e := reflect.New(itemType).Elem()
+            r[i].ToStruct(e)
+            a.Index(i).Set(e)
+        }
+    }
+    reflect.ValueOf(objPointerSlice).Elem().Set(a)
+    return nil
+}

g/database/gdb/gdb_unit_basic_test.go

@@ -0,0 +1,28 @@
+// Copyright 2019 gf Author(https://github.com/gogf/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://github.com/gogf/gf.
+
+package gdb_test
+
+import (
+    "github.com/gogf/gf/g/database/gdb"
+    "github.com/gogf/gf/g/test/gtest"
+    "testing"
+)
+
+func Test_Instance(t *testing.T) {
+    gtest.Case(t, func() {
+        _, err := gdb.Instance("none")
+        gtest.AssertNE(err, nil)
+
+        db, err := gdb.Instance()
+        gtest.Assert(err, nil)
+
+        err1 := db.PingMaster()
+        err2 := db.PingSlave()
+        gtest.Assert(err1, nil)
+        gtest.Assert(err2, nil)
+    })
+}

g/database/gdb/gdb_unit_init_test.go

@@ -1,11 +1,26 @@
+// Copyright 2019 gf Author(https://github.com/gogf/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://github.com/gogf/gf.
+
 package gdb_test
 
 import (
+    "fmt"
+    "github.com/gogf/gf/g"
+    "github.com/gogf/gf/g/container/garray"
     "github.com/gogf/gf/g/database/gdb"
+    "github.com/gogf/gf/g/os/gtime"
     "github.com/gogf/gf/g/test/gtest"
 	"os"
 )
 
+const (
+    // 初始化表数据量
+    INIT_DATA_SIZE = 10
+)
+
 var (
 	// 数据库对象/接口
 	db gdb.DB
@@ -26,10 +41,12 @@ func init() {
 		Priority: 1,
 	}
 	hostname, _ := os.Hostname()
+	// 本地测试hack
 	if hostname == "ijohn" {
 		node.Pass = "12345678"
 	}
-	gdb.AddDefaultConfigNode(node)
+	gdb.AddConfigNode("test",                 node)
+	gdb.AddConfigNode(gdb.DEFAULT_GROUP_NAME, node)
 	if r, err := gdb.New(); err != nil {
         gtest.Fatal(err)
 	} else {
@@ -39,12 +56,25 @@ func init() {
     if _, err := db.Exec("CREATE DATABASE IF NOT EXISTS `test` CHARACTER SET UTF8"); err != nil {
         gtest.Fatal(err)
     }
+    // 选择操作数据库
     db.SetSchema("test")
-    if _, err := db.Exec("DROP TABLE IF EXISTS `user`"); err != nil {
-        gtest.Fatal(err)
+    // 创建默认用户表
+    createTable("user")
+}
+
+// 创建指定名称的user测试表，当table为空时，创建随机的表名。
+// 创建的测试表默认没有任何数据。
+// 执行完成后返回该表名。
+// TODO 支持更多数据库
+func createTable(table...string) (name string) {
+    if len(table) > 0 {
+        name = table[0]
+    } else {
+        name = fmt.Sprintf(`user_%d`, gtime.Nanosecond())
     }
-    if _, err := db.Exec(`
-    CREATE TABLE user (
+    dropTable(name)
+    if _, err := db.Exec(fmt.Sprintf(`
+    CREATE TABLE %s (
         id int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '用户ID',
         passport varchar(45) NOT NULL COMMENT '账号',
         password char(32) NOT NULL COMMENT '密码',
@@ -52,7 +82,38 @@ func init() {
         create_time timestamp NOT NULL COMMENT '创建时间/注册时间',
         PRIMARY KEY (id)
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-    `); err != nil {
+    `, name)); err != nil {
+        gtest.Fatal(err)
+    }
+    return
+}
+
+// 删除指定表.
+func dropTable(table string) {
+    if _, err := db.Exec(fmt.Sprintf("DROP TABLE IF EXISTS `%s`", table)); err != nil {
         gtest.Fatal(err)
     }
 }
+
+// See createTable.
+// 创建测试表，并初始化默认数据。
+func createInitTable(table...string) (name string) {
+    name   = createTable(table...)
+    array := garray.New(true)
+    for i := 1; i <= INIT_DATA_SIZE; i++ {
+        array.Append(g.Map{
+            "id"          : i,
+            "passport"    : fmt.Sprintf(`t%d`, i),
+            "password"    : fmt.Sprintf(`p%d`, i),
+            "nickname"    : fmt.Sprintf(`T%d`, i),
+            "create_time" : gtime.Now().String(),
+        })
+    }
+    result, err := db.Table(name).Data(array.Slice()).Insert()
+    gtest.Assert(err, nil)
+
+    n, e := result.RowsAffected()
+    gtest.Assert(e, nil)
+    gtest.Assert(n, INIT_DATA_SIZE)
+    return
+}

g/database/gdb/gdb_unit_method_test.go

@@ -1,4 +1,8 @@
-// 方法操作
+// Copyright 2019 gf Author(https://github.com/gogf/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://github.com/gogf/gf.
 
 package gdb_test
 
@@ -9,6 +13,15 @@ import (
     "testing"
 )
 
+func TestDbBase_Ping(t *testing.T) {
+    gtest.Case(t, func() {
+        err1 := db.PingMaster()
+        err2 := db.PingSlave()
+        gtest.Assert(err1, nil)
+        gtest.Assert(err2, nil)
+    })
+}
+
 func TestDbBase_Query(t *testing.T) {
     if _, err := db.Query("SELECT ?", 1); err != nil {
         gtest.Fatal(err)
@@ -144,57 +157,102 @@ func TestDbBase_Insert(t *testing.T) {
 }
 
 func TestDbBase_BatchInsert(t *testing.T) {
-    if r, err := db.BatchInsert("user", g.List {
-        {
-            "id"          : 2,
-            "passport"    : "t2",
-            "password"    : "25d55ad283aa400af464c76d713c07ad",
-            "nickname"    : "T2",
-            "create_time" : gtime.Now().String(),
-        },
-        {
-            "id"          : 3,
-            "passport"    : "t3",
-            "password"    : "25d55ad283aa400af464c76d713c07ad",
-            "nickname"    : "T3",
-            "create_time" : gtime.Now().String(),
-        },
-    }, 1); err != nil {
-        gtest.Fatal(err)
-    } else {
-        n, _ := r.RowsAffected()
-        gtest.Assert(n, 2)
-    }
+    gtest.Case(t, func() {
+        if r, err := db.BatchInsert("user", g.List {
+            {
+                "id"          : 2,
+                "passport"    : "t2",
+                "password"    : "25d55ad283aa400af464c76d713c07ad",
+                "nickname"    : "T2",
+                "create_time" : gtime.Now().String(),
+            },
+            {
+                "id"          : 3,
+                "passport"    : "t3",
+                "password"    : "25d55ad283aa400af464c76d713c07ad",
+                "nickname"    : "T3",
+                "create_time" : gtime.Now().String(),
+            },
+        }, 1); err != nil {
+            gtest.Fatal(err)
+        } else {
+            n, _ := r.RowsAffected()
+            gtest.Assert(n, 2)
+        }
 
-    result, err := db.Delete("user", "id>?", 1)
-    if err != nil {
-        gtest.Fatal(err)
-    }
-    n, _ := result.RowsAffected()
-    gtest.Assert(n, 2)
-
-    // []interface{}
-    if r, err := db.BatchInsert("user", []interface{} {
-        map[interface{}]interface{} {
-            "id"          : 2,
-            "passport"    : "t2",
-            "password"    : "25d55ad283aa400af464c76d713c07ad",
-            "nickname"    : "T2",
-            "create_time" : gtime.Now().String(),
-        },
-        map[interface{}]interface{} {
-            "id"          : 3,
-            "passport"    : "t3",
-            "password"    : "25d55ad283aa400af464c76d713c07ad",
-            "nickname"    : "T3",
-            "create_time" : gtime.Now().String(),
-        },
-    }, 1); err != nil {
-        gtest.Fatal(err)
-    } else {
-        n, _ := r.RowsAffected()
+        result, err := db.Delete("user", "id>?", 1)
+        if err != nil {
+            gtest.Fatal(err)
+        }
+        n, _ := result.RowsAffected()
         gtest.Assert(n, 2)
-    }
+
+        // []interface{}
+        if r, err := db.BatchInsert("user", []interface{} {
+            map[interface{}]interface{} {
+                "id"          : 2,
+                "passport"    : "t2",
+                "password"    : "25d55ad283aa400af464c76d713c07ad",
+                "nickname"    : "T2",
+                "create_time" : gtime.Now().String(),
+            },
+            map[interface{}]interface{} {
+                "id"          : 3,
+                "passport"    : "t3",
+                "password"    : "25d55ad283aa400af464c76d713c07ad",
+                "nickname"    : "T3",
+                "create_time" : gtime.Now().String(),
+            },
+        }, 1); err != nil {
+            gtest.Fatal(err)
+        } else {
+            n, _ := r.RowsAffected()
+            gtest.Assert(n, 2)
+        }
+    })
+    // batch insert map
+    gtest.Case(t, func() {
+        table := createTable()
+        defer dropTable(table)
+        result, err := db.BatchInsert(table, g.Map{
+            "id"          : 1,
+            "passport"    : "t1",
+            "password"    : "p1",
+            "nickname"    : "T1",
+            "create_time" : gtime.Now().String(),
+        })
+        if err != nil {
+            gtest.Fatal(err)
+        }
+        n, _ := result.RowsAffected()
+        gtest.Assert(n, 1)
+    })
+    // batch insert struct
+    gtest.Case(t, func() {
+        table := createTable()
+        defer dropTable(table)
+
+        type User struct {
+            Id         int         `gconv:"id"`
+            Passport   string      `gconv:"passport"`
+            Password   string      `gconv:"password"`
+            NickName   string      `gconv:"nickname"`
+            CreateTime *gtime.Time `gconv:"create_time"`
+        }
+        user := &User{
+            Id          : 1,
+            Passport    : "t1",
+            Password    : "p1",
+            NickName    : "T1",
+            CreateTime  : gtime.Now(),
+        }
+        result, err := db.BatchInsert(table, user)
+        if err != nil {
+            gtest.Fatal(err)
+        }
+        n, _ := result.RowsAffected()
+        gtest.Assert(n, 1)
+    })
 }
 
 func TestDbBase_Save(t *testing.T) {
@@ -266,19 +324,159 @@ func TestDbBase_GetCount(t *testing.T) {
 }
 
 func TestDbBase_GetStruct(t *testing.T) {
-    type User struct {
-        Id         int
-        Passport   string
-        Password   string
-        NickName   string
-        CreateTime gtime.Time
-    }
-    user := new(User)
-    if err := db.GetStruct(user, "SELECT * FROM user WHERE id=?", 3); err != nil {
-        gtest.Fatal(err)
-    } else {
-        gtest.Assert(user.CreateTime.String(), "2010-10-10 00:00:01")
-    }
+    gtest.Case(t, func() {
+        type User struct {
+            Id         int
+            Passport   string
+            Password   string
+            NickName   string
+            CreateTime gtime.Time
+        }
+        user := new(User)
+        if err := db.GetStruct(user, "SELECT * FROM user WHERE id=?", 3); err != nil {
+            gtest.Fatal(err)
+        } else {
+            gtest.Assert(user.CreateTime.String(), "2010-10-10 00:00:01")
+        }
+    })
+    gtest.Case(t, func() {
+        type User struct {
+            Id         int
+            Passport   string
+            Password   string
+            NickName   string
+            CreateTime *gtime.Time
+        }
+        user := new(User)
+        if err := db.GetStruct(user, "SELECT * FROM user WHERE id=?", 3); err != nil {
+            gtest.Fatal(err)
+        } else {
+            gtest.Assert(user.CreateTime.String(), "2010-10-10 00:00:01")
+        }
+    })
+}
+
+func TestDbBase_GetStructs(t *testing.T) {
+    gtest.Case(t, func() {
+        type User struct {
+            Id         int
+            Passport   string
+            Password   string
+            NickName   string
+            CreateTime gtime.Time
+        }
+        var users []User
+        if err := db.GetStructs(&users, "SELECT * FROM user WHERE id>=?", 1); err != nil {
+            gtest.Fatal(err)
+        }
+        gtest.Assert(len(users),  3)
+        gtest.Assert(users[0].Id, 1)
+        gtest.Assert(users[1].Id, 2)
+        gtest.Assert(users[2].Id, 3)
+        gtest.Assert(users[0].NickName,            "T111")
+        gtest.Assert(users[1].NickName,            "T2")
+        gtest.Assert(users[2].NickName,            "T3")
+        gtest.Assert(users[2].CreateTime.String(), "2010-10-10 00:00:01")
+    })
+
+    gtest.Case(t, func() {
+        type User struct {
+            Id         int
+            Passport   string
+            Password   string
+            NickName   string
+            CreateTime *gtime.Time
+        }
+        var users []User
+        if err := db.GetStructs(&users, "SELECT * FROM user WHERE id>=?", 1); err != nil {
+            gtest.Fatal(err)
+        }
+        gtest.Assert(len(users),  3)
+        gtest.Assert(users[0].Id, 1)
+        gtest.Assert(users[1].Id, 2)
+        gtest.Assert(users[2].Id, 3)
+        gtest.Assert(users[0].NickName,            "T111")
+        gtest.Assert(users[1].NickName,            "T2")
+        gtest.Assert(users[2].NickName,            "T3")
+        gtest.Assert(users[2].CreateTime.String(), "2010-10-10 00:00:01")
+    })
+}
+
+func TestDbBase_GetScan(t *testing.T) {
+    gtest.Case(t, func() {
+        type User struct {
+            Id         int
+            Passport   string
+            Password   string
+            NickName   string
+            CreateTime gtime.Time
+        }
+        user := new(User)
+        if err := db.GetScan(user, "SELECT * FROM user WHERE id=?", 3); err != nil {
+            gtest.Fatal(err)
+        } else {
+            gtest.Assert(user.CreateTime.String(), "2010-10-10 00:00:01")
+        }
+    })
+    gtest.Case(t, func() {
+        type User struct {
+            Id         int
+            Passport   string
+            Password   string
+            NickName   string
+            CreateTime *gtime.Time
+        }
+        user := new(User)
+        if err := db.GetScan(user, "SELECT * FROM user WHERE id=?", 3); err != nil {
+            gtest.Fatal(err)
+        } else {
+            gtest.Assert(user.CreateTime.String(), "2010-10-10 00:00:01")
+        }
+    })
+
+    gtest.Case(t, func() {
+        type User struct {
+            Id         int
+            Passport   string
+            Password   string
+            NickName   string
+            CreateTime gtime.Time
+        }
+        var users []User
+        if err := db.GetScan(&users, "SELECT * FROM user WHERE id>=?", 1); err != nil {
+            gtest.Fatal(err)
+        }
+        gtest.Assert(len(users),  3)
+        gtest.Assert(users[0].Id, 1)
+        gtest.Assert(users[1].Id, 2)
+        gtest.Assert(users[2].Id, 3)
+        gtest.Assert(users[0].NickName,            "T111")
+        gtest.Assert(users[1].NickName,            "T2")
+        gtest.Assert(users[2].NickName,            "T3")
+        gtest.Assert(users[2].CreateTime.String(), "2010-10-10 00:00:01")
+    })
+
+    gtest.Case(t, func() {
+        type User struct {
+            Id         int
+            Passport   string
+            Password   string
+            NickName   string
+            CreateTime *gtime.Time
+        }
+        var users []User
+        if err := db.GetScan(&users, "SELECT * FROM user WHERE id>=?", 1); err != nil {
+            gtest.Fatal(err)
+        }
+        gtest.Assert(len(users),  3)
+        gtest.Assert(users[0].Id, 1)
+        gtest.Assert(users[1].Id, 2)
+        gtest.Assert(users[2].Id, 3)
+        gtest.Assert(users[0].NickName,            "T111")
+        gtest.Assert(users[1].NickName,            "T2")
+        gtest.Assert(users[2].NickName,            "T3")
+        gtest.Assert(users[2].CreateTime.String(), "2010-10-10 00:00:01")
+    })
 }
 
 func TestDbBase_Delete(t *testing.T) {

g/database/gdb/gdb_unit_model_test.go

@@ -1,4 +1,8 @@
-// 链式操作
+// Copyright 2019 gf Author(https://github.com/gogf/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://github.com/gogf/gf.
 
 package gdb_test
 
@@ -90,29 +94,66 @@ func TestModel_Insert(t *testing.T) {
 }
 
 func TestModel_Batch(t *testing.T) {
-    result, err := db.Table("user").Filter().Data(g.List{
-        {
-            "id"          : 2,
-            "uid"         : 2,
-            "passport"    : "t2",
-            "password"    : "25d55ad283aa400af464c76d713c07ad",
-            "nickname"    : "T2",
-            "create_time" : gtime.Now().String(),
-        },
-        {
-            "id"          : 3,
-            "uid"         : 3,
-            "passport"    : "t3",
-            "password"    : "25d55ad283aa400af464c76d713c07ad",
-            "nickname"    : "T3",
-            "create_time" : gtime.Now().String(),
-        },
-    }).Batch(1).Insert()
-    if err != nil {
-        gtest.Fatal(err)
-    }
-    n, _ := result.RowsAffected()
-    gtest.Assert(n, 2)
+    // batch insert
+    gtest.Case(t, func() {
+        result, err := db.Table("user").Filter().Data(g.List{
+            {
+                "id"          : 2,
+                "uid"         : 2,
+                "passport"    : "t2",
+                "password"    : "25d55ad283aa400af464c76d713c07ad",
+                "nickname"    : "T2",
+                "create_time" : gtime.Now().String(),
+            },
+            {
+                "id"          : 3,
+                "uid"         : 3,
+                "passport"    : "t3",
+                "password"    : "25d55ad283aa400af464c76d713c07ad",
+                "nickname"    : "T3",
+                "create_time" : gtime.Now().String(),
+            },
+        }).Batch(1).Insert()
+        if err != nil {
+            gtest.Fatal(err)
+        }
+        n, _ := result.RowsAffected()
+        gtest.Assert(n, 2)
+    })
+
+    // batch save
+    gtest.Case(t, func() {
+        table := createInitTable()
+        defer dropTable(table)
+        result, err  := db.Table(table).All()
+        gtest.Assert(err,         nil)
+        gtest.Assert(len(result), INIT_DATA_SIZE)
+        for _, v := range result {
+            v["nickname"].Set(v["nickname"].String() + v["id"].String())
+        }
+        r, e := db.Table(table).Data(result).Save()
+        gtest.Assert(e, nil)
+        n, e := r.RowsAffected()
+        gtest.Assert(e, nil)
+        gtest.Assert(n, INIT_DATA_SIZE*2)
+    })
+
+    // batch replace
+    gtest.Case(t, func() {
+        table := createInitTable()
+        defer dropTable(table)
+        result, err  := db.Table(table).All()
+        gtest.Assert(err,         nil)
+        gtest.Assert(len(result), INIT_DATA_SIZE)
+        for _, v := range result {
+            v["nickname"].Set(v["nickname"].String() + v["id"].String())
+        }
+        r, e := db.Table(table).Data(result).Replace()
+        gtest.Assert(e, nil)
+        n, e := r.RowsAffected()
+        gtest.Assert(e, nil)
+        gtest.Assert(n, INIT_DATA_SIZE*2)
+    })
 }
 
 func TestModel_Replace(t *testing.T) {
@@ -121,7 +162,7 @@ func TestModel_Replace(t *testing.T) {
         "passport"    : "t11",
         "password"    : "25d55ad283aa400af464c76d713c07ad",
         "nickname"    : "T11",
-        "create_time" : gtime.Now().String(),
+        "create_time" : "2018-10-10 00:01:10",
     }).Replace()
     if err != nil {
         gtest.Fatal(err)
@@ -136,7 +177,7 @@ func TestModel_Save(t *testing.T) {
         "passport"    : "t111",
         "password"    : "25d55ad283aa400af464c76d713c07ad",
         "nickname"    : "T111",
-        "create_time" : gtime.Now().String(),
+        "create_time" : "2018-10-10 00:01:10",
     }).Save()
     if err != nil {
         gtest.Fatal(err)
@@ -146,12 +187,23 @@ func TestModel_Save(t *testing.T) {
 }
 
 func TestModel_Update(t *testing.T) {
-    result, err := db.Table("user").Data("passport", "t22").Where("passport=?", "t2").Update()
-    if err != nil {
-        gtest.Fatal(err)
-    }
-    n, _ := result.RowsAffected()
-    gtest.Assert(n, 1)
+    gtest.Case(t, func() {
+        result, err := db.Table("user").Data("passport", "t22").Where("passport=?", "t2").Update()
+        if err != nil {
+            gtest.Fatal(err)
+        }
+        n, _ := result.RowsAffected()
+        gtest.Assert(n, 1)
+    })
+
+    gtest.Case(t, func() {
+        result, err := db.Table("user").Data("passport", "t2").Where("passport='t22'").Update()
+        if err != nil {
+            gtest.Fatal(err)
+        }
+        n, _ := result.RowsAffected()
+        gtest.Assert(n, 1)
+    })
 }
 
 func TestModel_Clone(t *testing.T) {
@@ -168,13 +220,44 @@ func TestModel_Clone(t *testing.T) {
     if err != nil {
         gtest.Fatal(err)
     }
-    gtest.Assert(count, 2)
-    gtest.Assert(record["id"].Int(), 3)
-    gtest.Assert(len(result), 2)
+    gtest.Assert(count,                 2)
+    gtest.Assert(record["id"].Int(),    3)
+    gtest.Assert(len(result),           2)
     gtest.Assert(result[0]["id"].Int(), 1)
     gtest.Assert(result[1]["id"].Int(), 3)
 }
 
+func TestModel_Safe(t *testing.T) {
+    gtest.Case(t, func() {
+        md := db.Table("user").Safe(false).Where("id IN(?)", g.Slice{1,3})
+        count, err := md.Count()
+        if err != nil {
+            gtest.Fatal(err)
+        }
+        gtest.Assert(count, 2)
+        md.And("id = ?", 1)
+        count, err = md.Count()
+        if err != nil {
+            gtest.Fatal(err)
+        }
+        gtest.Assert(count, 1)
+    })
+    gtest.Case(t, func() {
+        md := db.Table("user").Safe(true).Where("id IN(?)", g.Slice{1,3})
+        count, err := md.Count()
+        if err != nil {
+            gtest.Fatal(err)
+        }
+        gtest.Assert(count, 2)
+        md.And("id = ?", 1)
+        count, err = md.Count()
+        if err != nil {
+            gtest.Fatal(err)
+        }
+        gtest.Assert(count, 2)
+    })
+}
+
 func TestModel_All(t *testing.T) {
     result, err := db.Table("user").All()
     if err != nil {
@@ -222,19 +305,164 @@ func TestModel_Select(t *testing.T) {
 }
 
 func TestModel_Struct(t *testing.T) {
-    type User struct {
-        Id         int
-        Passport   string
-        Password   string
-        NickName   string
-        CreateTime gtime.Time
-    }
-    user := new(User)
-    err := db.Table("user").Where("id=1").Struct(user)
-    if err != nil {
-        gtest.Fatal(err)
-    }
-    gtest.Assert(user.NickName, "T111")
+    gtest.Case(t, func() {
+        type User struct {
+            Id         int
+            Passport   string
+            Password   string
+            NickName   string
+            CreateTime gtime.Time
+        }
+        user := new(User)
+        err := db.Table("user").Where("id=1").Struct(user)
+        if err != nil {
+            gtest.Fatal(err)
+        }
+        gtest.Assert(user.NickName,            "T111")
+        gtest.Assert(user.CreateTime.String(), "2018-10-10 00:01:10")
+    })
+    gtest.Case(t, func() {
+        type User struct {
+            Id         int
+            Passport   string
+            Password   string
+            NickName   string
+            CreateTime *gtime.Time
+        }
+        user := new(User)
+        err := db.Table("user").Where("id=1").Struct(user)
+        if err != nil {
+            gtest.Fatal(err)
+        }
+        gtest.Assert(user.NickName,            "T111")
+        gtest.Assert(user.CreateTime.String(), "2018-10-10 00:01:10")
+    })
+}
+
+func TestModel_Structs(t *testing.T) {
+    gtest.Case(t, func() {
+        type User struct {
+            Id         int
+            Passport   string
+            Password   string
+            NickName   string
+            CreateTime gtime.Time
+        }
+        var users []User
+        err := db.Table("user").OrderBy("id asc").Structs(&users)
+        if err != nil {
+            gtest.Fatal(err)
+        }
+        gtest.Assert(len(users),  3)
+        gtest.Assert(users[0].Id, 1)
+        gtest.Assert(users[1].Id, 2)
+        gtest.Assert(users[2].Id, 3)
+        gtest.Assert(users[0].NickName,            "T111")
+        gtest.Assert(users[1].NickName,            "T2")
+        gtest.Assert(users[2].NickName,            "T3")
+        gtest.Assert(users[0].CreateTime.String(), "2018-10-10 00:01:10")
+    })
+    gtest.Case(t, func() {
+        type User struct {
+            Id         int
+            Passport   string
+            Password   string
+            NickName   string
+            CreateTime *gtime.Time
+        }
+        var users []*User
+        err := db.Table("user").OrderBy("id asc").Structs(&users)
+        if err != nil {
+            gtest.Fatal(err)
+        }
+        gtest.Assert(len(users),  3)
+        gtest.Assert(users[0].Id, 1)
+        gtest.Assert(users[1].Id, 2)
+        gtest.Assert(users[2].Id, 3)
+        gtest.Assert(users[0].NickName,            "T111")
+        gtest.Assert(users[1].NickName,            "T2")
+        gtest.Assert(users[2].NickName,            "T3")
+        gtest.Assert(users[0].CreateTime.String(), "2018-10-10 00:01:10")
+    })
+}
+
+func TestModel_Scan(t *testing.T) {
+    gtest.Case(t, func() {
+        type User struct {
+            Id         int
+            Passport   string
+            Password   string
+            NickName   string
+            CreateTime gtime.Time
+        }
+        user := new(User)
+        err := db.Table("user").Where("id=1").Scan(user)
+        if err != nil {
+            gtest.Fatal(err)
+        }
+        gtest.Assert(user.NickName,            "T111")
+        gtest.Assert(user.CreateTime.String(), "2018-10-10 00:01:10")
+    })
+    gtest.Case(t, func() {
+        type User struct {
+            Id         int
+            Passport   string
+            Password   string
+            NickName   string
+            CreateTime *gtime.Time
+        }
+        user := new(User)
+        err := db.Table("user").Where("id=1").Scan(user)
+        if err != nil {
+            gtest.Fatal(err)
+        }
+        gtest.Assert(user.NickName,            "T111")
+        gtest.Assert(user.CreateTime.String(), "2018-10-10 00:01:10")
+    })
+    gtest.Case(t, func() {
+        type User struct {
+            Id         int
+            Passport   string
+            Password   string
+            NickName   string
+            CreateTime gtime.Time
+        }
+        var users []User
+        err := db.Table("user").OrderBy("id asc").Scan(&users)
+        if err != nil {
+            gtest.Fatal(err)
+        }
+        gtest.Assert(len(users),  3)
+        gtest.Assert(users[0].Id, 1)
+        gtest.Assert(users[1].Id, 2)
+        gtest.Assert(users[2].Id, 3)
+        gtest.Assert(users[0].NickName,            "T111")
+        gtest.Assert(users[1].NickName,            "T2")
+        gtest.Assert(users[2].NickName,            "T3")
+        gtest.Assert(users[0].CreateTime.String(), "2018-10-10 00:01:10")
+    })
+    gtest.Case(t, func() {
+        type User struct {
+            Id         int
+            Passport   string
+            Password   string
+            NickName   string
+            CreateTime *gtime.Time
+        }
+        var users []*User
+        err := db.Table("user").OrderBy("id asc").Scan(&users)
+        if err != nil {
+            gtest.Fatal(err)
+        }
+        gtest.Assert(len(users),  3)
+        gtest.Assert(users[0].Id, 1)
+        gtest.Assert(users[1].Id, 2)
+        gtest.Assert(users[2].Id, 3)
+        gtest.Assert(users[0].NickName,            "T111")
+        gtest.Assert(users[1].NickName,            "T2")
+        gtest.Assert(users[2].NickName,            "T3")
+        gtest.Assert(users[0].CreateTime.String(), "2018-10-10 00:01:10")
+    })
 }
 
 func TestModel_OrderBy(t *testing.T) {
@@ -255,19 +483,56 @@ func TestModel_GroupBy(t *testing.T) {
     gtest.Assert(result[0]["nickname"].String(), "T111")
 }
 
-// where string
-func TestModel_WhereString(t *testing.T) {
+func TestModel_Where(t *testing.T) {
+    // string
     gtest.Case(t, func() {
-        result, err := db.Table("user").Where("id=? and nickname=?", 3, "T3").One()
+       result, err := db.Table("user").Where("id=? and nickname=?", 3, "T3").One()
+       if err != nil {
+           gtest.Fatal(err)
+       }
+       gtest.AssertGT(len(result),      0)
+       gtest.Assert(result["id"].Int(), 3)
+    })
+    gtest.Case(t, func() {
+        result, err := db.Table("user").Where("id", 3).One()
+        if err != nil {
+           gtest.Fatal(err)
+        }
+        gtest.AssertGT(len(result),      0)
+        gtest.Assert(result["id"].Int(), 3)
+    })
+    gtest.Case(t, func() {
+        result, err := db.Table("user").Where("id", 3).Where("nickname", "T3").One()
         if err != nil {
             gtest.Fatal(err)
         }
         gtest.Assert(result["id"].Int(), 3)
     })
-}
-
-// where map
-func TestModel_WhereMap(t *testing.T) {
+    gtest.Case(t, func() {
+        result, err := db.Table("user").Where("id", 3).And("nickname", "T3").One()
+        if err != nil {
+            gtest.Fatal(err)
+        }
+        gtest.Assert(result["id"].Int(), 3)
+    })
+    gtest.Case(t, func() {
+        result, err := db.Table("user").Where("id", 30).Or("nickname", "T3").One()
+        if err != nil {
+            gtest.Fatal(err)
+        }
+        gtest.Assert(result["id"].Int(), 3)
+    })
+    gtest.Case(t, func() {
+        result, err := db.Table("user").Where("id", 30).Or("nickname", "T3").And("id>?", 1).One()
+        gtest.Assert(err,                nil)
+        gtest.Assert(result["id"].Int(), 3)
+    })
+    gtest.Case(t, func() {
+        result, err := db.Table("user").Where("id", 30).Or("nickname", "T3").And("id>", 1).One()
+        gtest.Assert(err,                nil)
+        gtest.Assert(result["id"].Int(), 3)
+    })
+    // map
     gtest.Case(t, func() {
         result, err := db.Table("user").Where(g.Map{"id" : 3, "nickname" : "T3"}).One()
         if err != nil {
@@ -275,10 +540,43 @@ func TestModel_WhereMap(t *testing.T) {
         }
         gtest.Assert(result["id"].Int(), 3)
     })
-}
-
-// where struct
-func TestModel_WhereStruct(t *testing.T) {
+    // map key operator
+    gtest.Case(t, func() {
+        result, err := db.Table("user").Where(g.Map{"id>" : 1, "id<" : 3}).One()
+        gtest.Assert(err,                nil)
+        gtest.Assert(result["id"].Int(), 2)
+    })
+    // complicated where 1
+    gtest.Case(t, func() {
+        //db.SetDebug(true)
+        conditions := g.Map{
+           "nickname like ?"      : "%T%",
+           "id between ? and ?"   : g.Slice{1,3},
+           "id > 0"               : nil,
+           "create_time > 0"      : nil,
+           "id"                   : g.Slice{1,2,3},
+        }
+        result, err := db.Table("user").Where(conditions).OrderBy("id asc").All()
+        gtest.Assert(err,                   nil)
+        gtest.Assert(len(result),           3)
+        gtest.Assert(result[0]["id"].Int(), 1)
+    })
+    // complicated where 2
+    gtest.Case(t, func() {
+        //db.SetDebug(true)
+        conditions := g.Map{
+            "nickname like ?"      : "%T%",
+            "id between ? and ?"   : g.Slice{1,3},
+            "id >= ?"              : 1,
+            "create_time > ?"      : 0,
+            "id in(?)"             : g.Slice{1,2,3},
+        }
+        result, err := db.Table("user").Where(conditions).OrderBy("id asc").All()
+        gtest.Assert(err,                   nil)
+        gtest.Assert(len(result),           3)
+        gtest.Assert(result[0]["id"].Int(), 1)
+    })
+    // struct
     gtest.Case(t, func() {
         type User struct {
             Id       int    `json:"id"`
@@ -296,27 +594,53 @@ func TestModel_WhereStruct(t *testing.T) {
         }
         gtest.Assert(result["id"].Int(), 3)
     })
-}
-
-// where slice
-func TestModel_WhereSlice1(t *testing.T) {
-    result, err := db.Table("user").Where("id IN(?)", g.Slice{1,3}).OrderBy("id ASC").All()
-    if err != nil {
-        gtest.Fatal(err)
-    }
-    gtest.Assert(len(result), 2)
-    gtest.Assert(result[0]["id"].Int(), 1)
-    gtest.Assert(result[1]["id"].Int(), 3)
-}
-
-// where slice
-func TestModel_WhereSlice2(t *testing.T) {
-    result, err := db.Table("user").Where("nickname=? AND id IN(?)", "T3", g.Slice{1,3}).OrderBy("id ASC").All()
-    if err != nil {
-        gtest.Fatal(err)
-    }
-    gtest.Assert(len(result), 1)
-    gtest.Assert(result[0]["id"].Int(), 3)
+    // slice single
+    gtest.Case(t, func() {
+        result, err := db.Table("user").Where("id IN(?)", g.Slice{1, 3}).OrderBy("id ASC").All()
+        if err != nil {
+            gtest.Fatal(err)
+        }
+        gtest.Assert(len(result), 2)
+        gtest.Assert(result[0]["id"].Int(), 1)
+        gtest.Assert(result[1]["id"].Int(), 3)
+    })
+    // slice + string
+    gtest.Case(t, func() {
+        result, err := db.Table("user").Where("nickname=? AND id IN(?)", "T3", g.Slice{1,3}).OrderBy("id ASC").All()
+        if err != nil {
+            gtest.Fatal(err)
+        }
+        gtest.Assert(len(result), 1)
+        gtest.Assert(result[0]["id"].Int(), 3)
+    })
+    // slice + map
+    gtest.Case(t, func() {
+        result, err := db.Table("user").Where(g.Map{
+            "id"       : g.Slice{1,3},
+            "nickname" : "T3",
+        }).OrderBy("id ASC").All()
+        if err != nil {
+            gtest.Fatal(err)
+        }
+        gtest.Assert(len(result), 1)
+        gtest.Assert(result[0]["id"].Int(), 3)
+    })
+    // slice + struct
+    gtest.Case(t, func() {
+        type User struct {
+            Ids      []int  `json:"id"`
+            Nickname string `gconv:"nickname"`
+        }
+        result, err := db.Table("user").Where(User{
+            Ids      : []int{1, 3},
+            Nickname : "T3",
+        }).OrderBy("id ASC").All()
+        if err != nil {
+            gtest.Fatal(err)
+        }
+        gtest.Assert(len(result), 1)
+        gtest.Assert(result[0]["id"].Int(), 3)
+    })
 }
 
 func TestModel_Delete(t *testing.T) {

g/database/gdb/gdb_unit_transaction_test.go

@@ -1,4 +1,8 @@
-// 事务操作
+// Copyright 2019 gf Author(https://github.com/gogf/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://github.com/gogf/gf.
 
 package gdb_test
 
@@ -267,6 +271,29 @@ func TestTX_Save(t *testing.T) {
     }
 }
 
+func TestTX_Update(t *testing.T) {
+    gtest.Case(t, func() {
+        tx, err := db.Begin()
+        if err != nil {
+            gtest.Fatal(err)
+        }
+        if result, err := db.Update("user", "create_time='2010-10-10 00:00:01'", "id=3"); err != nil {
+            gtest.Fatal(err)
+        } else {
+            n, _ := result.RowsAffected()
+            gtest.Assert(n, 1)
+        }
+        if err := tx.Commit(); err != nil {
+            gtest.Fatal(err)
+        }
+        if value, err := db.Table("user").Fields("create_time").Where("id", 3).Value(); err != nil {
+            gtest.Fatal(err)
+        } else {
+            gtest.Assert(value.String(), "2010-10-10 00:00:01")
+        }
+    })
+}
+
 func TestTX_GetAll(t *testing.T) {
     tx, err := db.Begin()
     if err != nil {
@@ -331,26 +358,215 @@ func TestTX_GetCount(t *testing.T) {
 }
 
 func TestTX_GetStruct(t *testing.T) {
-    tx, err := db.Begin()
-    if err != nil {
-        gtest.Fatal(err)
-    }
-    type User struct {
-        Id         int
-        Passport   string
-        Password   string
-        NickName   string
-        CreateTime gtime.Time
-    }
-    user := new(User)
-    if err := tx.GetStruct(user, "SELECT * FROM user WHERE id=?", 1); err != nil {
-        gtest.Fatal(err)
-    } else {
-        gtest.Assert(user.NickName, "T11")
-    }
-    if err := tx.Commit(); err != nil {
-        gtest.Fatal(err)
-    }
+    gtest.Case(t, func() {
+        tx, err := db.Begin()
+        if err != nil {
+            gtest.Fatal(err)
+        }
+        type User struct {
+            Id         int
+            Passport   string
+            Password   string
+            NickName   string
+            CreateTime gtime.Time
+        }
+        user := new(User)
+        if err := tx.GetStruct(user, "SELECT * FROM user WHERE id=?", 3); err != nil {
+            gtest.Fatal(err)
+        }
+        gtest.Assert(user.NickName,            "T3")
+        gtest.Assert(user.CreateTime.String(), "2010-10-10 00:00:01")
+        if err := tx.Commit(); err != nil {
+            gtest.Fatal(err)
+        }
+    })
+    gtest.Case(t, func() {
+        tx, err := db.Begin()
+        if err != nil {
+            gtest.Fatal(err)
+        }
+        type User struct {
+            Id         int
+            Passport   string
+            Password   string
+            NickName   string
+            CreateTime *gtime.Time
+        }
+        user := new(User)
+        if err := tx.GetStruct(user, "SELECT * FROM user WHERE id=?", 3); err != nil {
+            gtest.Fatal(err)
+        }
+        gtest.Assert(user.NickName,            "T3")
+        gtest.Assert(user.CreateTime.String(), "2010-10-10 00:00:01")
+        if err := tx.Commit(); err != nil {
+            gtest.Fatal(err)
+        }
+    })
+}
+
+func TestTX_GetStructs(t *testing.T) {
+    gtest.Case(t, func() {
+        tx, err := db.Begin()
+        if err != nil {
+            gtest.Fatal(err)
+        }
+        type User struct {
+            Id         int
+            Passport   string
+            Password   string
+            NickName   string
+            CreateTime gtime.Time
+        }
+        var users []User
+        if err := tx.GetStructs(&users, "SELECT * FROM user WHERE id>=?", 1); err != nil {
+            gtest.Fatal(err)
+        }
+        gtest.Assert(len(users),  4)
+        gtest.Assert(users[0].Id, 1)
+        gtest.Assert(users[1].Id, 2)
+        gtest.Assert(users[2].Id, 3)
+        gtest.Assert(users[0].NickName,            "T11")
+        gtest.Assert(users[1].NickName,            "T2")
+        gtest.Assert(users[2].NickName,            "T3")
+        gtest.Assert(users[2].CreateTime.String(), "2010-10-10 00:00:01")
+        if err := tx.Commit(); err != nil {
+            gtest.Fatal(err)
+        }
+    })
+
+    gtest.Case(t, func() {
+        tx, err := db.Begin()
+        if err != nil {
+            gtest.Fatal(err)
+        }
+        type User struct {
+            Id         int
+            Passport   string
+            Password   string
+            NickName   string
+            CreateTime *gtime.Time
+        }
+        var users []User
+        if err := tx.GetStructs(&users, "SELECT * FROM user WHERE id>=?", 1); err != nil {
+            gtest.Fatal(err)
+        }
+        gtest.Assert(len(users),  4)
+        gtest.Assert(users[0].Id, 1)
+        gtest.Assert(users[1].Id, 2)
+        gtest.Assert(users[2].Id, 3)
+        gtest.Assert(users[0].NickName,            "T11")
+        gtest.Assert(users[1].NickName,            "T2")
+        gtest.Assert(users[2].NickName,            "T3")
+        gtest.Assert(users[2].CreateTime.String(), "2010-10-10 00:00:01")
+        if err := tx.Commit(); err != nil {
+            gtest.Fatal(err)
+        }
+    })
+}
+
+func TestTX_GetScan(t *testing.T) {
+    gtest.Case(t, func() {
+        tx, err := db.Begin()
+        if err != nil {
+            gtest.Fatal(err)
+        }
+        type User struct {
+            Id         int
+            Passport   string
+            Password   string
+            NickName   string
+            CreateTime gtime.Time
+        }
+        user := new(User)
+        if err := tx.GetScan(user, "SELECT * FROM user WHERE id=?", 3); err != nil {
+            gtest.Fatal(err)
+        }
+        gtest.Assert(user.NickName,            "T3")
+        gtest.Assert(user.CreateTime.String(), "2010-10-10 00:00:01")
+        if err := tx.Commit(); err != nil {
+            gtest.Fatal(err)
+        }
+    })
+    gtest.Case(t, func() {
+        tx, err := db.Begin()
+        if err != nil {
+            gtest.Fatal(err)
+        }
+        type User struct {
+            Id         int
+            Passport   string
+            Password   string
+            NickName   string
+            CreateTime *gtime.Time
+        }
+        user := new(User)
+        if err := tx.GetScan(user, "SELECT * FROM user WHERE id=?", 3); err != nil {
+            gtest.Fatal(err)
+        }
+        gtest.Assert(user.NickName,            "T3")
+        gtest.Assert(user.CreateTime.String(), "2010-10-10 00:00:01")
+        if err := tx.Commit(); err != nil {
+            gtest.Fatal(err)
+        }
+    })
+
+    gtest.Case(t, func() {
+        tx, err := db.Begin()
+        if err != nil {
+            gtest.Fatal(err)
+        }
+        type User struct {
+            Id         int
+            Passport   string
+            Password   string
+            NickName   string
+            CreateTime gtime.Time
+        }
+        var users []User
+        if err := tx.GetScan(&users, "SELECT * FROM user WHERE id>=?", 1); err != nil {
+            gtest.Fatal(err)
+        }
+        gtest.Assert(len(users),  4)
+        gtest.Assert(users[0].Id, 1)
+        gtest.Assert(users[1].Id, 2)
+        gtest.Assert(users[2].Id, 3)
+        gtest.Assert(users[0].NickName,            "T11")
+        gtest.Assert(users[1].NickName,            "T2")
+        gtest.Assert(users[2].NickName,            "T3")
+        gtest.Assert(users[2].CreateTime.String(), "2010-10-10 00:00:01")
+        if err := tx.Commit(); err != nil {
+            gtest.Fatal(err)
+        }
+    })
+
+    gtest.Case(t, func() {
+        tx, err := db.Begin()
+        if err != nil {
+            gtest.Fatal(err)
+        }
+        type User struct {
+            Id         int
+            Passport   string
+            Password   string
+            NickName   string
+            CreateTime *gtime.Time
+        }
+        var users []User
+        if err := tx.GetScan(&users, "SELECT * FROM user WHERE id>=?", 1); err != nil {
+            gtest.Fatal(err)
+        }
+        gtest.Assert(len(users),  4)
+        gtest.Assert(users[0].Id, 1)
+        gtest.Assert(users[1].Id, 2)
+        gtest.Assert(users[2].Id, 3)
+        gtest.Assert(users[0].NickName,            "T11")
+        gtest.Assert(users[1].NickName,            "T2")
+        gtest.Assert(users[2].NickName,            "T3")
+        gtest.Assert(users[2].CreateTime.String(), "2010-10-10 00:00:01")
+        if err := tx.Commit(); err != nil {
+            gtest.Fatal(err)
+        }
+    })
 }
 
 func TestTX_Delete(t *testing.T) {

g/database/gredis/gredis.go

@@ -4,37 +4,45 @@
 // If a copy of the MIT was not distributed with this file,
 // You can obtain one at https://github.com/gogf/gf.
 
-// Package gredis provides client for redis server.
+// Package gredis provides convenient client for redis server.
 //
 // Redis客户端.
-// Redis中文手册文档请参考：http://redisdoc.com/ , Redis官方命令请参考：https://redis.io/commands
+// Redis中文手册请参考：http://redisdoc.com/
+// Redis官方命令请参考：https://redis.io/commands
 package gredis
 
 import (
-    "time"
-    "github.com/gogf/gf/third/github.com/gomodule/redigo/redis"
-    "github.com/gogf/gf/g/container/gmap"
     "fmt"
+    "github.com/gogf/gf/g/container/gmap"
+    "github.com/gogf/gf/third/github.com/gomodule/redigo/redis"
+    "time"
 )
 
 const (
-    gDEFAULT_POOL_MAX_IDLE      = 1
-    gDEFAULT_POOL_MAX_ACTIVE    = 10
-    gDEFAULT_POOL_IDLE_TIMEOUT  = 180 * time.Second
-    gDEFAULT_POOL_MAX_LIFE_TIME = 60  * time.Second
+    gDEFAULT_POOL_IDLE_TIMEOUT  = 60 * time.Second
+    gDEFAULT_POOL_MAX_LIFE_TIME = 60 * time.Second
 )
 
-// Redis客户端
+// Redis客户端(管理连接池)
 type Redis struct {
-    pool *redis.Pool
+    pool   *redis.Pool // 底层连接池
+    group  string      // 配置分组
+    config Config      // 配置对象
 }
 
+// Redis连接对象(连接池中的单个连接)
+type Conn redis.Conn
+
 // Redis服务端但节点连接配置信息
 type Config struct {
-    Host string // IP/域名
-    Port int    // 端口
-    Db   int    // db
-    Pass string // 密码
+    Host            string        // 地址
+    Port            int           // 端口
+    Db              int           // 数据库
+    Pass            string        // 授权密码
+    MaxIdle         int           // 最大允许空闲存在的连接数(默认为0表示不存在闲置连接)
+    MaxActive       int           // 最大连接数量限制(默认为0表示不限制)
+    IdleTimeout     time.Duration // 连接最大空闲时间(默认为60秒,不允许设置为0)
+    MaxConnLifetime time.Duration // 连接最长存活时间(默认为60秒,不允许设置为0)
 }
 
 // Redis链接池统计信息
@@ -42,91 +50,160 @@ type PoolStats struct {
     redis.PoolStats
 }
 
-// 连接池map
-var pools = gmap.NewStringInterfaceMap()
+var (
+    // 单例对象Map
+    instances = gmap.NewStringInterfaceMap()
+    // 连接池Map
+    pools     = gmap.NewStringInterfaceMap()
+)
 
-// 创建redis操作对象.
+// New creates a redis client object with given configuration.
+// Redis client maintains a connection pool automatically.
+//
+// 创建redis操作对象，底层根据配置信息公用的连接池（连接池单例）。
 func New(config Config) *Redis {
-    r       := &Redis{}
-    poolKey := fmt.Sprintf("%s:%d,%d", config.Host, config.Port, config.Db)
-    if v := pools.Get(poolKey); v == nil {
-        pool := &redis.Pool {
-            MaxIdle         : gDEFAULT_POOL_MAX_IDLE,
-            MaxActive       : gDEFAULT_POOL_MAX_ACTIVE,
-            IdleTimeout     : gDEFAULT_POOL_IDLE_TIMEOUT,
-            MaxConnLifetime : gDEFAULT_POOL_MAX_LIFE_TIME,
-            Dial            : func() (redis.Conn, error) {
-                c, err := redis.Dial("tcp", fmt.Sprintf("%s:%d", config.Host, config.Port))
-                if err != nil {
-                    return nil, err
-                }
-                if len(config.Pass) > 0 {
-                    if _, err := c.Do("AUTH", config.Pass); err != nil {
+    if config.IdleTimeout == 0 {
+        config.IdleTimeout = gDEFAULT_POOL_IDLE_TIMEOUT
+    }
+    if config.MaxConnLifetime == 0 {
+        config.MaxConnLifetime = gDEFAULT_POOL_MAX_LIFE_TIME
+    }
+    return &Redis{
+        config : config,
+        pool   : pools.GetOrSetFuncLock(fmt.Sprintf("%v", config), func() interface{} {
+            return &redis.Pool {
+                IdleTimeout     : config.IdleTimeout,
+                MaxConnLifetime : config.MaxConnLifetime,
+                Dial            : func() (redis.Conn, error) {
+                    c, err := redis.Dial("tcp", fmt.Sprintf("%s:%d", config.Host, config.Port))
+                    if err != nil {
                         return nil, err
                     }
-                }
-                if _, err := c.Do("SELECT", config.Db); err != nil {
-                    return nil, err
-                }
-                return c, nil
-            },
-            // 用来测试连接是否可用
-            TestOnBorrow: func(c redis.Conn, t time.Time) error {
-			    _, err := c.Do("PING")
-			    return err
-		    },
-        }
-        pools.Set(poolKey, pool)
-        r.pool = pool
-    } else {
-        r.pool = v.(*redis.Pool)
+                    // 密码设置
+                    if len(config.Pass) > 0 {
+                        if _, err := c.Do("AUTH", config.Pass); err != nil {
+                            return nil, err
+                        }
+                    }
+                    // 数据库设置
+                    if _, err := c.Do("SELECT", config.Db); err != nil {
+                        return nil, err
+                    }
+                    return c, nil
+                },
+                // 在被应用从连接池中获取出来之后，用以测试连接是否可用，
+                // 如果返回error那么关闭该连接对象重新创建新的连接。
+                TestOnBorrow: func(c redis.Conn, t time.Time) error {
+                    _, err := c.Do("PING")
+                    return err
+                },
+            }
+        }).(*redis.Pool),
     }
-    return r
 }
 
-// 关闭redis管理对象，将会关闭底层的
+// Instance returns an instance of redis client with specified group.
+// The <group> param is unnecessary, if <group> is not passed,
+// return redis instance with default group.
+//
+// 获取指定分组名称的Redis单例对象，底层根据配置信息公用的连接池（连接池单例）。
+func Instance(name ...string) *Redis {
+    group := DEFAULT_GROUP_NAME
+    if len(name) > 0 {
+        group = name[0]
+    }
+    v := instances.GetOrSetFuncLock(group, func() interface{} {
+        if config, ok := GetConfig(group); ok {
+            r      := New(config)
+            r.group = group
+            return r
+        }
+        return nil
+    })
+    if v != nil {
+        return v.(*Redis)
+    }
+    return nil
+}
+
+// Close closes the redis connection pool,
+// it will release all connections reserved by this pool.
+// It always not necessary to call Close manually.
+//
+// 关闭redis管理对象，将会关闭底层的连接池。
+// 往往没必要手动调用，跟随进程销毁即可。
 func (r *Redis) Close() error {
+    if r.group != "" {
+        // 如果是单例对象，那么需要从单例对象Map中删除
+        instances.Remove(r.group)
+    }
+    pools.Remove(fmt.Sprintf("%v", r.config))
     return r.pool.Close()
 }
 
-// 获得一个原生的redis连接对象，用于自定义连接操作，
-// 但是需要注意的是如果不再使用该连接对象时，需要手动Close连接，否则会造成连接数超限。
-func (r *Redis) GetConn() redis.Conn {
-    return r.pool.Get()
+// See GetConn.
+func (r *Redis) Conn() Conn {
+    return r.GetConn()
 }
 
+// GetConn returns a raw connection object,
+// which expose more methods communication with server.
+// **You should call Close function manually if you do not use this connection any further.**
+//
+// 获得一个原生的redis连接对象，用于自定义连接操作，
+// 但是需要注意的是如果不再使用该连接对象时，需要手动Close连接，否则会造成连接数超限。
+func (r *Redis) GetConn() Conn {
+    return r.pool.Get().(Conn)
+}
+
+// SetMaxIdle sets the MaxIdle attribute of the connection pool.
+//
 // 设置属性 - MaxIdle
 func (r *Redis) SetMaxIdle(value int) {
     r.pool.MaxIdle = value
 }
 
+// SetMaxIdle sets the MaxActive attribute of the connection pool.
+//
 // 设置属性 - MaxActive
 func (r *Redis) SetMaxActive(value int) {
     r.pool.MaxActive = value
 }
 
+// SetMaxIdle sets the IdleTimeout attribute of the connection pool.
+//
 // 设置属性 - IdleTimeout
 func (r *Redis) SetIdleTimeout(value time.Duration) {
     r.pool.IdleTimeout = value
 }
 
+// SetMaxIdle sets the MaxConnLifetime attribute of the connection pool.
+//
 // 设置属性 - MaxConnLifetime
 func (r *Redis) SetMaxConnLifetime(value time.Duration) {
     r.pool.MaxConnLifetime = value
 }
 
-// 获取当前连接池统计信息
+// Stats returns pool's statistics.
+//
+// 获取当前连接池统计信息。
 func (r *Redis) Stats() *PoolStats {
     return &PoolStats{r.pool.Stats()}
 }
 
-// 执行同步命令 - Do
+// Do sends a command to the server and returns the received reply.
+// Do automatically get a connection from pool, and close it when reply received.
+//
+// 执行同步命令，自动从连接池中获取连接，使用完毕后关闭连接（丢回连接池），开发者不用自行Close.
 func (r *Redis) Do(command string, args ...interface{}) (interface{}, error) {
     conn := r.pool.Get()
     defer conn.Close()
     return conn.Do(command, args...)
 }
 
+// Deprecated.
+// Send writes the command to the client's output buffer.
+//
 // 执行异步命令 - Send
 func (r *Redis) Send(command string, args ...interface{}) error {
     conn := r.pool.Get()

g/database/gredis/gredis_config.go

@@ -0,0 +1,61 @@
+// Copyright 2019 gf Author(https://github.com/gogf/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://github.com/gogf/gf.
+
+package gredis
+
+import "github.com/gogf/gf/g/container/gmap"
+
+const (
+    // Default configuration group name.
+    DEFAULT_GROUP_NAME = "default"
+)
+var (
+    // Configuration groups.
+    configs = gmap.NewStringInterfaceMap()
+)
+
+// SetConfig sets the global configuration for specified group.
+// If <name> is not passed, it sets configuration for the default group name.
+func SetConfig(config Config, name...string) {
+    group := DEFAULT_GROUP_NAME
+    if len(name) > 0 {
+        group = name[0]
+    }
+    configs.Set(group, config)
+    instances.Remove(group)
+}
+
+// GetConfig returns the global configuration with specified group name.
+// If <name> is not passed, it returns configuration of the default group name.
+func GetConfig(name...string) (config Config, ok bool) {
+    group := DEFAULT_GROUP_NAME
+    if len(name) > 0 {
+        group = name[0]
+    }
+    if v := configs.Get(group); v != nil {
+        return v.(Config), true
+    }
+    return Config{}, false
+}
+
+// RemoveConfig removes the global configuration with specified group.
+// If <name> is not passed, it removes configuration of the default group name.
+func RemoveConfig(name...string) {
+    group := DEFAULT_GROUP_NAME
+    if len(name) > 0 {
+        group = name[0]
+    }
+    configs.Remove(group)
+    instances.Remove(group)
+}
+
+// ClearConfig removes all configurations and instances of redis.
+func ClearConfig() {
+    configs.Clear()
+    instances.Clear()
+}
+
+

g/database/gredis/gredis_unit_test.go

@@ -0,0 +1,139 @@
+// Copyright 2019 gf Author(https://github.com/gogf/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://github.com/gogf/gf.
+
+package gredis_test
+
+import (
+    "github.com/gogf/gf/g/database/gredis"
+    "github.com/gogf/gf/g/test/gtest"
+    "testing"
+    "time"
+)
+
+var (
+    config = gredis.Config{
+        Host : "127.0.0.1",
+        Port : 6379,
+        Db   : 1,
+    }
+)
+
+func Test_NewClose(t *testing.T) {
+    gtest.Case(t, func() {
+        redis := gredis.New(config)
+        gtest.AssertNE(redis, nil)
+        err := redis.Close()
+        gtest.Assert(err, nil)
+    })
+}
+
+func Test_Do(t *testing.T) {
+    gtest.Case(t, func() {
+        redis := gredis.New(config)
+        defer redis.Close()
+        _, err := redis.Do("SET", "k", "v")
+        gtest.Assert(err, nil)
+
+        r, err := redis.Do("GET", "k")
+        gtest.Assert(err, nil)
+        gtest.Assert(r, []byte("v"))
+
+        _, err  = redis.Do("DEL", "k")
+        gtest.Assert(err, nil)
+        r, err  = redis.Do("GET", "k")
+        gtest.Assert(err, nil)
+        gtest.Assert(r, nil)
+    })
+}
+
+func Test_Send(t *testing.T) {
+    gtest.Case(t, func() {
+        redis := gredis.New(config)
+        defer redis.Close()
+        err := redis.Send("SET", "k", "v")
+        gtest.Assert(err, nil)
+
+        r, err := redis.Do("GET", "k")
+        gtest.Assert(err, nil)
+        gtest.Assert(r,   []byte("v"))
+    })
+}
+
+func Test_Stats(t *testing.T) {
+    gtest.Case(t, func() {
+        redis := gredis.New(config)
+        defer redis.Close()
+        redis.SetMaxIdle(2)
+        redis.SetMaxActive(100)
+        redis.SetIdleTimeout(500*time.Millisecond)
+        redis.SetMaxConnLifetime(500*time.Millisecond)
+
+        array := make([]gredis.Conn, 0)
+        for i := 0; i < 10; i++ {
+            array = append(array, redis.Conn())
+        }
+        stats := redis.Stats()
+        gtest.Assert(stats.ActiveCount, 10)
+        gtest.Assert(stats.IdleCount,    0)
+        for i := 0; i < 10; i++ {
+            array[i].Close()
+        }
+        stats  = redis.Stats()
+        gtest.Assert(stats.ActiveCount,  2)
+        gtest.Assert(stats.IdleCount,    2)
+        //time.Sleep(3000*time.Millisecond)
+        //stats  = redis.Stats()
+        //fmt.Println(stats)
+        //gtest.Assert(stats.ActiveCount,  0)
+        //gtest.Assert(stats.IdleCount,    0)
+    })
+}
+
+func Test_Conn(t *testing.T) {
+    gtest.Case(t, func() {
+        redis := gredis.New(config)
+        defer redis.Close()
+        conn := redis.Conn()
+        defer conn.Close()
+
+
+        r, err := conn.Do("GET", "k")
+        gtest.Assert(err, nil)
+        gtest.Assert(r,   []byte("v"))
+
+        _, err  = conn.Do("DEL", "k")
+        gtest.Assert(err, nil)
+        r, err  = conn.Do("GET", "k")
+        gtest.Assert(err, nil)
+        gtest.Assert(r, nil)
+    })
+}
+
+func Test_Instance(t *testing.T) {
+    gtest.Case(t, func() {
+        group := "my-test"
+        gredis.SetConfig(config, group)
+        defer gredis.RemoveConfig(group)
+        redis := gredis.Instance(group)
+        defer redis.Close()
+
+        conn := redis.Conn()
+        defer conn.Close()
+
+        _, err := conn.Do("SET", "k", "v")
+        gtest.Assert(err, nil)
+
+        r, err := conn.Do("GET", "k")
+        gtest.Assert(err, nil)
+        gtest.Assert(r,   []byte("v"))
+
+        _, err  = conn.Do("DEL", "k")
+        gtest.Assert(err, nil)
+        r, err  = conn.Do("GET", "k")
+        gtest.Assert(err, nil)
+        gtest.Assert(r, nil)
+    })
+}

g/encoding/encoding.go

@@ -1,7 +0,0 @@
-// Copyright 2017 gf Author(https://github.com/gogf/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://github.com/gogf/gf.
-
-package encoding

g/encoding/gbase64/gbase64_test.go

@@ -0,0 +1,51 @@
+// Copyright 2017 gf Author(https://github.com/gogf/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://github.com/gogf/gf.
+package gbase64_test
+
+import (
+	"github.com/gogf/gf/g/encoding/gbase64"
+	"github.com/gogf/gf/g/test/gtest"
+	"testing"
+)
+
+type testpair struct {
+	decoded, encoded string
+}
+
+var pairs = []testpair{
+	// RFC 3548 examples
+	{"\x14\xfb\x9c\x03\xd9\x7e", "FPucA9l+"},
+	{"\x14\xfb\x9c\x03\xd9", "FPucA9k="},
+	{"\x14\xfb\x9c\x03", "FPucAw=="},
+
+	// RFC 4648 examples
+	{"", ""},
+	{"f", "Zg=="},
+	{"fo", "Zm8="},
+	{"foo", "Zm9v"},
+	{"foob", "Zm9vYg=="},
+	{"fooba", "Zm9vYmE="},
+	{"foobar", "Zm9vYmFy"},
+
+	// Wikipedia examples
+	{"sure.", "c3VyZS4="},
+	{"sure", "c3VyZQ=="},
+	{"sur", "c3Vy"},
+	{"su", "c3U="},
+	{"leasure.", "bGVhc3VyZS4="},
+	{"easure.", "ZWFzdXJlLg=="},
+	{"asure.", "YXN1cmUu"},
+	{"sure.", "c3VyZS4="},
+}
+
+func TestBase64(t *testing.T) {
+	for k := range pairs{
+		gtest.Assert(gbase64.Encode(pairs[k].decoded), pairs[k].encoded)
+
+		e, _ := gbase64.Decode(pairs[k].encoded)
+		gtest.Assert(e, pairs[k].decoded)
+	}
+}

g/encoding/gbinary/gbinary.go

@@ -5,13 +5,15 @@
 // You can obtain one at https://github.com/gogf/gf.
 
 // Package gbinary provides useful API for handling binary/bytes data.
+//
+// 注意gbinary模块统一使用LittleEndian进行编码。
 package gbinary
 
 import (
-    "fmt"
-    "math"
-    "bytes"
-    "encoding/binary"
+	"fmt"
+	"math"
+	"bytes"
+	"encoding/binary"
 )
 
 // 二进制位(0|1)
@@ -20,304 +22,308 @@ type Bit int8
 // 针对基本类型进行二进制打包，支持的基本数据类型包括:int/8/16/32/64、uint/8/16/32/64、float32/64、bool、string、[]byte
 // 其他未知类型使用 fmt.Sprintf("%v", value) 转换为字符串之后处理
 func Encode(vs ...interface{}) []byte {
-    buf := new(bytes.Buffer)
-    for i := 0; i < len(vs); i++ {
-        switch value := vs[i].(type) {
-            case int:     buf.Write(EncodeInt(value))
-            case int8:    buf.Write(EncodeInt8(value))
-            case int16:   buf.Write(EncodeInt16(value))
-            case int32:   buf.Write(EncodeInt32(value))
-            case int64:   buf.Write(EncodeInt64(value))
-            case uint:    buf.Write(EncodeUint(value))
-            case uint8:   buf.Write(EncodeUint8(value))
-            case uint16:  buf.Write(EncodeUint16(value))
-            case uint32:  buf.Write(EncodeUint32(value))
-            case uint64:  buf.Write(EncodeUint64(value))
-            case bool:    buf.Write(EncodeBool(value))
-            case string:  buf.Write(EncodeString(value))
-            case []byte:  buf.Write(value)
-            case float32: buf.Write(EncodeFloat32(value))
-            case float64: buf.Write(EncodeFloat64(value))
-            default:
-                if err := binary.Write(buf, binary.LittleEndian, value); err != nil {
-                    buf.Write(EncodeString(fmt.Sprintf("%v", value)))
-                }
-        }
-    }
-    return buf.Bytes()
+	buf := new(bytes.Buffer)
+	for i := 0; i < len(vs); i++ {
+		if vs[i] == nil {
+			return buf.Bytes()
+		}
+
+		switch value := vs[i].(type) {
+		case int:     buf.Write(EncodeInt(value))
+		case int8:    buf.Write(EncodeInt8(value))
+		case int16:   buf.Write(EncodeInt16(value))
+		case int32:   buf.Write(EncodeInt32(value))
+		case int64:   buf.Write(EncodeInt64(value))
+		case uint:    buf.Write(EncodeUint(value))
+		case uint8:   buf.Write(EncodeUint8(value))
+		case uint16:  buf.Write(EncodeUint16(value))
+		case uint32:  buf.Write(EncodeUint32(value))
+		case uint64:  buf.Write(EncodeUint64(value))
+		case bool:    buf.Write(EncodeBool(value))
+		case string:  buf.Write(EncodeString(value))
+		case []byte:  buf.Write(value)
+		case float32: buf.Write(EncodeFloat32(value))
+		case float64: buf.Write(EncodeFloat64(value))
+		default:
+			if err := binary.Write(buf, binary.LittleEndian, value); err != nil {
+				buf.Write(EncodeString(fmt.Sprintf("%v", value)))
+			}
+		}
+	}
+	return buf.Bytes()
 }
 
 // 将变量转换为二进制[]byte，并指定固定的[]byte长度返回，长度单位为字节(byte)；
 // 如果转换的二进制长度超过指定长度，那么进行截断处理
 func EncodeByLength(length int, vs ...interface{}) []byte {
-    b := Encode(vs...)
-    if len(b) < length {
-        b = append(b, make([]byte, length - len(b))...)
-    } else if len(b) > length {
-        b = b[0 : length]
-    }
-    return b
+	b := Encode(vs...)
+	if len(b) < length {
+		b = append(b, make([]byte, length - len(b))...)
+	} else if len(b) > length {
+		b = b[0 : length]
+	}
+	return b
 }
 
 // 整形二进制解包，注意第二个及其后参数为字长确定的整形变量的指针地址，以便确定解析的[]byte长度，
 // 例如：int8/16/32/64、uint8/16/32/64、float32/64等等
 func Decode(b []byte, vs ...interface{}) error {
-    buf := bytes.NewBuffer(b)
-    for i := 0; i < len(vs); i++ {
-        err := binary.Read(buf, binary.LittleEndian, vs[i])
-        if err != nil {
-            return err
-        }
-    }
-    return nil
+	buf := bytes.NewBuffer(b)
+	for i := 0; i < len(vs); i++ {
+		err := binary.Read(buf, binary.LittleEndian, vs[i])
+		if err != nil {
+			return err
+		}
+	}
+	return nil
 }
 
 func EncodeString(s string) []byte {
-    return []byte(s)
+	return []byte(s)
 }
 
 func DecodeToString(b []byte) string {
-    return string(b)
+	return string(b)
 }
 
 func EncodeBool(b bool) []byte {
-    if b == true {
-        return []byte{1}
-    } else {
-        return []byte{0}
-    }
+	if b == true {
+		return []byte{1}
+	} else {
+		return []byte{0}
+	}
 }
 
 // 自动识别int类型长度，转换为[]byte
 func EncodeInt(i int) []byte {
-    if i <= math.MaxInt8 {
-        return EncodeInt8(int8(i))
-    } else if i <= math.MaxInt16 {
-        return EncodeInt16(int16(i))
-    } else if i <= math.MaxInt32 {
-        return EncodeInt32(int32(i))
-    } else {
-        return EncodeInt64(int64(i))
-    }
+	if i <= math.MaxInt8 {
+		return EncodeInt8(int8(i))
+	} else if i <= math.MaxInt16 {
+		return EncodeInt16(int16(i))
+	} else if i <= math.MaxInt32 {
+		return EncodeInt32(int32(i))
+	} else {
+		return EncodeInt64(int64(i))
+	}
 }
 
 // 自动识别uint类型长度，转换为[]byte
 func EncodeUint(i uint) []byte {
-    if i <= math.MaxUint8 {
-        return EncodeUint8(uint8(i))
-    } else if i <= math.MaxUint16 {
-        return EncodeUint16(uint16(i))
-    } else if i <= math.MaxUint32 {
-        return EncodeUint32(uint32(i))
-    } else {
-        return EncodeUint64(uint64(i))
-    }
+	if i <= math.MaxUint8 {
+		return EncodeUint8(uint8(i))
+	} else if i <= math.MaxUint16 {
+		return EncodeUint16(uint16(i))
+	} else if i <= math.MaxUint32 {
+		return EncodeUint32(uint32(i))
+	} else {
+		return EncodeUint64(uint64(i))
+	}
 }
 
 func EncodeInt8(i int8) []byte {
-    return []byte{byte(i)}
+	return []byte{byte(i)}
 }
 
 func EncodeUint8(i uint8) []byte {
-    return []byte{byte(i)}
+	return []byte{byte(i)}
 }
 
 func EncodeInt16(i int16) []byte {
-    bytes := make([]byte, 2)
-    binary.LittleEndian.PutUint16(bytes, uint16(i))
-    return bytes
+	bytes := make([]byte, 2)
+	binary.LittleEndian.PutUint16(bytes, uint16(i))
+	return bytes
 }
 
 func EncodeUint16(i uint16) []byte {
-    bytes := make([]byte, 2)
-    binary.LittleEndian.PutUint16(bytes, i)
-    return bytes
+	bytes := make([]byte, 2)
+	binary.LittleEndian.PutUint16(bytes, i)
+	return bytes
 }
 
 func EncodeInt32(i int32) []byte {
-    bytes := make([]byte, 4)
-    binary.LittleEndian.PutUint32(bytes, uint32(i))
-    return bytes
+	bytes := make([]byte, 4)
+	binary.LittleEndian.PutUint32(bytes, uint32(i))
+	return bytes
 }
 
 func EncodeUint32(i uint32) []byte {
-    bytes := make([]byte, 4)
-    binary.LittleEndian.PutUint32(bytes, i)
-    return bytes
+	bytes := make([]byte, 4)
+	binary.LittleEndian.PutUint32(bytes, i)
+	return bytes
 }
 
 func EncodeInt64(i int64) []byte {
-    bytes := make([]byte, 8)
-    binary.LittleEndian.PutUint64(bytes, uint64(i))
-    return bytes
+	bytes := make([]byte, 8)
+	binary.LittleEndian.PutUint64(bytes, uint64(i))
+	return bytes
 }
 
 func EncodeUint64(i uint64) []byte {
-    bytes := make([]byte, 8)
-    binary.LittleEndian.PutUint64(bytes, i)
-    return bytes
+	bytes := make([]byte, 8)
+	binary.LittleEndian.PutUint64(bytes, i)
+	return bytes
 }
 
 func EncodeFloat32(f float32) []byte {
-    bits  := math.Float32bits(f)
-    bytes := make([]byte, 4)
-    binary.LittleEndian.PutUint32(bytes, bits)
-    return bytes
+	bits  := math.Float32bits(f)
+	bytes := make([]byte, 4)
+	binary.LittleEndian.PutUint32(bytes, bits)
+	return bytes
 }
 
 func EncodeFloat64(f float64) []byte {
-    bits  := math.Float64bits(f)
-    bytes := make([]byte, 8)
-    binary.LittleEndian.PutUint64(bytes, bits)
-    return bytes
+	bits  := math.Float64bits(f)
+	bytes := make([]byte, 8)
+	binary.LittleEndian.PutUint64(bytes, bits)
+	return bytes
 }
 
 // 当b位数不够时，进行高位补0
 func fillUpSize(b []byte, l int) []byte {
-    if len(b) >= l {
-        return b
-    }
-    c := make([]byte, 0)
-    c  = append(c, b...)
-    for i := 0; i < l - len(b); i++ {
-        c = append(c, 0x00)
-    }
-    return c
+	if len(b) >= l {
+		return b
+	}
+	c := make([]byte, 0)
+	c  = append(c, b...)
+	for i := 0; i < l - len(b); i++ {
+		c = append(c, 0x00)
+	}
+	return c
 }
 
 // 将二进制解析为int类型，根据[]byte的长度进行自动转换.
 // 注意内部使用的是uint*，使用int会造成位丢失。
 func DecodeToInt(b []byte) int {
-    if len(b) < 2 {
-        return int(DecodeToUint8(b))
-    } else if len(b) < 3 {
-        return int(DecodeToUint16(b))
-    } else if len(b) < 5 {
-        return int(DecodeToUint32(b))
-    } else {
-        return int(DecodeToUint64(b))
-    }
+	if len(b) < 2 {
+		return int(DecodeToUint8(b))
+	} else if len(b) < 3 {
+		return int(DecodeToUint16(b))
+	} else if len(b) < 5 {
+		return int(DecodeToUint32(b))
+	} else {
+		return int(DecodeToUint64(b))
+	}
 }
 
 // 将二进制解析为uint类型，根据[]byte的长度进行自动转换
 func DecodeToUint(b []byte) uint {
-    if len(b) < 2 {
-        return uint(DecodeToUint8(b))
-    } else if len(b) < 3 {
-        return uint(DecodeToUint16(b))
-    } else if len(b) < 5 {
-        return uint(DecodeToUint32(b))
-    } else {
-        return uint(DecodeToUint64(b))
-    }
+	if len(b) < 2 {
+		return uint(DecodeToUint8(b))
+	} else if len(b) < 3 {
+		return uint(DecodeToUint16(b))
+	} else if len(b) < 5 {
+		return uint(DecodeToUint32(b))
+	} else {
+		return uint(DecodeToUint64(b))
+	}
 }
 
 // 将二进制解析为bool类型，识别标准是判断二进制中数值是否都为0，或者为空
 func DecodeToBool(b []byte) bool {
-    if len(b) == 0 {
-        return false
-    }
-    if bytes.Compare(b, make([]byte, len(b))) == 0 {
-        return false
-    }
-    return true
+	if len(b) == 0 {
+		return false
+	}
+	if bytes.Compare(b, make([]byte, len(b))) == 0 {
+		return false
+	}
+	return true
 }
 
 func DecodeToInt8(b []byte) int8 {
-    return int8(b[0])
+	return int8(b[0])
 }
 
 func DecodeToUint8(b []byte) uint8 {
-    return uint8(b[0])
+	return uint8(b[0])
 }
 
 func DecodeToInt16(b []byte) int16 {
-    return int16(binary.LittleEndian.Uint16(fillUpSize(b, 2)))
+	return int16(binary.LittleEndian.Uint16(fillUpSize(b, 2)))
 }
 
 func DecodeToUint16(b []byte) uint16 {
-    return binary.LittleEndian.Uint16(fillUpSize(b, 2))
+	return binary.LittleEndian.Uint16(fillUpSize(b, 2))
 }
 
 func DecodeToInt32(b []byte) int32 {
-    return int32(binary.LittleEndian.Uint32(fillUpSize(b, 4)))
+	return int32(binary.LittleEndian.Uint32(fillUpSize(b, 4)))
 }
 
 func DecodeToUint32(b []byte) uint32 {
-    return binary.LittleEndian.Uint32(fillUpSize(b, 4))
+	return binary.LittleEndian.Uint32(fillUpSize(b, 4))
 }
 
 func DecodeToInt64(b []byte) int64 {
-    return int64(binary.LittleEndian.Uint64(fillUpSize(b, 8)))
+	return int64(binary.LittleEndian.Uint64(fillUpSize(b, 8)))
 }
 
 func DecodeToUint64(b []byte) uint64 {
-    return binary.LittleEndian.Uint64(fillUpSize(b, 8))
+	return binary.LittleEndian.Uint64(fillUpSize(b, 8))
 }
 
 func DecodeToFloat32(b []byte) float32 {
-    return math.Float32frombits(binary.LittleEndian.Uint32(fillUpSize(b, 4)))
+	return math.Float32frombits(binary.LittleEndian.Uint32(fillUpSize(b, 4)))
 }
 
 func DecodeToFloat64(b []byte) float64 {
-    return math.Float64frombits(binary.LittleEndian.Uint64(fillUpSize(b, 8)))
+	return math.Float64frombits(binary.LittleEndian.Uint64(fillUpSize(b, 8)))
 }
 
 // 默认编码
 func EncodeBits(bits []Bit, i int, l int) []Bit {
-    return EncodeBitsWithUint(bits, uint(i), l)
+	return EncodeBitsWithUint(bits, uint(i), l)
 }
 
 // 将ui按位合并到bits数组中，并占length长度位(注意：uis数组中存放的是二进制的0|1数字)
 func EncodeBitsWithUint(bits []Bit, ui uint, l int) []Bit {
-    a := make([]Bit, l)
-    for i := l - 1; i >= 0; i-- {
-        a[i] = Bit(ui & 1)
-        ui >>= 1
-    }
-    if bits != nil {
-        return append(bits, a...)
-    } else {
-        return a
-    }
+	a := make([]Bit, l)
+	for i := l - 1; i >= 0; i-- {
+		a[i] = Bit(ui & 1)
+		ui >>= 1
+	}
+	if bits != nil {
+		return append(bits, a...)
+	} else {
+		return a
+	}
 }
 // 将bits转换为[]byte，从左至右进行编码，不足1 byte按0往末尾补充
 func EncodeBitsToBytes(bits []Bit) []byte {
-    if len(bits)%8 != 0 {
-        for i := 0; i < len(bits)%8; i++ {
-            bits = append(bits, 0)
-        }
-    }
-    b := make([]byte, 0)
-    for i := 0; i < len(bits); i += 8 {
-        b = append(b, byte(DecodeBitsToUint(bits[i : i + 8])))
-    }
-    return b
+	if len(bits)%8 != 0 {
+		for i := 0; i < len(bits)%8; i++ {
+			bits = append(bits, 0)
+		}
+	}
+	b := make([]byte, 0)
+	for i := 0; i < len(bits); i += 8 {
+		b = append(b, byte(DecodeBitsToUint(bits[i : i + 8])))
+	}
+	return b
 }
 
 // 解析为int
 func DecodeBits(bits []Bit) int {
-    v := int(0)
-    for _, i := range bits {
-        v = v << 1 | int(i)
-    }
-    return v
+	v := int(0)
+	for _, i := range bits {
+		v = v << 1 | int(i)
+	}
+	return v
 }
 
 // 解析为uint
 func DecodeBitsToUint(bits []Bit) uint {
-    v := uint(0)
-    for _, i := range bits {
-        v = v << 1 | uint(i)
-    }
-    return v
+	v := uint(0)
+	for _, i := range bits {
+		v = v << 1 | uint(i)
+	}
+	return v
 }
 
 // 解析[]byte为字位数组[]uint8
 func DecodeBytesToBits(bs []byte) []Bit {
-    bits := make([]Bit, 0)
-    for _, b := range bs {
-        bits = EncodeBitsWithUint(bits, uint(b), 8)
-    }
-    return bits
+	bits := make([]Bit, 0)
+	for _, b := range bs {
+		bits = EncodeBitsWithUint(bits, uint(b), 8)
+	}
+	return bits
 }

g/encoding/gbinary/gbinary_test.go

@@ -0,0 +1,131 @@
+// Copyright 2017 gf Author(https://github.com/gogf/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://github.com/gogf/gf.
+
+package gbinary_test
+
+import (
+	"github.com/gogf/gf/g/encoding/gbinary"
+	"github.com/gogf/gf/g/test/gtest"
+	"math"
+	"testing"
+)
+
+var testData = map[string]interface{}{
+	//"nil":         nil,
+	"int":         int(123),
+	"int8":        int8(-99),
+	"int8.max":    math.MaxInt8,
+	"int16":       int16(123),
+	"int16.max":   math.MaxInt16,
+	"int32":       int32(-199),
+	"int32.max":   math.MaxInt32,
+	"int64":       int64(123),
+	"uint":        uint(123),
+	"uint8":       uint8(123),
+	"uint8.max":   math.MaxUint8,
+	"uint16":      uint16(9999),
+	"uint16.max":  math.MaxUint16,
+	"uint32":      uint32(123),
+	"uint64":      uint64(123),
+	"bool.true":   true,
+	"bool.false":  false,
+	"string":      "hehe haha",
+	"byte":        []byte("hehe haha"),
+	"float32":     float32(123.456),
+	"float32.max": math.MaxFloat32,
+	"float64":     float64(123.456),
+}
+
+func TestEncodeAndDecode(t *testing.T) {
+	for k, v := range testData {
+		ve := gbinary.Encode(v)
+		ve1 := gbinary.EncodeByLength(len(ve), v)
+
+		//t.Logf("%s:%v, encoded:%v\n", k, v, ve)
+		switch v.(type) {
+		case int:
+			gtest.Assert(gbinary.DecodeToInt(ve), v)
+			gtest.Assert(gbinary.DecodeToInt(ve1), v)
+		case int8:
+			gtest.Assert(gbinary.DecodeToInt8(ve), v)
+			gtest.Assert(gbinary.DecodeToInt8(ve1), v)
+		case int16:
+			gtest.Assert(gbinary.DecodeToInt16(ve), v)
+			gtest.Assert(gbinary.DecodeToInt16(ve1), v)
+		case int32:
+			gtest.Assert(gbinary.DecodeToInt32(ve), v)
+			gtest.Assert(gbinary.DecodeToInt32(ve1), v)
+		case int64:
+			gtest.Assert(gbinary.DecodeToInt64(ve), v)
+			gtest.Assert(gbinary.DecodeToInt64(ve1), v)
+		case uint:
+			gtest.Assert(gbinary.DecodeToUint(ve), v)
+			gtest.Assert(gbinary.DecodeToUint(ve1), v)
+		case uint8:
+			gtest.Assert(gbinary.DecodeToUint8(ve), v)
+			gtest.Assert(gbinary.DecodeToUint8(ve1), v)
+		case uint16:
+			gtest.Assert(gbinary.DecodeToUint16(ve1), v)
+			gtest.Assert(gbinary.DecodeToUint16(ve), v)
+		case uint32:
+			gtest.Assert(gbinary.DecodeToUint32(ve1), v)
+			gtest.Assert(gbinary.DecodeToUint32(ve), v)
+		case uint64:
+			gtest.Assert(gbinary.DecodeToUint64(ve), v)
+			gtest.Assert(gbinary.DecodeToUint64(ve1), v)
+		case bool:
+			gtest.Assert(gbinary.DecodeToBool(ve), v)
+			gtest.Assert(gbinary.DecodeToBool(ve1), v)
+		case string:
+			gtest.Assert(gbinary.DecodeToString(ve), v)
+			gtest.Assert(gbinary.DecodeToString(ve1), v)
+		case float32:
+			gtest.Assert(gbinary.DecodeToFloat32(ve), v)
+			gtest.Assert(gbinary.DecodeToFloat32(ve1), v)
+		case float64:
+			gtest.Assert(gbinary.DecodeToFloat64(ve), v)
+			gtest.Assert(gbinary.DecodeToFloat64(ve1), v)
+		default:
+			if v == nil {
+				continue
+			}
+			res := make([]byte, len(ve))
+			err := gbinary.Decode(ve, res)
+			if err != nil {
+				t.Errorf("test data: %s, %v, error:%v", k, v, err)
+			}
+			gtest.Assert(res, v)
+		}
+	}
+}
+
+type User struct {
+	Name string
+	Age  int
+	Url  string
+}
+
+func TestEncodeStruct(t *testing.T) {
+	user := User{"wenzi1", 999, "www.baidu.com"}
+	ve := gbinary.Encode(user)
+	s := gbinary.DecodeToString(ve)
+	gtest.Assert(string(s), s)
+}
+
+var testBitData = []int{0, 99, 122, 129, 222, 999, 22322}
+
+func TestBits(t *testing.T) {
+	for i := range testBitData {
+		bits := make([]gbinary.Bit, 0)
+		res := gbinary.EncodeBits(bits, testBitData[i], 64)
+
+		gtest.Assert(gbinary.DecodeBits(res), testBitData[i])
+		gtest.Assert(gbinary.DecodeBitsToUint(res), uint(testBitData[i]))
+
+		gtest.Assert(gbinary.DecodeBytesToBits(gbinary.EncodeBitsToBytes(res)), res)
+	}
+
+}

g/encoding/gcharset/gcharset.go

@@ -51,5 +51,5 @@ func ToUTF8(charset string, src string) (dst string, err error) {
 
 // UTF8转指定字符集
 func UTF8To(charset string, src string) (dst string, err error) {
-	return  Convert(charset, "UTF-8", src)
+	return Convert(charset, "UTF-8", src)
 }

g/encoding/gcharset/gcharset_test.go

@@ -1,10 +1,16 @@
-package gcharset
+// Copyright 2018 gf Author(https://github.com/gogf/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://github.com/gogf/gf.
+
+package gcharset_test
 
 import (
+	"github.com/gogf/gf/g/encoding/gcharset"
 	"testing"
 )
 
-
 var testData = []struct {
 	utf8, other, otherEncoding string
 }{
@@ -52,7 +58,7 @@ var testData = []struct {
 func TestDecode(t *testing.T) {
 	for _, data := range testData {
 		str := ""
-		str, err := Convert("UTF-8", data.otherEncoding, data.other)
+		str, err := gcharset.Convert("UTF-8", data.otherEncoding, data.other)
 		if err != nil {
 			t.Errorf("Could not create decoder for %v", err)
 			continue
@@ -68,7 +74,7 @@ func TestDecode(t *testing.T) {
 func TestEncode(t *testing.T) {
 	for _, data := range testData {
 		str := ""
-		str, err := Convert(data.otherEncoding, "UTF-8", data.utf8)
+		str, err := gcharset.Convert(data.otherEncoding, "UTF-8", data.utf8)
 		if err != nil {
 			t.Errorf("Could not create decoder for %v", err)
 			continue
@@ -86,7 +92,7 @@ func TestConvert(t *testing.T) {
 	dstCharset := "gbk"
 	dst := "Hello \xb3\xa3\xd3\xc3\x87\xf8\xd7\xd6\x98\xcb\x9c\xca\xd7\xd6\xf3\x77\xb1\xed"
 
-	str, err := Convert(dstCharset, srcCharset, src)
+	str, err := gcharset.Convert(dstCharset, srcCharset, src)
 	if err != nil {
 		t.Errorf("convert error. %v", err)
 		return

g/encoding/gcompress/gcompress_test.go

@@ -0,0 +1,42 @@
+// Copyright 2017 gf Author(https://github.com/gogf/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://github.com/gogf/gf.
+package gcompress_test
+
+import (
+	"github.com/gogf/gf/g/encoding/gcompress"
+	"github.com/gogf/gf/g/test/gtest"
+	"testing"
+)
+
+func TestZlib(t *testing.T) {
+	gtest.Case(t, func() {
+		src := "hello, world\n"
+		dst := []byte{120, 156, 202, 72, 205, 201, 201, 215, 81, 40, 207, 47, 202, 73, 225, 2, 4, 0, 0, 255, 255, 33, 231, 4, 147}
+		gtest.Assert(gcompress.Zlib([]byte(src)), dst)
+
+		gtest.Assert(gcompress.UnZlib(dst), []byte(src))
+	})
+
+}
+
+func TestGzip(t *testing.T) {
+	src := "Hello World!!"
+
+	gzip := []byte{
+		0x1f, 0x8b, 0x08, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0xff,
+		0xf2, 0x48, 0xcd, 0xc9, 0xc9,
+		0x57, 0x08, 0xcf, 0x2f, 0xca,
+		0x49, 0x51, 0x54, 0x04, 0x04,
+		0x00, 0x00, 0xff, 0xff, 0x9d,
+		0x24, 0xa8, 0xd1, 0x0d, 0x00,
+		0x00, 0x00,
+	}
+
+	gtest.Assert(gcompress.Gzip([]byte(src)), gzip)
+
+	gtest.Assert(gcompress.UnGzip(gzip), []byte(src))
+}

g/encoding/ghtml/ghtml_test.go

@@ -0,0 +1,32 @@
+// Copyright 2017 gf Author(https://github.com/gogf/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://github.com/gogf/gf.
+package ghtml_test
+
+import (
+	"github.com/gogf/gf/g/encoding/ghtml"
+	"github.com/gogf/gf/g/test/gtest"
+	"testing"
+)
+
+func TestStripTags(t *testing.T) {
+	src := `<p>Test paragraph.</p><!-- Comment -->  <a href="#fragment">Other text</a>`
+	dst := `Test paragraph.  Other text`
+	gtest.Assert(ghtml.StripTags(src), dst)
+}
+
+func TestEntities(t *testing.T) {
+	src := `A 'quote' "is" <b>bold</b>`
+	dst := `A &#39;quote&#39; &#34;is&#34; &lt;b&gt;bold&lt;/b&gt;`
+	gtest.Assert(ghtml.Entities(src), dst)
+	gtest.Assert(ghtml.EntitiesDecode(dst), src)
+}
+
+func TestSpecialChars(t *testing.T) {
+	src := `A 'quote' "is" <b>bold</b>`
+	dst := `A &#39;quote&#39; &#34;is&#34; &lt;b&gt;bold&lt;/b&gt;`
+	gtest.Assert(ghtml.SpecialChars(src), dst)
+	gtest.Assert(ghtml.SpecialCharsDecode(dst), src)
+}