From b01add29259b745c114424d2966be84b1275ec1f Mon Sep 17 00:00:00 2001 From: John Date: Mon, 29 Jul 2019 21:01:19 +0800 Subject: [PATCH] update project structure --- README.MD | 20 +++++++------- README_ZH.MD | 4 +-- RELEASE.MD | 10 +++---- {g/container => container}/garray/garray.go | 0 .../garray/garray_func.go | 0 .../garray/garray_normal_int.go | 6 ++--- .../garray/garray_normal_interface.go | 6 ++--- .../garray/garray_normal_string.go | 6 ++--- .../garray/garray_sorted_int.go | 8 +++--- .../garray/garray_sorted_interface.go | 8 +++--- .../garray/garray_sorted_string.go | 8 +++--- .../garray/garray_z_bench_test.go | 2 +- .../garray/garray_z_example_test.go | 3 ++- .../garray/garray_z_unit_basic_test.go | 7 ++--- .../garray/garray_z_unit_int_test.go | 7 ++--- .../garray/garray_z_unit_interface_test.go | 7 ++--- .../garray/garray_z_unit_string_test.go | 7 ++--- {g/container => container}/gchan/gchan.go | 2 +- .../gchan/gchan_example_test.go | 3 ++- .../gchan/gchan_z_unit_test.go | 4 +-- {g/container => container}/glist/glist.go | 3 ++- .../glist/glist_example_test.go | 3 ++- .../glist/glist_z_bench_test.go | 0 .../glist/glist_z_unit_test.go | 4 +-- {g/container => container}/gmap/gmap.go | 0 .../gmap/gmap_hash_any_any_map.go | 6 ++--- .../gmap/gmap_hash_int_any_map.go | 6 ++--- .../gmap/gmap_hash_int_int_map.go | 2 +- .../gmap/gmap_hash_int_str_map.go | 4 +-- .../gmap/gmap_hash_str_any_map.go | 6 ++--- .../gmap/gmap_hash_str_int_map.go | 4 +-- .../gmap/gmap_hash_str_str_map.go | 2 +- .../gmap/gmap_link_map.go | 8 +++--- .../gmap/gmap_tree_map.go | 2 +- .../gmap/gmap_z_basic_test.go | 5 ++-- .../gmap/gmap_z_bench_maps_test.go | 4 +-- .../gmap/gmap_z_bench_safe_test.go | 2 +- .../gmap/gmap_z_bench_syncmap_test.go | 2 +- .../gmap/gmap_z_bench_unsafe_test.go | 2 +- .../gmap/gmap_z_example_test.go | 3 ++- .../gmap/gmap_z_int_any_test.go | 5 ++-- .../gmap/gmap_z_int_int_test.go | 5 ++-- .../gmap/gmap_z_int_str_test.go | 5 ++-- .../gmap/gmap_z_link_map_test.go | 7 ++--- .../gmap/gmap_z_str_any_test.go | 5 ++-- .../gmap/gmap_z_str_int_test.go | 5 ++-- .../gmap/gmap_z_str_str_test.go | 5 ++-- .../gmap/gmap_z_tree_map_test.go | 7 ++--- {g/container => container}/gpool/gpool.go | 8 +++--- .../gpool/gpool_bench_test.go | 3 ++- .../gpool/gpool_z_unit_test.go | 7 ++--- {g/container => container}/gqueue/gqueue.go | 5 ++-- .../gqueue/gqueue_bench_test.go | 3 ++- .../gqueue/gqueue_unit_test.go | 5 ++-- {g/container => container}/gring/gring.go | 5 ++-- .../gring/gring_test.go | 0 .../gring/gring_unit_test.go | 7 ++--- {g/container => container}/gset/gset.go | 5 ++-- .../gset/gset_int_set.go | 5 ++-- .../gset/gset_string_set.go | 5 ++-- .../gset/gset_z_bench_test.go | 2 +- .../gset/gset_z_unit_int_test.go | 7 ++--- .../gset/gset_z_unit_string_test.go | 7 ++--- .../gset/gset_z_unit_test.go | 7 ++--- {g/container => container}/gtree/gtree.go | 0 .../gtree/gtree_avltree.go | 4 +-- .../gtree/gtree_btree.go | 4 +-- .../gtree/gtree_redblacktree.go | 4 +-- .../gtree/gtree_z_avl_tree_test.go | 8 +++--- .../gtree/gtree_z_b_tree_test.go | 8 +++--- .../gtree/gtree_z_redblack_tree_test.go | 8 +++--- {g/container => container}/gtype/bool.go | 0 {g/container => container}/gtype/byte.go | 0 {g/container => container}/gtype/bytes.go | 0 {g/container => container}/gtype/float32.go | 0 {g/container => container}/gtype/float64.go | 0 {g/container => container}/gtype/gtype.go | 0 .../gtype/gtype_test.go | 3 ++- .../gtype/gtype_z_unit_test.go | 4 +-- {g/container => container}/gtype/int.go | 0 {g/container => container}/gtype/int32.go | 0 {g/container => container}/gtype/int64.go | 0 {g/container => container}/gtype/interface.go | 0 {g/container => container}/gtype/string.go | 0 {g/container => container}/gtype/uint.go | 0 {g/container => container}/gtype/uint32.go | 0 {g/container => container}/gtype/uint64.go | 0 {g/container => container}/gvar/gvar.go | 8 +++--- {g/container => container}/gvar/gvar_test.go | 4 +-- .../gvar/gvar_z_bench_test.go | 0 {g/crypto => crypto}/gaes/gaes.go | 0 {g/crypto => crypto}/gaes/gaes_test.go | 6 ++--- {g/crypto => crypto}/gcrc32/gcrc32.go | 3 ++- {g/crypto => crypto}/gcrc32/gcrc32_test.go | 6 ++--- {g/crypto => crypto}/gdes/gdes.go | 0 {g/crypto => crypto}/gdes/gdes_test.go | 4 +-- {g/crypto => crypto}/gmd5/gmd5.go | 4 +-- {g/crypto => crypto}/gmd5/gmd5_test.go | 4 +-- {g/crypto => crypto}/gsha1/gsha1.go | 4 +-- {g/crypto => crypto}/gsha1/gsha1_test.go | 4 +-- {g/database => database}/gdb/gdb.go | 12 ++++----- {g/database => database}/gdb/gdb_base.go | 12 ++++----- .../gdb/gdb_batch_result.go | 0 {g/database => database}/gdb/gdb_config.go | 2 +- {g/database => database}/gdb/gdb_func.go | 10 +++---- {g/database => database}/gdb/gdb_model.go | 2 +- {g/database => database}/gdb/gdb_mssql.go | 2 +- {g/database => database}/gdb/gdb_mysql.go | 3 ++- {g/database => database}/gdb/gdb_oracle.go | 2 +- {g/database => database}/gdb/gdb_pgsql.go | 4 +-- {g/database => database}/gdb/gdb_sqlite.go | 2 +- {g/database => database}/gdb/gdb_structure.go | 6 ++--- .../gdb/gdb_transaction.go | 2 +- .../gdb/gdb_type_record.go | 2 +- .../gdb/gdb_type_result.go | 2 +- .../gdb/gdb_unit_init_test.go | 10 +++---- .../gdb/gdb_unit_types_test.go | 4 +-- .../gdb/gdb_unit_z_basic_test.go | 4 +-- .../gdb/gdb_unit_z_method_test.go | 6 ++--- .../gdb/gdb_unit_z_model_test.go | 6 ++--- .../gdb/gdb_unit_z_struct_test.go | 6 ++--- .../gdb/gdb_unit_z_transaction_test.go | 6 ++--- {g/database => database}/gredis/gredis.go | 7 ++--- .../gredis/gredis_config.go | 2 +- .../gredis/gredis_conn.go | 2 +- .../gredis/gredis_unit_test.go | 6 ++--- {g/encoding => encoding}/gbase64/gbase64.go | 0 .../gbase64/gbase64_test.go | 4 +-- {g/encoding => encoding}/gbinary/gbinary.go | 0 .../gbinary/gbinary_be.go | 0 .../gbinary/gbinary_bits.go | 0 .../gbinary/gbinary_func.go | 0 .../gbinary/gbinary_le.go | 0 .../gbinary/gbinary_z_be_test.go | 4 +-- .../gbinary/gbinary_z_le_test.go | 4 +-- .../gbinary/gbinary_z_test.go | 4 +-- {g/encoding => encoding}/gcharset/gcharset.go | 7 ++--- .../gcharset/gcharset_test.go | 5 ++-- .../gcompress/gcompress.go | 0 .../gcompress/gcompress_file.go | 5 ++-- .../gcompress/gcompress_test.go | 4 +-- {g/encoding => encoding}/ghash/ghash.go | 0 {g/encoding => encoding}/ghash/ghash_test.go | 3 ++- .../ghash/ghash_z_unit_basic_test.go | 4 +-- {g/encoding => encoding}/ghtml/ghtml.go | 3 ++- {g/encoding => encoding}/ghtml/ghtml_test.go | 5 ++-- {g/encoding => encoding}/gjson/gjson.go | 6 ++--- {g/encoding => encoding}/gjson/gjson_api.go | 8 +++--- .../gjson/gjson_api_config.go | 0 .../gjson/gjson_api_encoding.go | 7 ++--- .../gjson/gjson_api_new_load.go | 18 ++++++------- .../gjson/gjson_z_bench_test.go | 3 ++- .../gjson/gjson_z_unit_basic_test.go | 6 ++--- .../gjson/gjson_z_unit_load_test.go | 8 +++--- .../gjson/gjson_z_unit_set_test.go | 3 ++- {g/encoding => encoding}/gparser/gparser.go | 2 +- .../gparser/gparser_api_encoding.go | 0 .../gparser/gparser_api_new_load.go | 2 +- .../gparser/gparser_unit_basic_test.go | 6 ++--- .../gparser/gparser_unit_load_test.go | 8 +++--- .../gparser/gparser_unit_set_test.go | 3 ++- {g/encoding => encoding}/gtoml/gtoml.go | 3 ++- {g/encoding => encoding}/gtoml/gtoml_test.go | 7 ++--- {g/encoding => encoding}/gurl/url.go | 0 {g/encoding => encoding}/gurl/url_test.go | 5 ++-- {g/encoding => encoding}/gxml/gxml.go | 7 ++--- {g/encoding => encoding}/gxml/gxml_test.go | 9 ++++--- {g/encoding => encoding}/gyaml/gyaml.go | 2 +- {g/encoding => encoding}/gyaml/gyaml_test.go | 7 ++--- {g/errors => errors}/gerror/gerror.go | 2 +- {g/errors => errors}/gerror/gerror_error.go | 2 +- {g/errors => errors}/gerror/gerror_stack.go | 0 {g/errors => errors}/gerror/gerror_test.go | 4 +-- .../container/garray/array_unique.go | 0 {geg => example}/container/garray/garray1.go | 3 ++- {geg => example}/container/garray/garray2.go | 3 ++- .../container/garray/garray_slice_safe.go | 4 +-- .../container/garray/sorted_string_array1.go | 4 +-- .../container/garray/sorted_string_array2.go | 5 ++-- {geg => example}/container/gmap/gmap.go | 3 ++- {geg => example}/container/gmap/gmap_json.go | 2 +- .../container/gmap/gmap_map_safe.go | 4 +-- {geg => example}/container/gmap/gmap_order.go | 7 ++--- .../container/gmap/gmap_treemap.go | 5 ++-- .../container/gmap/safe_map_delete.go | 0 {geg => example}/container/gpool/gpool.go | 3 ++- .../container/gpool/gpool_expirefunc.go | 7 ++--- {geg => example}/container/gqueue/gqueue.go | 7 ++--- {geg => example}/container/gqueue/gqueue2.go | 5 ++-- {geg => example}/container/gqueue/gqueue3.go | 7 ++--- {geg => example}/container/gring/gring.go | 3 ++- .../container/gring/gring_josephus.go | 3 ++- {geg => example}/container/gset/gset1.go | 3 ++- {geg => example}/container/gset/gset2.go | 5 ++-- .../container/gtree/gtree_avltree.go | 5 ++-- .../container/gtree/gtree_btree.go | 3 ++- .../container/gtree/gtree_redblackmap.go | 5 ++-- .../container/gtree/gtree_redblacktree.go | 2 +- {geg => example}/container/gtype/gtype_int.go | 3 ++- {geg => example}/container/gvar/g.var.go | 3 ++- .../database/gdb/mssql/config.toml | 0 .../database/gdb/mssql/gdb_all.go | 2 +- .../database/gdb/mssql/gdb_sqlserver.go | 4 +-- .../database/gdb/mysql/config.toml | 0 .../database/gdb/mysql/config2.toml | 0 .../database/gdb/mysql/config3.toml | 0 {geg => example}/database/gdb/mysql/gdb.go | 4 +-- .../database/gdb/mysql/gdb_all.go | 2 +- .../database/gdb/mysql/gdb_args_slice.go | 2 +- .../database/gdb/mysql/gdb_binary.go | 7 ++--- .../database/gdb/mysql/gdb_bit.go | 2 +- .../database/gdb/mysql/gdb_cache.go | 4 +-- .../database/gdb/mysql/gdb_config.go | 3 ++- .../database/gdb/mysql/gdb_config2.go | 3 ++- .../database/gdb/mysql/gdb_config3.go | 3 ++- .../database/gdb/mysql/gdb_datetime.go | 5 ++-- .../database/gdb/mysql/gdb_debug1.go | 6 ++--- .../database/gdb/mysql/gdb_debug2.go | 2 +- .../database/gdb/mysql/gdb_insert.go | 3 ++- .../database/gdb/mysql/gdb_json_xml.go | 7 ++--- .../database/gdb/mysql/gdb_pool.go | 3 ++- .../database/gdb/mysql/gdb_struct.go | 2 +- .../database/gdb/mysql/gdb_update_union.go | 3 ++- .../database/gdb/mysql/gdb_value.go | 2 +- {geg => example}/database/gdb/oracle/gdb.go | 4 +-- .../database/gdb/sqlite/sqlite.go | 6 ++--- {geg => example}/database/gredis/config.toml | 0 {geg => example}/database/gredis/gredis.go | 5 ++-- {geg => example}/database/gredis/gredis2.go | 5 ++-- .../database/gredis/gredis_conn_do.go | 5 ++-- .../database/gredis/gredis_conn_do_var.go | 3 ++- .../database/gredis/gredis_conn_send.go | 5 ++-- .../database/gredis/gredis_conn_send_var.go | 3 ++- .../database/gredis/gredis_conn_subscribe.go | 5 ++-- .../gredis/gredis_conn_subscribe_var.go | 3 ++- {geg => example}/encoding/gbase64.go | 3 ++- {geg => example}/encoding/gbinary/binary.go | 5 ++-- {geg => example}/encoding/gbinary/bits1.go | 3 ++- {geg => example}/encoding/gbinary/bits2.go | 3 ++- {geg => example}/encoding/gcfg/config.toml | 0 {geg => example}/encoding/gcfg/gcfg1.go | 3 ++- .../encoding/gcharset/gcharset.go | 3 ++- {geg => example}/encoding/gcompress/unzip.go | 3 ++- .../encoding/gcompress/unzip_content.go | 5 ++-- {geg => example}/encoding/gcompress/zip.go | 3 ++- {geg => example}/encoding/ghash.go | 3 ++- {geg => example}/encoding/gjson.go | 7 ++--- {geg => example}/encoding/gparser/gparser.go | 5 ++-- .../encoding/gparser/gparser_xml.go | 2 +- {geg => example}/errors/gerror/gerror1.go | 2 +- {geg => example}/errors/gerror/gerror2.go | 2 +- {geg => example}/errors/gerror/gerror3.go | 2 +- {geg => example}/errors/gerror/gerror4.go | 2 +- {geg => example}/errors/gerror/gerror5.go | 4 +-- {geg => example}/frame/mvc/config.json | 0 {geg => example}/frame/mvc/config.toml | 0 {geg => example}/frame/mvc/config.xml | 0 {geg => example}/frame/mvc/config.yml | 0 .../frame/mvc/controller/demo/apple_pen.go | 4 +-- .../frame/mvc/controller/demo/buildin_vars.go | 4 +-- .../frame/mvc/controller/demo/config.go | 4 +-- .../frame/mvc/controller/demo/cookie.go | 4 +-- .../frame/mvc/controller/demo/domain.go | 2 +- .../frame/mvc/controller/demo/exit.go | 4 +-- .../frame/mvc/controller/demo/form.go | 3 ++- .../frame/mvc/controller/demo/hello.go | 2 +- .../frame/mvc/controller/demo/method.go | 4 +-- .../frame/mvc/controller/demo/object.go | 4 +-- .../mvc/controller/demo/object_method.go | 4 +-- .../frame/mvc/controller/demo/object_rest.go | 2 +- .../frame/mvc/controller/demo/product.go | 4 +-- .../frame/mvc/controller/demo/rest.go | 4 +-- .../frame/mvc/controller/demo/rule.go | 4 +-- .../frame/mvc/controller/demo/session.go | 3 ++- .../frame/mvc/controller/demo/template.go | 4 +-- .../frame/mvc/controller/demo/template2.go | 4 +-- .../frame/mvc/controller/demo/template3.go | 4 +-- .../frame/mvc/controller/demo/upload.go | 4 +-- .../frame/mvc/controller/demo/user.go | 4 +-- .../frame/mvc/controller/stats/stats.go | 4 +-- {geg => example}/frame/mvc/main.go | 2 +- .../frame/mvc/view/upload/upload.tpl | 0 .../frame/mvc/view/user/footer.tpl | 0 .../frame/mvc/view/user/index.tpl | 0 .../net/ghttp/client/cookie/client.go | 5 ++-- .../net/ghttp/client/cookie/server.go | 4 +-- {geg => example}/net/ghttp/client/get.go | 3 ++- .../net/ghttp/client/upload/client.go | 5 ++-- .../net/ghttp/client/upload/server.go | 6 ++--- .../net/ghttp/server/controller/user.go | 4 +-- {geg => example}/net/ghttp/server/cookie.go | 6 ++--- .../net/ghttp/server/denyroutes/config.toml | 0 .../net/ghttp/server/denyroutes/denyroutes.go | 2 +- {geg => example}/net/ghttp/server/domain.go | 2 +- .../net/ghttp/server/download/download.go | 4 +-- .../net/ghttp/server/download/text.txt | 0 .../net/ghttp/server/duplicate/duplicate1.go | 4 +-- .../net/ghttp/server/duplicate/duplicate2.go | 4 +-- .../net/ghttp/server/duplicate/duplicate3.go | 4 +-- {geg => example}/net/ghttp/server/exit.go | 6 ++--- {geg => example}/net/ghttp/server/hello.go | 4 +-- .../net/ghttp/server/hooks/cors1.go | 6 ++--- .../net/ghttp/server/hooks/cors2.go | 6 ++--- .../net/ghttp/server/hooks/hooks1.go | 6 ++--- .../net/ghttp/server/hooks/hooks2.go | 5 ++-- .../net/ghttp/server/hooks/hooks4.go | 6 ++--- .../net/ghttp/server/hooks/hooks5.go | 4 +-- .../net/ghttp/server/hooks/hooks_param.go | 4 +-- .../server/hooks/same_route_multi_hook.go | 4 +-- .../net/ghttp/server/https/https.go | 2 +- .../net/ghttp/server/https/https_http.go | 2 +- .../net/ghttp/server/https/server.crt | 0 .../net/ghttp/server/https/server.key | 0 .../net/ghttp/server/https/server.key.public | 0 {geg => example}/net/ghttp/server/log/log.go | 3 ++- .../net/ghttp/server/log/log_error.go | 2 +- {geg => example}/net/ghttp/server/name.go | 4 +-- .../net/ghttp/server/nethttp_server.go | 0 .../net/ghttp/server/object/user.go | 4 +-- {geg => example}/net/ghttp/server/ports.go | 2 +- {geg => example}/net/ghttp/server/pprof.go | 2 +- .../net/ghttp/server/redirect/back.go | 4 +-- .../net/ghttp/server/reload/admin.go | 2 +- .../net/ghttp/server/reload/https.go | 4 +-- .../net/ghttp/server/reload/https_http.go | 2 +- .../server/reload/multi_port_and_server.go | 2 +- .../net/ghttp/server/reload/simple.go | 7 ++--- .../ghttp/server/request/request_struct.go | 4 +-- .../server/request/request_validation.go | 6 ++--- .../net/ghttp/server/reuseport/reuseport.go | 6 ++--- .../net/ghttp/server/router/group/group1.go | 6 ++--- .../net/ghttp/server/router/router1.go | 4 +-- .../net/ghttp/server/router/router2.go | 2 +- .../net/ghttp/server/router/router3.go | 4 +-- .../net/ghttp/server/router/router4.go | 4 +-- .../net/ghttp/server/router/router5.go | 5 ++-- .../net/ghttp/server/router/router6.go | 4 +-- {geg => example}/net/ghttp/server/server2.go | 2 +- {geg => example}/net/ghttp/server/session.go | 6 ++--- .../net/ghttp/server/session/config.toml | 0 .../net/ghttp/server/session/session.go | 4 +-- .../net/ghttp/server/session/session_redis.go | 6 ++--- .../net/ghttp/server/static/static.go | 2 +- .../net/ghttp/server/static/static_path.go | 2 +- .../net/ghttp/server/static/static_path2.go | 2 +- {geg => example}/net/ghttp/server/status.go | 4 +-- .../net/ghttp/server/status_map.go | 4 +-- .../net/ghttp/server/status_redirect.go | 4 +-- .../template/build-in/objects/objects.go | 4 +-- .../server/template/build-in/vars/config.toml | 0 .../server/template/build-in/vars/vars.go | 4 +-- .../net/ghttp/server/template/layout/main.go | 4 +-- .../template/layout/template/footer.html | 0 .../template/layout/template/header.html | 0 .../template/layout/template/layout.html | 0 .../template/layout/template/main/main1.html | 0 .../template/layout/template/main/main2.html | 0 .../net/ghttp/server/template/tpl1/index.html | 0 .../net/ghttp/server/template/tpl1/tpl1.go | 6 ++--- .../net/ghttp/server/template/tpl2/main.go | 6 ++--- .../server/template/tpl2/public/test.html | 0 .../server/template/tpl2/template/test.html | 0 .../server/websocket/echo-wss/index.html | 0 .../ghttp/server/websocket/echo-wss/main.go | 8 +++--- .../ghttp/server/websocket/echo/index.html | 0 .../ghttp/server/websocket/echo/main-group.go | 8 +++--- .../net/ghttp/server/websocket/echo/main.go | 8 +++--- {geg => example}/net/gtcp/gtcp_conn.go | 5 ++-- {geg => example}/net/gtcp/gtcp_echo_server.go | 3 ++- {geg => example}/net/gtcp/gtcp_func.go | 3 ++- {geg => example}/net/gtcp/gtcp_pool1.go | 7 ++--- {geg => example}/net/gtcp/gtcp_pool2.go | 7 ++--- .../net/gtcp/gtcp_server_client1.go | 7 ++--- .../net/gtcp/gtcp_server_client2.go | 7 ++--- .../net/gtcp/gtcp_timeout_client.go | 7 ++--- .../net/gtcp/gtcp_timeout_server.go | 3 ++- .../gtcp/pkg_operations/common/funcs/funcs.go | 3 ++- .../common/gtcp_common_client.go | 9 ++++--- .../common/gtcp_common_server.go | 9 ++++--- .../gtcp/pkg_operations/common/types/types.go | 0 .../net/gtcp/pkg_operations/gtcp_basic.go | 7 ++--- .../gtcp/pkg_operations/gtcp_empty_data.go | 5 ++-- .../gtcp/pkg_operations/gtcp_pkg_option.go | 7 ++--- .../monitor/gtcp_monitor_client.go | 9 ++++--- .../monitor/gtcp_monitor_server.go | 5 ++-- .../pkg_operations/monitor/types/types.go | 2 +- .../net/gtcp/server_client/gtcp_client.go | 7 ++--- .../net/gtcp/server_client/gtcp_server.go | 3 ++- .../net/gtcp/tcp_server_client.go | 0 .../net/gtcp/tls/gtcp_server_client.go | 7 ++--- {geg => example}/net/gtcp/tls/server.crt | 0 {geg => example}/net/gtcp/tls/server.key | 0 .../net/gtcp/tls/server.key.public | 0 {geg => example}/net/gudp/gudp_server.go | 3 ++- .../net/gudp/gudp_server_client.go | 7 ++--- {geg => example}/net/gudp/udp_client.go | 0 {geg => example}/net/gudp/udp_server.go | 0 {geg => example}/os/console.go | 3 ++- {geg => example}/os/gcache/usage_basic.go | 3 ++- {geg => example}/os/gcache/usage_lru.go | 3 ++- {geg => example}/os/gcache/usage_senior.go | 3 ++- {geg => example}/os/gcfg/config.json | 0 {geg => example}/os/gcfg/config.toml | 0 {geg => example}/os/gcfg/gcfg1.go | 3 ++- {geg => example}/os/gcfg/gcfg2.go | 3 ++- {geg => example}/os/gcfg/gcfg3.go | 3 ++- {geg => example}/os/gcfg/gcfg4.go | 3 ++- {geg => example}/os/gcfg/gcfg_auto_update.go | 5 ++-- {geg => example}/os/gcfg/gcfg_error.go | 3 ++- {geg => example}/os/gcfg/memcache.yml | 0 {geg => example}/os/gcfg/redis.toml | 0 {geg => example}/os/gcmd/gcmd1.go | 3 ++- {geg => example}/os/gcron/gcron-log.go | 5 ++-- {geg => example}/os/gcron/gcron1.go | 5 ++-- {geg => example}/os/gcron/gcron2.go | 5 ++-- {geg => example}/os/gfcache/gfcache.go | 5 ++-- {geg => example}/os/gfile/gfile.go | 5 ++-- {geg => example}/os/gfile/gfile_contents.go | 3 ++- {geg => example}/os/gfile/gfile_scan.go | 4 +-- {geg => example}/os/gflock/flock.go | 2 +- {geg => example}/os/gflock/gflock.go | 6 ++--- {geg => example}/os/gfpool/gfpool.go | 3 ++- {geg => example}/os/gfsnotify/fsnotify.go | 5 ++-- {geg => example}/os/gfsnotify/gfsnotify.go | 4 +-- .../os/gfsnotify/gfsnotify_callback.go | 7 ++--- .../os/gfsnotify/gfsnotify_callback_folder.go | 7 ++--- .../os/gfsnotify/gfsnotify_limit.go | 4 +-- {geg => example}/os/glog/glog_async1.go | 3 ++- {geg => example}/os/glog/glog_async2.go | 3 ++- {geg => example}/os/glog/glog_category.go | 6 ++--- {geg => example}/os/glog/glog_debug.go | 7 ++--- {geg => example}/os/glog/glog_error.go | 2 +- {geg => example}/os/glog/glog_file.go | 6 ++--- {geg => example}/os/glog/glog_flags.go | 2 +- {geg => example}/os/glog/glog_gerror.go | 5 ++-- {geg => example}/os/glog/glog_json.go | 4 +-- {geg => example}/os/glog/glog_level.go | 2 +- {geg => example}/os/glog/glog_line.go | 2 +- {geg => example}/os/glog/glog_line2.go | 2 +- {geg => example}/os/glog/glog_path.go | 6 ++--- {geg => example}/os/glog/glog_pool.go | 5 ++-- {geg => example}/os/glog/glog_prefix.go | 2 +- {geg => example}/os/glog/glog_stack.go | 2 +- {geg => example}/os/glog/glog_stdout.go | 3 ++- .../os/glog/glog_writer_greylog.go | 2 +- {geg => example}/os/glog/glog_writer_hook.go | 7 ++--- {geg => example}/os/gmlock/locker1.go | 5 ++-- {geg => example}/os/gmlock/locker2.go | 5 ++-- {geg => example}/os/gmlock/locker3.go | 5 ++-- {geg => example}/os/gmlock/locker4.go | 5 ++-- {geg => example}/os/gmlock/test_locker.go | 3 ++- {geg => example}/os/gmlock/test_mutex.go | 3 ++- {geg => example}/os/gmutex/gmutex_basic.go | 4 +-- {geg => example}/os/gmutex/gmutex_func.go | 4 +-- {geg => example}/os/gproc/gproc.go | 5 ++-- {geg => example}/os/gproc/gproc2.go | 3 ++- {geg => example}/os/gproc/gproc3.go | 5 ++-- {geg => example}/os/gproc/gproc4.go | 7 ++--- {geg => example}/os/gproc/gproc_comm.go | 9 ++++--- {geg => example}/os/gproc/gproc_comm_group.go | 5 ++-- {geg => example}/os/gproc/gproc_comm_send.go | 3 ++- {geg => example}/os/gproc/gproc_shellexec.go | 3 ++- {geg => example}/os/grpool/goroutine.go | 3 ++- {geg => example}/os/grpool/grpool.go | 5 ++-- {geg => example}/os/grpool/grpool1.go | 5 ++-- {geg => example}/os/grpool/grpool2.go | 3 ++- {geg => example}/os/grpool/grpool3.go | 3 ++- {geg => example}/os/grpool/grpool4.go | 0 {geg => example}/os/grpool/grpool5.go | 3 ++- {geg => example}/os/gspath/gspath.go | 7 ++--- {geg => example}/os/gtime/gtime_format.go | 3 ++- {geg => example}/os/gtime/gtime_func.go | 3 ++- {geg => example}/os/gtime/gtime_json.go | 2 +- {geg => example}/os/gtime/gtime_layout.go | 3 ++- {geg => example}/os/gtime/gtime_linkop.go | 3 ++- {geg => example}/os/gtime/gtime_parsertime.go | 3 ++- {geg => example}/os/gtime/gtime_regex1.go | 3 ++- {geg => example}/os/gtime/gtime_regex2.go | 3 ++- {geg => example}/os/gtime/gtime_strtotime.go | 5 ++-- {geg => example}/os/gtime/gtime_strtotime2.go | 3 ++- {geg => example}/os/gtime/gtime_zone.go | 3 ++- {geg => example}/os/gtimer/gtimer-batch.go | 3 ++- {geg => example}/os/gtimer/gtimer1.go | 3 ++- {geg => example}/os/gtimer/gtimer2.go | 5 ++-- {geg => example}/os/gtimer/gtimer3.go | 5 ++-- {geg => example}/os/gtimer/gtimer4.go | 5 ++-- {geg => example}/os/gtimer/sleep1.go | 0 {geg => example}/os/gtimer/sleep2.go | 0 {geg => example}/os/gtimer/ticker1.go | 0 {geg => example}/os/gtimer/ticker2.go | 0 {geg => example}/os/gview/assign/assign.go | 5 ++-- {geg => example}/os/gview/basic/gview.go | 3 ++- {geg => example}/os/gview/basic/gview.tpl | 0 .../os/gview/bind_func/gview_func1.go | 5 ++-- .../os/gview/bind_func/gview_func2.go | 3 ++- .../os/gview/bind_func/index.html | 0 .../gview/build_in_funcs/build_in_funcs1.go | 3 ++- .../gview/build_in_funcs/build_in_funcs2.go | 3 ++- {geg => example}/os/gview/define/main.go | 5 ++-- .../os/gview/define/template/index.html | 0 .../os/gview/define/template/subs/sub.html | 0 .../os/gview/delimiters/gview_delimiters.go | 3 ++- .../os/gview/delimiters/gview_delimiters.tpl | 0 .../os/gview/func_html/func_html.go | 4 +-- .../os/gview/func_text/func_text.go | 4 +-- .../gview/hot_update/controller_hot_update.go | 4 +-- .../os/gview/hot_update/gview_hot_update.go | 5 ++-- .../os/gview/hot_update/web_hot_update.go | 4 +-- {geg => example}/os/gview/include/main.go | 5 ++-- .../os/gview/include/template/index.html | 0 .../os/gview/include/template/subs/sub.html | 0 .../os/gview/layout/layout1/main.go | 4 +-- .../layout/layout1/template/container.html | 0 .../gview/layout/layout1/template/footer.html | 0 .../gview/layout/layout1/template/header.html | 0 .../gview/layout/layout1/template/layout.html | 0 .../os/gview/layout/layout2/main.go | 4 +-- .../gview/layout/layout2/template/footer.html | 0 .../gview/layout/layout2/template/header.html | 0 .../gview/layout/layout2/template/layout.html | 0 .../layout/layout2/template/main/main1.html | 0 .../layout/layout2/template/main/main2.html | 0 {geg => example}/os/gview/object/object.go | 2 +- {geg => example}/other/config.toml | 0 {geg => example}/other/terminal-color.go | 0 {geg => example}/other/test.go | 12 +++------ {geg => example}/other/test2.go | 2 +- {geg => example}/other/try-catch.go | 4 +-- {geg => example}/util/gconv/gconv.go | 3 ++- {geg => example}/util/gconv/gconv_map1.go | 3 ++- {geg => example}/util/gconv/gconv_map2.go | 3 ++- {geg => example}/util/gconv/gconv_map_deep.go | 4 +-- {geg => example}/util/gconv/gconv_map_tag.go | 4 +-- {geg => example}/util/gconv/gconv_slice.go | 3 ++- {geg => example}/util/gconv/gconv_struct1.go | 4 +-- {geg => example}/util/gconv/gconv_struct2.go | 5 ++-- {geg => example}/util/gconv/gconv_struct3.go | 5 ++-- {geg => example}/util/gconv/gconv_struct4.go | 5 ++-- {geg => example}/util/gconv/gconv_struct5.go | 5 ++-- {geg => example}/util/gconv/gconv_struct6.go | 5 ++-- .../util/gconv/gconv_struct_create.go | 4 +-- .../util/gconv/gconv_struct_deep.go | 4 +-- {geg => example}/util/gconv/strings.go | 3 ++- {geg => example}/util/gconv/time1.go | 3 ++- {geg => example}/util/gconv/time2.go | 3 ++- {geg => example}/util/gpage/gpage.go | 8 +++--- {geg => example}/util/gpage/gpage_ajax.go | 8 +++--- {geg => example}/util/gpage/gpage_custom1.go | 10 +++---- {geg => example}/util/gpage/gpage_custom2.go | 8 +++--- {geg => example}/util/gpage/gpage_static1.go | 8 +++--- {geg => example}/util/gpage/gpage_static2.go | 8 +++--- {geg => example}/util/gpage/gpage_template.go | 8 +++--- {geg => example}/util/grand/grand.go | 3 ++- {geg => example}/util/grand/rand.go | 3 ++- {geg => example}/util/gregex/gregex.go | 3 ++- {geg => example}/util/gstr/gstr_hidestr.go | 3 ++- {geg => example}/util/gstr/gstr_substr.go | 3 ++- {geg => example}/util/gutil/dump.go | 2 +- {geg => example}/util/gutil/stack.go | 2 +- {geg => example}/util/gutil/try_catch.go | 3 ++- {geg => example}/util/gvalid/gvalid.go | 4 +-- {geg => example}/util/gvalid/gvalid_error.go | 4 +-- {geg => example}/util/gvalid/gvalid_result.go | 4 +-- .../util/gvalid/gvalid_sequence.go | 3 ++- .../util/gvalid/gvalid_struct1.go | 4 +-- .../util/gvalid/gvalid_struct2.go | 4 +-- .../util/gvalid/gvalid_struct3.go | 4 +-- {g => frame/g}/g.go | 2 +- {g => frame/g}/g_func.go | 8 +++--- {g => frame/g}/g_logger.go | 2 +- {g => frame/g}/g_object.go | 16 ++++++------ {g => frame/g}/g_setting.go | 2 +- {g/frame => frame}/gins/gins.go | 20 +++++++------- {g/frame => frame}/gins/gins_basic_test.go | 5 ++-- {g/frame => frame}/gins/gins_config_test.go | 11 ++++---- {g/frame => frame}/gins/gins_database_test.go | 6 ++--- {g/frame => frame}/gins/gins_redis_test.go | 7 ++--- {g/frame => frame}/gins/gins_view_test.go | 8 +++--- {g/frame => frame}/gmvc/controller.go | 2 +- {g/frame => frame}/gmvc/model.go | 0 {g/frame => frame}/gmvc/view.go | 7 ++--- {g/internal => internal}/cmdenv/cmdenv.go | 3 ++- .../cmdenv/cmdenv_test.go | 2 +- {g/internal => internal}/debug/debug.go | 2 +- {g/internal => internal}/empty/empty.go | 0 {g/internal => internal}/empty/empty_test.go | 9 ++++--- {g/internal => internal}/mutex/mutex.go | 0 .../mutex/mutex_z_bench_test.go | 3 ++- .../mutex/mutex_z_unit_test.go | 7 ++--- {g/internal => internal}/rwmutex/rwmutex.go | 0 .../rwmutex/rwmutex_z_bench_test.go | 3 ++- .../rwmutex/rwmutex_z_unit_test.go | 7 ++--- {g/internal => internal}/structs/structs.go | 2 +- .../structs/structs_map.go | 2 +- .../structs/structs_tag.go | 2 +- .../structs/structs_test.go | 6 ++--- {g/internal => internal}/strutils/strutils.go | 0 .../github.com/BurntSushi/toml/.gitignore | 0 .../github.com/BurntSushi/toml/.travis.yml | 0 .../github.com/BurntSushi/toml/COMPATIBLE | 0 .../github.com/BurntSushi/toml/COPYING | 0 .../github.com/BurntSushi/toml/Makefile | 0 .../github.com/BurntSushi/toml/README.md | 0 .../github.com/BurntSushi/toml/decode.go | 0 .../github.com/BurntSushi/toml/decode_meta.go | 0 .../github.com/BurntSushi/toml/decode_test.go | 0 .../github.com/BurntSushi/toml/doc.go | 0 .../github.com/BurntSushi/toml/encode.go | 0 .../github.com/BurntSushi/toml/encode_test.go | 0 .../BurntSushi/toml/encoding_types.go | 0 .../BurntSushi/toml/encoding_types_1.1.go | 0 .../github.com/BurntSushi/toml/lex.go | 0 .../github.com/BurntSushi/toml/parse.go | 0 .../github.com/BurntSushi/toml/session.vim | 0 .../github.com/BurntSushi/toml/type_check.go | 0 .../github.com/BurntSushi/toml/type_fields.go | 0 .../github.com/clbanning/mxj/LICENSE | 0 .../github.com/clbanning/mxj/anyxml.go | 2 +- .../github.com/clbanning/mxj/anyxml_test.go | 0 .../clbanning/mxj/atomFeedString.xml | 0 .../clbanning/mxj/attrprefix_test.go | 0 .../github.com/clbanning/mxj/badxml_test.go | 0 .../github.com/clbanning/mxj/bom_test.go | 0 .../github.com/clbanning/mxj/bulk_test.go | 0 .../github.com/clbanning/mxj/bulkraw_test.go | 0 .../github.com/clbanning/mxj/data_test.go | 0 .../github.com/clbanning/mxj/doc.go | 0 .../github.com/clbanning/mxj/escapechars.go | 0 .../clbanning/mxj/escapechars_test.go | 0 .../github.com/clbanning/mxj/example_test.go | 3 ++- .../github.com/clbanning/mxj/exists.go | 0 .../github.com/clbanning/mxj/exists_test.go | 0 .../github.com/clbanning/mxj/files.go | 0 .../clbanning/mxj/files_test.badjson | 0 .../clbanning/mxj/files_test.badxml | 0 .../github.com/clbanning/mxj/files_test.go | 0 .../github.com/clbanning/mxj/files_test.json | 0 .../github.com/clbanning/mxj/files_test.xml | 0 .../clbanning/mxj/files_test_dup.json | 0 .../clbanning/mxj/files_test_dup.xml | 0 .../clbanning/mxj/files_test_indent.json | 0 .../clbanning/mxj/files_test_indent.xml | 0 .../github.com/clbanning/mxj/gob.go | 0 .../github.com/clbanning/mxj/gob_test.go | 0 .../github.com/clbanning/mxj/j2x/j2x.go | 3 ++- .../github.com/clbanning/mxj/j2x/j2x_test.go | 0 .../github.com/clbanning/mxj/j2x_test.go | 0 .../github.com/clbanning/mxj/json.go | 0 .../github.com/clbanning/mxj/json_test.go | 0 .../clbanning/mxj/keystolower_test.go | 0 .../github.com/clbanning/mxj/keyvalues.go | 0 .../clbanning/mxj/keyvalues2_test.go | 0 .../clbanning/mxj/keyvalues_test.go | 0 .../github.com/clbanning/mxj/leafnode.go | 0 .../github.com/clbanning/mxj/leafnode_test.go | 0 .../github.com/clbanning/mxj/misc.go | 0 .../github.com/clbanning/mxj/misc_test.go | 0 .../github.com/clbanning/mxj/mxj.go | 0 .../github.com/clbanning/mxj/mxj_test.go | 0 .../clbanning/mxj/namespace_test.go | 0 .../github.com/clbanning/mxj/nan_test.go | 0 .../github.com/clbanning/mxj/newmap.go | 0 .../github.com/clbanning/mxj/newmap_test.go | 0 .../github.com/clbanning/mxj/readme.md | 0 .../github.com/clbanning/mxj/remove.go | 0 .../github.com/clbanning/mxj/remove_test.go | 0 .../github.com/clbanning/mxj/rename.go | 0 .../github.com/clbanning/mxj/rename_test.go | 0 .../github.com/clbanning/mxj/seqnum_test.go | 0 .../github.com/clbanning/mxj/set.go | 0 .../github.com/clbanning/mxj/set_test.go | 0 .../github.com/clbanning/mxj/setfieldsep.go | 0 .../clbanning/mxj/snakecase_test.go | 0 .../github.com/clbanning/mxj/songtext.xml | 0 .../github.com/clbanning/mxj/strict.go | 0 .../github.com/clbanning/mxj/strict_test.go | 0 .../github.com/clbanning/mxj/struct.go | 4 +-- .../github.com/clbanning/mxj/struct_test.go | 0 .../github.com/clbanning/mxj/updatevalues.go | 0 .../clbanning/mxj/updatevalues_test.go | 0 .../clbanning/mxj/x2j-wrapper/LICENSE | 0 .../clbanning/mxj/x2j-wrapper/README | 0 .../mxj/x2j-wrapper/atomFeedString.xml | 0 .../clbanning/mxj/x2j-wrapper/goofy_test.go | 0 .../mxj/x2j-wrapper/pathTestString.xml | 0 .../clbanning/mxj/x2j-wrapper/reader2j.go | 2 +- .../mxj/x2j-wrapper/reader2j_test.go | 0 .../mxj/x2j-wrapper/songTextString.xml | 0 .../clbanning/mxj/x2j-wrapper/x2j.go | 2 +- .../clbanning/mxj/x2j-wrapper/x2j_bulk.go | 2 +- .../clbanning/mxj/x2j-wrapper/x2j_findPath.go | 2 +- .../clbanning/mxj/x2j-wrapper/x2j_test.go | 0 .../clbanning/mxj/x2j-wrapper/x2j_test.xml | 0 .../clbanning/mxj/x2j-wrapper/x2j_valuesAt.go | 2 +- .../mxj/x2j-wrapper/x2j_valuesFrom.go | 2 +- .../clbanning/mxj/x2j-wrapper/x2jat_test.go | 0 .../mxj/x2j-wrapper/x2jfindPath_test.go | 0 .../clbanning/mxj/x2j-wrapper/x2jpath_test.go | 0 .../mxj/x2j-wrapper/x2junmarshal_test.go | 0 .../clbanning/mxj/x2j-wrapper/x2m_bulk.go | 2 +- .../clbanning/mxj/x2j-wrapper/x2m_bulk.xml | 0 .../clbanning/mxj/x2j-wrapper/xml.go | 0 .../github.com/clbanning/mxj/x2j/x2j.go | 3 ++- .../github.com/clbanning/mxj/xml.go | 0 .../github.com/clbanning/mxj/xml2_test.go | 0 .../github.com/clbanning/mxj/xml3_test.go | 0 .../github.com/clbanning/mxj/xml_test.go | 0 .../github.com/clbanning/mxj/xmlseq.go | 0 .../github.com/clbanning/mxj/xmlseq_test.go | 0 .../clbanning/mxj/xmppStream_test.go | 0 .../github.com/fatih/structs/.gitignore | 0 .../github.com/fatih/structs/.travis.yml | 0 .../github.com/fatih/structs/LICENSE | 0 .../github.com/fatih/structs/README.md | 0 .../github.com/fatih/structs/field.go | 0 .../github.com/fatih/structs/field_test.go | 0 .../github.com/fatih/structs/structs.go | 0 .../fatih/structs/structs_example_test.go | 0 .../github.com/fatih/structs/structs_test.go | 0 .../github.com/fatih/structs/tags.go | 0 .../github.com/fatih/structs/tags_test.go | 0 .../fsnotify/fsnotify/.editorconfig | 0 .../github.com/fsnotify/fsnotify/.gitignore | 0 .../github.com/fsnotify/fsnotify/.travis.yml | 0 .../github.com/fsnotify/fsnotify/AUTHORS | 0 .../github.com/fsnotify/fsnotify/CHANGELOG.md | 0 .../fsnotify/fsnotify/CONTRIBUTING.md | 0 .../github.com/fsnotify/fsnotify/LICENSE | 0 .../github.com/fsnotify/fsnotify/README.md | 0 .../fsnotify/fsnotify/example_test.go | 2 +- .../github.com/fsnotify/fsnotify/fen.go | 0 .../github.com/fsnotify/fsnotify/fsnotify.go | 0 .../fsnotify/fsnotify/fsnotify_test.go | 0 .../github.com/fsnotify/fsnotify/inotify.go | 2 +- .../fsnotify/fsnotify/inotify_poller.go | 2 +- .../fsnotify/fsnotify/inotify_poller_test.go | 2 +- .../fsnotify/fsnotify/inotify_test.go | 0 .../fsnotify/integration_darwin_test.go | 2 +- .../fsnotify/fsnotify/integration_test.go | 0 .../github.com/fsnotify/fsnotify/kqueue.go | 2 +- .../fsnotify/fsnotify/open_mode_bsd.go | 2 +- .../fsnotify/fsnotify/open_mode_darwin.go | 2 +- .../github.com/fsnotify/fsnotify/windows.go | 0 .../github.com/gf-third/mysql/AUTHORS | 0 .../github.com/gf-third/mysql/CHANGELOG.md | 0 .../github.com/gf-third/mysql/CONTRIBUTING.md | 0 .../github.com/gf-third/mysql/LICENSE | 0 .../github.com/gf-third/mysql/README.md | 0 .../github.com/gf-third/mysql/appengine.go | 0 .../github.com/gf-third/mysql/auth.go | 0 .../github.com/gf-third/mysql/auth_test.go | 0 .../gf-third/mysql/benchmark_test.go | 0 .../github.com/gf-third/mysql/buffer.go | 0 .../github.com/gf-third/mysql/collations.go | 0 .../github.com/gf-third/mysql/conncheck.go | 0 .../gf-third/mysql/conncheck_dummy.go | 0 .../gf-third/mysql/conncheck_test.go | 0 .../github.com/gf-third/mysql/connection.go | 0 .../gf-third/mysql/connection_test.go | 0 .../github.com/gf-third/mysql/connector.go | 0 .../github.com/gf-third/mysql/const.go | 0 .../github.com/gf-third/mysql/driver.go | 0 .../github.com/gf-third/mysql/driver_go110.go | 0 .../gf-third/mysql/driver_go110_test.go | 0 .../github.com/gf-third/mysql/driver_test.go | 0 .../github.com/gf-third/mysql/dsn.go | 0 .../github.com/gf-third/mysql/dsn_test.go | 0 .../github.com/gf-third/mysql/errors.go | 0 .../github.com/gf-third/mysql/errors_test.go | 0 .../github.com/gf-third/mysql/fields.go | 0 .../github.com/gf-third/mysql/infile.go | 0 .../github.com/gf-third/mysql/packets.go | 0 .../github.com/gf-third/mysql/packets_test.go | 0 .../github.com/gf-third/mysql/result.go | 0 .../github.com/gf-third/mysql/rows.go | 0 .../github.com/gf-third/mysql/statement.go | 0 .../gf-third/mysql/statement_test.go | 0 .../github.com/gf-third/mysql/transaction.go | 0 .../github.com/gf-third/mysql/utils.go | 0 .../github.com/gf-third/mysql/utils_test.go | 0 .../github.com/ghodss/yaml/.gitignore | 0 .../github.com/ghodss/yaml/.travis.yml | 0 .../github.com/ghodss/yaml/LICENSE | 0 .../github.com/ghodss/yaml/README.md | 6 ++--- .../github.com/ghodss/yaml/fields.go | 0 .../github.com/ghodss/yaml/yaml.go | 2 +- .../github.com/ghodss/yaml/yaml_test.go | 0 .../github.com/gomodule/redigo/.travis.yml | 0 .../github.com/gomodule/redigo/LICENSE | 0 .../gomodule/redigo/README.markdown | 0 .../gomodule/redigo/internal/commandinfo.go | 2 +- .../redigo/internal/commandinfo_test.go | 0 .../redigo/internal/redistest/testdb.go | 2 +- .../github.com/gomodule/redigo/redis/conn.go | 0 .../gomodule/redigo/redis/conn_test.go | 2 +- .../github.com/gomodule/redigo/redis/doc.go | 2 +- .../github.com/gomodule/redigo/redis/go16.go | 0 .../github.com/gomodule/redigo/redis/go17.go | 0 .../github.com/gomodule/redigo/redis/go18.go | 0 .../gomodule/redigo/redis/list_test.go | 0 .../github.com/gomodule/redigo/redis/log.go | 0 .../github.com/gomodule/redigo/redis/pool.go | 2 +- .../gomodule/redigo/redis/pool17.go | 0 .../gomodule/redigo/redis/pool17_test.go | 2 +- .../gomodule/redigo/redis/pool_test.go | 2 +- .../gomodule/redigo/redis/pubsub.go | 0 .../redigo/redis/pubsub_example_test.go | 2 +- .../gomodule/redigo/redis/pubsub_test.go | 2 +- .../github.com/gomodule/redigo/redis/redis.go | 0 .../gomodule/redigo/redis/redis_test.go | 2 +- .../github.com/gomodule/redigo/redis/reply.go | 0 .../gomodule/redigo/redis/reply_test.go | 2 +- .../github.com/gomodule/redigo/redis/scan.go | 0 .../gomodule/redigo/redis/scan_test.go | 2 +- .../gomodule/redigo/redis/script.go | 0 .../gomodule/redigo/redis/script_test.go | 2 +- .../gomodule/redigo/redis/test_test.go | 0 .../redigo/redis/zpop_example_test.go | 2 +- .../gomodule/redigo/redisx/connmux.go | 4 +-- .../gomodule/redigo/redisx/connmux_test.go | 6 ++--- .../github.com/gomodule/redigo/redisx/doc.go | 2 +- .../github.com/gorilla/websocket/.gitignore | 0 .../github.com/gorilla/websocket/.travis.yml | 0 .../github.com/gorilla/websocket/AUTHORS | 0 .../github.com/gorilla/websocket/LICENSE | 0 .../github.com/gorilla/websocket/README.md | 0 .../github.com/gorilla/websocket/client.go | 0 .../gorilla/websocket/client_clone.go | 0 .../gorilla/websocket/client_clone_legacy.go | 0 .../gorilla/websocket/client_server_test.go | 0 .../gorilla/websocket/client_test.go | 0 .../gorilla/websocket/compression.go | 0 .../gorilla/websocket/compression_test.go | 0 .../github.com/gorilla/websocket/conn.go | 0 .../gorilla/websocket/conn_broadcast_test.go | 0 .../github.com/gorilla/websocket/conn_read.go | 0 .../gorilla/websocket/conn_read_legacy.go | 0 .../github.com/gorilla/websocket/conn_test.go | 0 .../gorilla/websocket/conn_write.go | 0 .../gorilla/websocket/conn_write_legacy.go | 0 .../github.com/gorilla/websocket/doc.go | 0 .../gorilla/websocket/example_test.go | 2 +- .../github.com/gorilla/websocket/json.go | 0 .../github.com/gorilla/websocket/json_test.go | 0 .../github.com/gorilla/websocket/mask.go | 0 .../github.com/gorilla/websocket/mask_safe.go | 0 .../github.com/gorilla/websocket/mask_test.go | 0 .../github.com/gorilla/websocket/prepared.go | 0 .../gorilla/websocket/prepared_test.go | 0 .../github.com/gorilla/websocket/proxy.go | 0 .../github.com/gorilla/websocket/server.go | 0 .../gorilla/websocket/server_test.go | 0 .../github.com/gorilla/websocket/util.go | 0 .../github.com/gorilla/websocket/util_test.go | 0 .../gorilla/websocket/x_net_proxy.go | 0 .../html-strip-tags-go/.codeclimate.yml | 0 .../grokify/html-strip-tags-go/.travis.yml | 0 .../grokify/html-strip-tags-go/LICENSE | 0 .../grokify/html-strip-tags-go/PATENTS | 0 .../grokify/html-strip-tags-go/README.md | 2 +- .../grokify/html-strip-tags-go/strip.go | 0 .../grokify/html-strip-tags-go/strip_test.go | 0 .../github.com/mattn/go-runewidth/.travis.yml | 0 .../github.com/mattn/go-runewidth/LICENSE | 0 .../github.com/mattn/go-runewidth/README.mkd | 0 .../mattn/go-runewidth/runewidth.go | 0 .../mattn/go-runewidth/runewidth_js.go | 0 .../mattn/go-runewidth/runewidth_posix.go | 0 .../go-runewidth/runewidth_posix_test.go | 0 .../mattn/go-runewidth/runewidth_test.go | 0 .../mattn/go-runewidth/runewidth_windows.go | 0 .../olekukonko/tablewriter/.gitignore | 0 .../olekukonko/tablewriter/.travis.yml | 0 .../olekukonko/tablewriter/LICENCE.md | 0 .../olekukonko/tablewriter/README.md | 0 .../github.com/olekukonko/tablewriter/csv.go | 0 .../tablewriter/csv2table/README.md | 0 .../tablewriter/csv2table/csv2table.go | 2 +- .../olekukonko/tablewriter/table.go | 0 .../olekukonko/tablewriter/table_test.go | 0 .../tablewriter/table_with_color.go | 0 .../github.com/olekukonko/tablewriter/util.go | 2 +- .../github.com/olekukonko/tablewriter/wrap.go | 2 +- .../olekukonko/tablewriter/wrap_test.go | 2 +- .../github.com/stathat/go/.gitignore | 0 .../thirdparty}/github.com/stathat/go/LICENSE | 0 .../github.com/stathat/go/README.md | 0 .../github.com/stathat/go/example_test.go | 0 .../github.com/stathat/go/stathat.go | 0 .../github.com/stathat/go/stathat_test.go | 0 .../github.com/theckman/go-flock/LICENSE | 0 .../github.com/theckman/go-flock/README.md | 2 +- .../github.com/theckman/go-flock/flock.go | 0 .../theckman/go-flock/flock_unix.go | 0 .../theckman/go-flock/flock_winapi.go | 0 .../theckman/go-flock/flock_windows.go | 0 .../thirdparty}/golang.org/x/sys/AUTHORS | 0 .../golang.org/x/sys/CONTRIBUTING.md | 0 .../thirdparty}/golang.org/x/sys/CONTRIBUTORS | 0 .../thirdparty}/golang.org/x/sys/LICENSE | 0 .../thirdparty}/golang.org/x/sys/PATENTS | 0 .../thirdparty}/golang.org/x/sys/README.md | 0 .../golang.org/x/sys/codereview.cfg | 0 .../thirdparty}/golang.org/x/sys/cpu/cpu.go | 0 .../golang.org/x/sys/cpu/cpu_arm.go | 0 .../golang.org/x/sys/cpu/cpu_arm64.go | 0 .../golang.org/x/sys/cpu/cpu_gc_x86.go | 0 .../golang.org/x/sys/cpu/cpu_gccgo.c | 0 .../golang.org/x/sys/cpu/cpu_gccgo.go | 0 .../golang.org/x/sys/cpu/cpu_linux.go | 0 .../golang.org/x/sys/cpu/cpu_mips64x.go | 0 .../golang.org/x/sys/cpu/cpu_mipsx.go | 0 .../golang.org/x/sys/cpu/cpu_ppc64x.go | 0 .../golang.org/x/sys/cpu/cpu_s390x.go | 0 .../golang.org/x/sys/cpu/cpu_test.go | 2 +- .../golang.org/x/sys/cpu/cpu_x86.go | 0 .../golang.org/x/sys/cpu/cpu_x86.s | 0 .../thirdparty}/golang.org/x/sys/plan9/asm.s | 0 .../golang.org/x/sys/plan9/asm_plan9_386.s | 0 .../golang.org/x/sys/plan9/asm_plan9_amd64.s | 0 .../golang.org/x/sys/plan9/asm_plan9_arm.s | 0 .../golang.org/x/sys/plan9/const_plan9.go | 0 .../golang.org/x/sys/plan9/dir_plan9.go | 0 .../golang.org/x/sys/plan9/env_plan9.go | 0 .../golang.org/x/sys/plan9/errors_plan9.go | 0 .../golang.org/x/sys/plan9/mkall.sh | 0 .../golang.org/x/sys/plan9/mkerrors.sh | 0 .../golang.org/x/sys/plan9/mksyscall.go | 0 .../golang.org/x/sys/plan9/mksysnum_plan9.sh | 0 .../golang.org/x/sys/plan9/pwd_go15_plan9.go | 0 .../golang.org/x/sys/plan9/pwd_plan9.go | 0 .../golang.org/x/sys/plan9/race.go | 0 .../golang.org/x/sys/plan9/race0.go | 0 .../thirdparty}/golang.org/x/sys/plan9/str.go | 0 .../golang.org/x/sys/plan9/syscall.go | 2 +- .../golang.org/x/sys/plan9/syscall_plan9.go | 0 .../golang.org/x/sys/plan9/syscall_test.go | 2 +- .../x/sys/plan9/zsyscall_plan9_386.go | 0 .../x/sys/plan9/zsyscall_plan9_amd64.go | 0 .../x/sys/plan9/zsyscall_plan9_arm.go | 0 .../golang.org/x/sys/plan9/zsysnum_plan9.go | 0 .../golang.org/x/sys/unix/.gitignore | 0 .../golang.org/x/sys/unix/README.md | 0 .../golang.org/x/sys/unix/affinity_linux.go | 0 .../golang.org/x/sys/unix/aliases.go | 0 .../golang.org/x/sys/unix/asm_aix_ppc64.s | 0 .../golang.org/x/sys/unix/asm_darwin_386.s | 0 .../golang.org/x/sys/unix/asm_darwin_amd64.s | 0 .../golang.org/x/sys/unix/asm_darwin_arm.s | 0 .../golang.org/x/sys/unix/asm_darwin_arm64.s | 0 .../x/sys/unix/asm_dragonfly_amd64.s | 0 .../golang.org/x/sys/unix/asm_freebsd_386.s | 0 .../golang.org/x/sys/unix/asm_freebsd_amd64.s | 0 .../golang.org/x/sys/unix/asm_freebsd_arm.s | 0 .../golang.org/x/sys/unix/asm_freebsd_arm64.s | 0 .../golang.org/x/sys/unix/asm_linux_386.s | 0 .../golang.org/x/sys/unix/asm_linux_amd64.s | 0 .../golang.org/x/sys/unix/asm_linux_arm.s | 0 .../golang.org/x/sys/unix/asm_linux_arm64.s | 0 .../golang.org/x/sys/unix/asm_linux_mips64x.s | 0 .../golang.org/x/sys/unix/asm_linux_mipsx.s | 0 .../golang.org/x/sys/unix/asm_linux_ppc64x.s | 0 .../golang.org/x/sys/unix/asm_linux_s390x.s | 0 .../golang.org/x/sys/unix/asm_netbsd_386.s | 0 .../golang.org/x/sys/unix/asm_netbsd_amd64.s | 0 .../golang.org/x/sys/unix/asm_netbsd_arm.s | 0 .../golang.org/x/sys/unix/asm_netbsd_arm64.s | 0 .../golang.org/x/sys/unix/asm_openbsd_386.s | 0 .../golang.org/x/sys/unix/asm_openbsd_amd64.s | 0 .../golang.org/x/sys/unix/asm_openbsd_arm.s | 0 .../golang.org/x/sys/unix/asm_solaris_amd64.s | 0 .../golang.org/x/sys/unix/bluetooth_linux.go | 0 .../golang.org/x/sys/unix/cap_freebsd.go | 0 .../golang.org/x/sys/unix/constants.go | 0 .../golang.org/x/sys/unix/creds_test.go | 2 +- .../golang.org/x/sys/unix/darwin_test.go | 0 .../golang.org/x/sys/unix/dev_aix_ppc.go | 0 .../golang.org/x/sys/unix/dev_aix_ppc64.go | 0 .../golang.org/x/sys/unix/dev_darwin.go | 0 .../golang.org/x/sys/unix/dev_dragonfly.go | 0 .../golang.org/x/sys/unix/dev_freebsd.go | 0 .../golang.org/x/sys/unix/dev_linux.go | 0 .../golang.org/x/sys/unix/dev_linux_test.go | 2 +- .../golang.org/x/sys/unix/dev_netbsd.go | 0 .../golang.org/x/sys/unix/dev_openbsd.go | 0 .../golang.org/x/sys/unix/dirent.go | 0 .../golang.org/x/sys/unix/endian_big.go | 0 .../golang.org/x/sys/unix/endian_little.go | 0 .../golang.org/x/sys/unix/env_unix.go | 0 .../x/sys/unix/errors_freebsd_386.go | 0 .../x/sys/unix/errors_freebsd_amd64.go | 0 .../x/sys/unix/errors_freebsd_arm.go | 0 .../x/sys/unix/example_exec_test.go | 2 +- .../x/sys/unix/example_flock_test.go | 2 +- .../golang.org/x/sys/unix/export_test.go | 0 .../golang.org/x/sys/unix/fcntl.go | 0 .../golang.org/x/sys/unix/fcntl_darwin.go | 0 .../x/sys/unix/fcntl_linux_32bit.go | 0 .../golang.org/x/sys/unix/gccgo.go | 0 .../golang.org/x/sys/unix/gccgo_c.c | 0 .../x/sys/unix/gccgo_linux_amd64.go | 0 .../golang.org/x/sys/unix/ioctl.go | 0 .../golang.org/x/sys/unix/linux/Dockerfile | 0 .../golang.org/x/sys/unix/linux/mkall.go | 0 .../golang.org/x/sys/unix/linux/mksysnum.go | 0 .../golang.org/x/sys/unix/linux/types.go | 0 .../golang.org/x/sys/unix/mkall.sh | 0 .../golang.org/x/sys/unix/mkasm_darwin.go | 0 .../golang.org/x/sys/unix/mkerrors.sh | 0 .../golang.org/x/sys/unix/mkpost.go | 0 .../golang.org/x/sys/unix/mksyscall.go | 0 .../x/sys/unix/mksyscall_aix_ppc.go | 2 +- .../x/sys/unix/mksyscall_aix_ppc64.go | 2 +- .../x/sys/unix/mksyscall_solaris.pl | 2 +- .../golang.org/x/sys/unix/mksysctl_openbsd.pl | 0 .../golang.org/x/sys/unix/mksysnum.go | 0 .../golang.org/x/sys/unix/mmap_unix_test.go | 2 +- .../golang.org/x/sys/unix/openbsd_pledge.go | 0 .../golang.org/x/sys/unix/openbsd_test.go | 2 +- .../golang.org/x/sys/unix/openbsd_unveil.go | 0 .../golang.org/x/sys/unix/pagesize_unix.go | 0 .../thirdparty}/golang.org/x/sys/unix/race.go | 0 .../golang.org/x/sys/unix/race0.go | 0 .../golang.org/x/sys/unix/sendfile_test.go | 2 +- .../golang.org/x/sys/unix/sockcmsg_linux.go | 0 .../golang.org/x/sys/unix/sockcmsg_unix.go | 0 .../thirdparty}/golang.org/x/sys/unix/str.go | 0 .../golang.org/x/sys/unix/syscall.go | 2 +- .../golang.org/x/sys/unix/syscall_aix.go | 0 .../golang.org/x/sys/unix/syscall_aix_ppc.go | 0 .../x/sys/unix/syscall_aix_ppc64.go | 0 .../golang.org/x/sys/unix/syscall_aix_test.go | 2 +- .../golang.org/x/sys/unix/syscall_bsd.go | 0 .../golang.org/x/sys/unix/syscall_bsd_test.go | 2 +- .../golang.org/x/sys/unix/syscall_darwin.go | 0 .../x/sys/unix/syscall_darwin_386.go | 0 .../x/sys/unix/syscall_darwin_amd64.go | 0 .../x/sys/unix/syscall_darwin_arm.go | 0 .../x/sys/unix/syscall_darwin_arm64.go | 0 .../x/sys/unix/syscall_darwin_libSystem.go | 0 .../x/sys/unix/syscall_darwin_test.go | 2 +- .../x/sys/unix/syscall_dragonfly.go | 0 .../x/sys/unix/syscall_dragonfly_amd64.go | 0 .../golang.org/x/sys/unix/syscall_freebsd.go | 0 .../x/sys/unix/syscall_freebsd_386.go | 0 .../x/sys/unix/syscall_freebsd_amd64.go | 0 .../x/sys/unix/syscall_freebsd_arm.go | 0 .../x/sys/unix/syscall_freebsd_arm64.go | 0 .../x/sys/unix/syscall_freebsd_test.go | 2 +- .../golang.org/x/sys/unix/syscall_linux.go | 0 .../x/sys/unix/syscall_linux_386.go | 0 .../x/sys/unix/syscall_linux_amd64.go | 0 .../x/sys/unix/syscall_linux_amd64_gc.go | 0 .../x/sys/unix/syscall_linux_arm.go | 0 .../x/sys/unix/syscall_linux_arm64.go | 0 .../golang.org/x/sys/unix/syscall_linux_gc.go | 0 .../x/sys/unix/syscall_linux_gc_386.go | 0 .../x/sys/unix/syscall_linux_gccgo_386.go | 0 .../x/sys/unix/syscall_linux_gccgo_arm.go | 0 .../x/sys/unix/syscall_linux_mips64x.go | 0 .../x/sys/unix/syscall_linux_mipsx.go | 0 .../x/sys/unix/syscall_linux_ppc64x.go | 0 .../x/sys/unix/syscall_linux_riscv64.go | 0 .../x/sys/unix/syscall_linux_s390x.go | 0 .../x/sys/unix/syscall_linux_sparc64.go | 0 .../x/sys/unix/syscall_linux_test.go | 2 +- .../golang.org/x/sys/unix/syscall_netbsd.go | 0 .../x/sys/unix/syscall_netbsd_386.go | 0 .../x/sys/unix/syscall_netbsd_amd64.go | 0 .../x/sys/unix/syscall_netbsd_arm.go | 0 .../x/sys/unix/syscall_netbsd_arm64.go | 0 .../x/sys/unix/syscall_netbsd_test.go | 2 +- .../golang.org/x/sys/unix/syscall_openbsd.go | 0 .../x/sys/unix/syscall_openbsd_386.go | 0 .../x/sys/unix/syscall_openbsd_amd64.go | 0 .../x/sys/unix/syscall_openbsd_arm.go | 0 .../x/sys/unix/syscall_openbsd_test.go | 2 +- .../golang.org/x/sys/unix/syscall_solaris.go | 0 .../x/sys/unix/syscall_solaris_amd64.go | 0 .../x/sys/unix/syscall_solaris_test.go | 2 +- .../golang.org/x/sys/unix/syscall_test.go | 2 +- .../golang.org/x/sys/unix/syscall_unix.go | 0 .../golang.org/x/sys/unix/syscall_unix_gc.go | 0 .../x/sys/unix/syscall_unix_gc_ppc64x.go | 0 .../x/sys/unix/syscall_unix_test.go | 2 +- .../golang.org/x/sys/unix/timestruct.go | 0 .../golang.org/x/sys/unix/timestruct_test.go | 2 +- .../golang.org/x/sys/unix/types_aix.go | 0 .../golang.org/x/sys/unix/types_darwin.go | 0 .../golang.org/x/sys/unix/types_dragonfly.go | 0 .../golang.org/x/sys/unix/types_freebsd.go | 0 .../golang.org/x/sys/unix/types_netbsd.go | 0 .../golang.org/x/sys/unix/types_openbsd.go | 0 .../golang.org/x/sys/unix/types_solaris.go | 0 .../golang.org/x/sys/unix/xattr_bsd.go | 0 .../golang.org/x/sys/unix/xattr_test.go | 2 +- .../golang.org/x/sys/unix/zerrors_aix_ppc.go | 0 .../x/sys/unix/zerrors_aix_ppc64.go | 0 .../x/sys/unix/zerrors_darwin_386.go | 0 .../x/sys/unix/zerrors_darwin_amd64.go | 0 .../x/sys/unix/zerrors_darwin_arm.go | 0 .../x/sys/unix/zerrors_darwin_arm64.go | 0 .../x/sys/unix/zerrors_dragonfly_amd64.go | 0 .../x/sys/unix/zerrors_freebsd_386.go | 0 .../x/sys/unix/zerrors_freebsd_amd64.go | 0 .../x/sys/unix/zerrors_freebsd_arm.go | 0 .../x/sys/unix/zerrors_freebsd_arm64.go | 0 .../x/sys/unix/zerrors_linux_386.go | 0 .../x/sys/unix/zerrors_linux_amd64.go | 0 .../x/sys/unix/zerrors_linux_arm.go | 0 .../x/sys/unix/zerrors_linux_arm64.go | 0 .../x/sys/unix/zerrors_linux_mips.go | 0 .../x/sys/unix/zerrors_linux_mips64.go | 0 .../x/sys/unix/zerrors_linux_mips64le.go | 0 .../x/sys/unix/zerrors_linux_mipsle.go | 0 .../x/sys/unix/zerrors_linux_ppc64.go | 0 .../x/sys/unix/zerrors_linux_ppc64le.go | 0 .../x/sys/unix/zerrors_linux_riscv64.go | 0 .../x/sys/unix/zerrors_linux_s390x.go | 0 .../x/sys/unix/zerrors_linux_sparc64.go | 0 .../x/sys/unix/zerrors_netbsd_386.go | 0 .../x/sys/unix/zerrors_netbsd_amd64.go | 0 .../x/sys/unix/zerrors_netbsd_arm.go | 0 .../x/sys/unix/zerrors_netbsd_arm64.go | 0 .../x/sys/unix/zerrors_openbsd_386.go | 0 .../x/sys/unix/zerrors_openbsd_amd64.go | 0 .../x/sys/unix/zerrors_openbsd_arm.go | 0 .../x/sys/unix/zerrors_solaris_amd64.go | 0 .../golang.org/x/sys/unix/zptrace386_linux.go | 0 .../golang.org/x/sys/unix/zptracearm_linux.go | 0 .../x/sys/unix/zptracemips_linux.go | 0 .../x/sys/unix/zptracemipsle_linux.go | 0 .../golang.org/x/sys/unix/zsyscall_aix_ppc.go | 0 .../x/sys/unix/zsyscall_aix_ppc64.go | 0 .../x/sys/unix/zsyscall_aix_ppc64_gc.go | 0 .../x/sys/unix/zsyscall_aix_ppc64_gccgo.go | 0 .../x/sys/unix/zsyscall_darwin_386.1_11.go | 0 .../x/sys/unix/zsyscall_darwin_386.go | 0 .../x/sys/unix/zsyscall_darwin_386.s | 0 .../x/sys/unix/zsyscall_darwin_amd64.1_11.go | 0 .../x/sys/unix/zsyscall_darwin_amd64.go | 0 .../x/sys/unix/zsyscall_darwin_amd64.s | 0 .../x/sys/unix/zsyscall_darwin_arm.1_11.go | 0 .../x/sys/unix/zsyscall_darwin_arm.go | 0 .../x/sys/unix/zsyscall_darwin_arm.s | 0 .../x/sys/unix/zsyscall_darwin_arm64.1_11.go | 0 .../x/sys/unix/zsyscall_darwin_arm64.go | 0 .../x/sys/unix/zsyscall_darwin_arm64.s | 0 .../x/sys/unix/zsyscall_dragonfly_amd64.go | 0 .../x/sys/unix/zsyscall_freebsd_386.go | 0 .../x/sys/unix/zsyscall_freebsd_amd64.go | 0 .../x/sys/unix/zsyscall_freebsd_arm.go | 0 .../x/sys/unix/zsyscall_freebsd_arm64.go | 0 .../x/sys/unix/zsyscall_linux_386.go | 0 .../x/sys/unix/zsyscall_linux_amd64.go | 0 .../x/sys/unix/zsyscall_linux_arm.go | 0 .../x/sys/unix/zsyscall_linux_arm64.go | 0 .../x/sys/unix/zsyscall_linux_mips.go | 0 .../x/sys/unix/zsyscall_linux_mips64.go | 0 .../x/sys/unix/zsyscall_linux_mips64le.go | 0 .../x/sys/unix/zsyscall_linux_mipsle.go | 0 .../x/sys/unix/zsyscall_linux_ppc64.go | 0 .../x/sys/unix/zsyscall_linux_ppc64le.go | 0 .../x/sys/unix/zsyscall_linux_riscv64.go | 0 .../x/sys/unix/zsyscall_linux_s390x.go | 0 .../x/sys/unix/zsyscall_linux_sparc64.go | 0 .../x/sys/unix/zsyscall_netbsd_386.go | 0 .../x/sys/unix/zsyscall_netbsd_amd64.go | 0 .../x/sys/unix/zsyscall_netbsd_arm.go | 0 .../x/sys/unix/zsyscall_netbsd_arm64.go | 0 .../x/sys/unix/zsyscall_openbsd_386.go | 0 .../x/sys/unix/zsyscall_openbsd_amd64.go | 0 .../x/sys/unix/zsyscall_openbsd_arm.go | 0 .../x/sys/unix/zsyscall_solaris_amd64.go | 0 .../x/sys/unix/zsysctl_openbsd_386.go | 0 .../x/sys/unix/zsysctl_openbsd_amd64.go | 0 .../x/sys/unix/zsysctl_openbsd_arm.go | 0 .../x/sys/unix/zsysnum_darwin_386.go | 0 .../x/sys/unix/zsysnum_darwin_amd64.go | 0 .../x/sys/unix/zsysnum_darwin_arm.go | 0 .../x/sys/unix/zsysnum_darwin_arm64.go | 0 .../x/sys/unix/zsysnum_dragonfly_amd64.go | 0 .../x/sys/unix/zsysnum_freebsd_386.go | 0 .../x/sys/unix/zsysnum_freebsd_amd64.go | 0 .../x/sys/unix/zsysnum_freebsd_arm.go | 0 .../x/sys/unix/zsysnum_freebsd_arm64.go | 0 .../x/sys/unix/zsysnum_linux_386.go | 0 .../x/sys/unix/zsysnum_linux_amd64.go | 0 .../x/sys/unix/zsysnum_linux_arm.go | 0 .../x/sys/unix/zsysnum_linux_arm64.go | 0 .../x/sys/unix/zsysnum_linux_mips.go | 0 .../x/sys/unix/zsysnum_linux_mips64.go | 0 .../x/sys/unix/zsysnum_linux_mips64le.go | 0 .../x/sys/unix/zsysnum_linux_mipsle.go | 0 .../x/sys/unix/zsysnum_linux_ppc64.go | 0 .../x/sys/unix/zsysnum_linux_ppc64le.go | 0 .../x/sys/unix/zsysnum_linux_riscv64.go | 0 .../x/sys/unix/zsysnum_linux_s390x.go | 0 .../x/sys/unix/zsysnum_linux_sparc64.go | 0 .../x/sys/unix/zsysnum_netbsd_386.go | 0 .../x/sys/unix/zsysnum_netbsd_amd64.go | 0 .../x/sys/unix/zsysnum_netbsd_arm.go | 0 .../x/sys/unix/zsysnum_netbsd_arm64.go | 0 .../x/sys/unix/zsysnum_openbsd_386.go | 0 .../x/sys/unix/zsysnum_openbsd_amd64.go | 0 .../x/sys/unix/zsysnum_openbsd_arm.go | 0 .../golang.org/x/sys/unix/ztypes_aix_ppc.go | 0 .../golang.org/x/sys/unix/ztypes_aix_ppc64.go | 0 .../x/sys/unix/ztypes_darwin_386.go | 0 .../x/sys/unix/ztypes_darwin_amd64.go | 0 .../x/sys/unix/ztypes_darwin_arm.go | 0 .../x/sys/unix/ztypes_darwin_arm64.go | 0 .../x/sys/unix/ztypes_dragonfly_amd64.go | 0 .../x/sys/unix/ztypes_freebsd_386.go | 0 .../x/sys/unix/ztypes_freebsd_amd64.go | 0 .../x/sys/unix/ztypes_freebsd_arm.go | 0 .../x/sys/unix/ztypes_freebsd_arm64.go | 0 .../golang.org/x/sys/unix/ztypes_linux_386.go | 0 .../x/sys/unix/ztypes_linux_amd64.go | 0 .../golang.org/x/sys/unix/ztypes_linux_arm.go | 0 .../x/sys/unix/ztypes_linux_arm64.go | 0 .../x/sys/unix/ztypes_linux_mips.go | 0 .../x/sys/unix/ztypes_linux_mips64.go | 0 .../x/sys/unix/ztypes_linux_mips64le.go | 0 .../x/sys/unix/ztypes_linux_mipsle.go | 0 .../x/sys/unix/ztypes_linux_ppc64.go | 0 .../x/sys/unix/ztypes_linux_ppc64le.go | 0 .../x/sys/unix/ztypes_linux_riscv64.go | 0 .../x/sys/unix/ztypes_linux_s390x.go | 0 .../x/sys/unix/ztypes_linux_sparc64.go | 0 .../x/sys/unix/ztypes_netbsd_386.go | 0 .../x/sys/unix/ztypes_netbsd_amd64.go | 0 .../x/sys/unix/ztypes_netbsd_arm.go | 0 .../x/sys/unix/ztypes_netbsd_arm64.go | 0 .../x/sys/unix/ztypes_openbsd_386.go | 0 .../x/sys/unix/ztypes_openbsd_amd64.go | 0 .../x/sys/unix/ztypes_openbsd_arm.go | 0 .../x/sys/unix/ztypes_solaris_amd64.go | 0 .../golang.org/x/sys/windows/aliases.go | 0 .../x/sys/windows/asm_windows_386.s | 0 .../x/sys/windows/asm_windows_amd64.s | 0 .../x/sys/windows/asm_windows_arm.s | 0 .../golang.org/x/sys/windows/dll_windows.go | 0 .../golang.org/x/sys/windows/env_windows.go | 0 .../golang.org/x/sys/windows/eventlog.go | 0 .../golang.org/x/sys/windows/exec_windows.go | 0 .../x/sys/windows/memory_windows.go | 0 .../golang.org/x/sys/windows/mksyscall.go | 0 .../golang.org/x/sys/windows/race.go | 0 .../golang.org/x/sys/windows/race0.go | 0 .../x/sys/windows/registry/export_test.go | 0 .../golang.org/x/sys/windows/registry/key.go | 0 .../x/sys/windows/registry/mksyscall.go | 0 .../x/sys/windows/registry/registry_test.go | 2 +- .../x/sys/windows/registry/syscall.go | 0 .../x/sys/windows/registry/value.go | 0 .../sys/windows/registry/zsyscall_windows.go | 2 +- .../x/sys/windows/security_windows.go | 0 .../golang.org/x/sys/windows/service.go | 0 .../golang.org/x/sys/windows/str.go | 0 .../golang.org/x/sys/windows/svc/debug/log.go | 0 .../x/sys/windows/svc/debug/service.go | 2 +- .../golang.org/x/sys/windows/svc/event.go | 2 +- .../x/sys/windows/svc/eventlog/install.go | 4 +-- .../x/sys/windows/svc/eventlog/log.go | 2 +- .../x/sys/windows/svc/eventlog/log_test.go | 2 +- .../x/sys/windows/svc/example/beep.go | 0 .../x/sys/windows/svc/example/install.go | 4 +-- .../x/sys/windows/svc/example/main.go | 2 +- .../x/sys/windows/svc/example/manage.go | 4 +-- .../x/sys/windows/svc/example/service.go | 6 ++--- .../golang.org/x/sys/windows/svc/go12.c | 0 .../golang.org/x/sys/windows/svc/go12.go | 0 .../golang.org/x/sys/windows/svc/go13.go | 0 .../x/sys/windows/svc/mgr/config.go | 2 +- .../golang.org/x/sys/windows/svc/mgr/mgr.go | 2 +- .../x/sys/windows/svc/mgr/mgr_test.go | 2 +- .../x/sys/windows/svc/mgr/recovery.go | 2 +- .../x/sys/windows/svc/mgr/service.go | 4 +-- .../golang.org/x/sys/windows/svc/security.go | 2 +- .../golang.org/x/sys/windows/svc/service.go | 2 +- .../golang.org/x/sys/windows/svc/svc_test.go | 6 ++--- .../golang.org/x/sys/windows/svc/sys_386.s | 0 .../golang.org/x/sys/windows/svc/sys_amd64.s | 0 .../golang.org/x/sys/windows/svc/sys_arm.s | 0 .../golang.org/x/sys/windows/syscall.go | 2 +- .../golang.org/x/sys/windows/syscall_test.go | 2 +- .../x/sys/windows/syscall_windows.go | 0 .../x/sys/windows/syscall_windows_test.go | 2 +- .../golang.org/x/sys/windows/types_windows.go | 0 .../x/sys/windows/types_windows_386.go | 0 .../x/sys/windows/types_windows_amd64.go | 0 .../x/sys/windows/types_windows_arm.go | 0 .../x/sys/windows/zsyscall_windows.go | 0 .../x/text/encoding/charmap/charmap.go | 10 +++---- .../x/text/encoding/charmap/charmap_test.go | 8 +++--- .../x/text/encoding/charmap/maketables.go | 8 +++--- .../x/text/encoding/charmap/tables.go | 4 +-- .../golang.org/x/text/encoding/encoding.go | 6 ++--- .../x/text/encoding/encoding_test.go | 6 ++--- .../x/text/encoding/example_test.go | 8 +++--- .../x/text/encoding/ianaindex/example_test.go | 4 +-- .../x/text/encoding/ianaindex/gen.go | 6 ++--- .../x/text/encoding/ianaindex/ianaindex.go | 16 ++++++------ .../text/encoding/ianaindex/ianaindex_test.go | 16 ++++++------ .../x/text/encoding/ianaindex/tables.go | 2 +- .../text/encoding/internal/enctest/enctest.go | 6 ++--- .../text/encoding/internal/identifier/gen.go | 2 +- .../internal/identifier/identifier.go | 0 .../text/encoding/internal/identifier/mib.go | 0 .../x/text/encoding/internal/internal.go | 6 ++--- .../x/text/encoding/japanese/all.go | 2 +- .../x/text/encoding/japanese/all_test.go | 8 +++--- .../x/text/encoding/japanese/eucjp.go | 8 +++--- .../x/text/encoding/japanese/iso2022jp.go | 8 +++--- .../x/text/encoding/japanese/maketables.go | 2 +- .../x/text/encoding/japanese/shiftjis.go | 8 +++--- .../x/text/encoding/japanese/tables.go | 2 +- .../x/text/encoding/korean/all_test.go | 8 +++--- .../x/text/encoding/korean/euckr.go | 8 +++--- .../x/text/encoding/korean/maketables.go | 2 +- .../x/text/encoding/korean/tables.go | 2 +- .../x/text/encoding/simplifiedchinese/all.go | 2 +- .../encoding/simplifiedchinese/all_test.go | 8 +++--- .../x/text/encoding/simplifiedchinese/gbk.go | 8 +++--- .../encoding/simplifiedchinese/hzgb2312.go | 8 +++--- .../encoding/simplifiedchinese/maketables.go | 2 +- .../text/encoding/simplifiedchinese/tables.go | 2 +- .../encoding/traditionalchinese/all_test.go | 8 +++--- .../text/encoding/traditionalchinese/big5.go | 8 +++--- .../encoding/traditionalchinese/maketables.go | 2 +- .../encoding/traditionalchinese/tables.go | 2 +- .../x/text/encoding/unicode/override.go | 2 +- .../x/text/encoding/unicode/unicode.go | 14 +++++----- .../x/text/encoding/unicode/unicode_test.go | 8 +++--- .../x/text/encoding/unicode/utf32/utf32.go | 8 +++--- .../text/encoding/unicode/utf32/utf32_test.go | 6 ++--- .../x/text/internal/catmsg/catmsg.go | 4 +-- .../x/text/internal/catmsg/catmsg_test.go | 6 ++--- .../x/text/internal/catmsg/codec.go | 2 +- .../x/text/internal/catmsg/varint.go | 0 .../x/text/internal/catmsg/varint_test.go | 0 .../x/text/internal/cldrtree/cldrtree.go | 6 ++--- .../x/text/internal/cldrtree/cldrtree_test.go | 6 ++--- .../x/text/internal/cldrtree/generate.go | 4 +-- .../x/text/internal/cldrtree/option.go | 2 +- .../testdata/test1/common/main/root.xml | 0 .../cldrtree/testdata/test1/output.go | 2 +- .../testdata/test2/common/main/en.xml | 0 .../testdata/test2/common/main/en_001.xml | 0 .../testdata/test2/common/main/en_GB.xml | 0 .../testdata/test2/common/main/root.xml | 0 .../cldrtree/testdata/test2/output.go | 2 +- .../x/text/internal/cldrtree/tree.go | 4 +-- .../x/text/internal/cldrtree/type.go | 0 .../x/text/internal/colltab/collate_test.go | 6 ++--- .../x/text/internal/colltab/collelem.go | 0 .../x/text/internal/colltab/collelem_test.go | 0 .../x/text/internal/colltab/colltab.go | 4 +-- .../x/text/internal/colltab/colltab_test.go | 2 +- .../x/text/internal/colltab/contract.go | 0 .../x/text/internal/colltab/contract_test.go | 0 .../x/text/internal/colltab/iter.go | 0 .../x/text/internal/colltab/iter_test.go | 0 .../x/text/internal/colltab/numeric.go | 0 .../x/text/internal/colltab/numeric_test.go | 2 +- .../x/text/internal/colltab/table.go | 2 +- .../x/text/internal/colltab/trie.go | 0 .../x/text/internal/colltab/trie_test.go | 0 .../x/text/internal/colltab/weighter.go | 2 +- .../x/text/internal/colltab/weighter_test.go | 0 .../golang.org/x/text/internal/export/README | 0 .../text/internal/export/idna/common_test.go | 2 +- .../text/internal/export/idna/example_test.go | 2 +- .../x/text/internal/export/idna/gen.go | 8 +++--- .../x/text/internal/export/idna/gen_common.go | 2 +- .../x/text/internal/export/idna/gen_test.go | 6 ++--- .../text/internal/export/idna/gen_trieval.go | 0 .../x/text/internal/export/idna/idna.go | 8 +++--- .../x/text/internal/export/idna/idna_test.go | 6 ++--- .../x/text/internal/export/idna/punycode.go | 0 .../internal/export/idna/punycode_test.go | 0 .../x/text/internal/export/idna/tables.go | 0 .../x/text/internal/export/idna/trie.go | 0 .../x/text/internal/export/idna/trieval.go | 0 .../x/text/internal/format/format.go | 4 +-- .../golang.org/x/text/internal/gen.go | 6 ++--- .../golang.org/x/text/internal/gen/code.go | 0 .../golang.org/x/text/internal/gen/gen.go | 6 ++--- .../golang.org/x/text/internal/gen_test.go | 2 +- .../golang.org/x/text/internal/internal.go | 4 +-- .../x/text/internal/internal_test.go | 2 +- .../golang.org/x/text/internal/match.go | 2 +- .../golang.org/x/text/internal/match_test.go | 2 +- .../x/text/internal/number/common.go | 0 .../x/text/internal/number/decimal.go | 0 .../x/text/internal/number/decimal_test.go | 0 .../x/text/internal/number/format.go | 2 +- .../x/text/internal/number/format_test.go | 2 +- .../golang.org/x/text/internal/number/gen.go | 14 +++++----- .../x/text/internal/number/gen_common.go | 0 .../x/text/internal/number/number.go | 4 +-- .../x/text/internal/number/number_test.go | 4 +-- .../x/text/internal/number/pattern.go | 0 .../x/text/internal/number/pattern_test.go | 0 .../internal/number/roundingmode_string.go | 0 .../x/text/internal/number/tables.go | 2 +- .../x/text/internal/number/tables_test.go | 8 +++--- .../x/text/internal/stringset/set.go | 0 .../x/text/internal/stringset/set_test.go | 0 .../golang.org/x/text/internal/tables.go | 0 .../golang.org/x/text/internal/tag/tag.go | 2 +- .../x/text/internal/tag/tag_test.go | 0 .../x/text/internal/testtext/codesize.go | 2 +- .../x/text/internal/testtext/flag.go | 2 +- .../golang.org/x/text/internal/testtext/gc.go | 0 .../x/text/internal/testtext/gccgo.go | 0 .../x/text/internal/testtext/go1_6.go | 0 .../x/text/internal/testtext/go1_7.go | 0 .../x/text/internal/testtext/text.go | 2 +- .../x/text/internal/triegen/compact.go | 0 .../x/text/internal/triegen/data_test.go | 0 .../internal/triegen/example_compact_test.go | 2 +- .../x/text/internal/triegen/example_test.go | 2 +- .../x/text/internal/triegen/gen_test.go | 0 .../x/text/internal/triegen/print.go | 0 .../x/text/internal/triegen/triegen.go | 2 +- .../x/text/internal/ucd/example_test.go | 2 +- .../golang.org/x/text/internal/ucd/ucd.go | 2 +- .../x/text/internal/ucd/ucd_test.go | 0 .../internal/utf8internal/utf8internal.go | 0 .../golang.org/x/text/runes/cond.go | 2 +- .../golang.org/x/text/runes/runes.go | 4 +-- .../x/text/transform/examples_test.go | 4 +-- .../golang.org/x/text/transform/transform.go | 2 +- .../x/text/transform/transform_test.go | 2 +- .../golang.org/x/text/unicode/bidi/bidi.go | 2 +- .../golang.org/x/text/unicode/bidi/bracket.go | 0 .../golang.org/x/text/unicode/bidi/core.go | 0 .../x/text/unicode/bidi/core_test.go | 8 +++--- .../golang.org/x/text/unicode/bidi/gen.go | 6 ++--- .../x/text/unicode/bidi/gen_ranges.go | 6 ++--- .../x/text/unicode/bidi/gen_trieval.go | 0 .../golang.org/x/text/unicode/bidi/prop.go | 0 .../x/text/unicode/bidi/ranges_test.go | 6 ++--- .../golang.org/x/text/unicode/bidi/tables.go | 0 .../x/text/unicode/bidi/tables_test.go | 6 ++--- .../golang.org/x/text/unicode/bidi/trieval.go | 0 .../golang.org/x/text/unicode/cldr/base.go | 0 .../golang.org/x/text/unicode/cldr/cldr.go | 2 +- .../x/text/unicode/cldr/cldr_test.go | 0 .../golang.org/x/text/unicode/cldr/collate.go | 0 .../x/text/unicode/cldr/collate_test.go | 0 .../x/text/unicode/cldr/data_test.go | 0 .../golang.org/x/text/unicode/cldr/decode.go | 0 .../x/text/unicode/cldr/examples_test.go | 2 +- .../golang.org/x/text/unicode/cldr/makexml.go | 2 +- .../golang.org/x/text/unicode/cldr/resolve.go | 0 .../x/text/unicode/cldr/resolve_test.go | 0 .../golang.org/x/text/unicode/cldr/slice.go | 0 .../x/text/unicode/cldr/slice_test.go | 0 .../golang.org/x/text/unicode/cldr/xml.go | 0 .../golang.org/x/text/unicode/doc.go | 0 .../x/text/unicode/norm/composition.go | 0 .../x/text/unicode/norm/composition_test.go | 0 .../x/text/unicode/norm/example_iter_test.go | 2 +- .../x/text/unicode/norm/example_test.go | 2 +- .../x/text/unicode/norm/forminfo.go | 0 .../x/text/unicode/norm/forminfo_test.go | 0 .../golang.org/x/text/unicode/norm/input.go | 0 .../golang.org/x/text/unicode/norm/iter.go | 0 .../x/text/unicode/norm/iter_test.go | 0 .../x/text/unicode/norm/maketables.go | 6 ++--- .../x/text/unicode/norm/normalize.go | 4 +-- .../x/text/unicode/norm/normalize_test.go | 6 ++--- .../x/text/unicode/norm/readwriter.go | 0 .../x/text/unicode/norm/readwriter_test.go | 0 .../golang.org/x/text/unicode/norm/tables.go | 0 .../x/text/unicode/norm/transform.go | 2 +- .../x/text/unicode/norm/transform_test.go | 2 +- .../golang.org/x/text/unicode/norm/trie.go | 0 .../golang.org/x/text/unicode/norm/triegen.go | 0 .../x/text/unicode/norm/ucd_test.go | 4 +-- .../x/text/unicode/rangetable/gen.go | 10 +++---- .../x/text/unicode/rangetable/merge.go | 0 .../x/text/unicode/rangetable/merge_test.go | 0 .../x/text/unicode/rangetable/rangetable.go | 0 .../unicode/rangetable/rangetable_test.go | 0 .../x/text/unicode/rangetable/tables.go | 0 .../x/text/unicode/runenames/bits.go | 0 .../x/text/unicode/runenames/example_test.go | 2 +- .../x/text/unicode/runenames/gen.go | 4 +-- .../x/text/unicode/runenames/gen_bits.go | 0 .../x/text/unicode/runenames/runenames.go | 0 .../text/unicode/runenames/runenames_test.go | 6 ++--- .../x/text/unicode/runenames/tables.go | 0 .../thirdparty}/gopkg.in/yaml.v2/.travis.yml | 0 .../thirdparty}/gopkg.in/yaml.v2/LICENSE | 0 .../gopkg.in/yaml.v2/LICENSE.libyaml | 0 .../thirdparty}/gopkg.in/yaml.v2/README.md | 2 +- .../thirdparty}/gopkg.in/yaml.v2/apic.go | 0 .../thirdparty}/gopkg.in/yaml.v2/decode.go | 0 .../thirdparty}/gopkg.in/yaml.v2/emitterc.go | 0 .../thirdparty}/gopkg.in/yaml.v2/encode.go | 0 .../thirdparty}/gopkg.in/yaml.v2/parserc.go | 0 .../thirdparty}/gopkg.in/yaml.v2/readerc.go | 0 .../thirdparty}/gopkg.in/yaml.v2/resolve.go | 0 .../thirdparty}/gopkg.in/yaml.v2/scannerc.go | 0 .../thirdparty}/gopkg.in/yaml.v2/sorter.go | 0 .../thirdparty}/gopkg.in/yaml.v2/writerc.go | 0 .../thirdparty}/gopkg.in/yaml.v2/yaml.go | 0 .../thirdparty}/gopkg.in/yaml.v2/yamlh.go | 0 .../gopkg.in/yaml.v2/yamlprivateh.go | 0 {g/net => net}/ghttp/ghttp.go | 0 {g/net => net}/ghttp/ghttp_client_api.go | 0 {g/net => net}/ghttp/ghttp_client_bytes.go | 0 {g/net => net}/ghttp/ghttp_client_config.go | 3 ++- {g/net => net}/ghttp/ghttp_client_content.go | 0 {g/net => net}/ghttp/ghttp_client_request.go | 2 +- {g/net => net}/ghttp/ghttp_client_response.go | 0 {g/net => net}/ghttp/ghttp_controller.go | 0 {g/net => net}/ghttp/ghttp_func.go | 4 +-- {g/net => net}/ghttp/ghttp_request.go | 8 +++--- {g/net => net}/ghttp/ghttp_request_auth.go | 2 +- {g/net => net}/ghttp/ghttp_request_log.go | 0 {g/net => net}/ghttp/ghttp_request_params.go | 2 +- {g/net => net}/ghttp/ghttp_request_post.go | 6 ++--- {g/net => net}/ghttp/ghttp_request_query.go | 6 ++--- {g/net => net}/ghttp/ghttp_request_request.go | 6 ++--- {g/net => net}/ghttp/ghttp_request_router.go | 0 {g/net => net}/ghttp/ghttp_response.go | 6 ++--- {g/net => net}/ghttp/ghttp_response_cors.go | 2 +- {g/net => net}/ghttp/ghttp_response_gzip.go | 0 {g/net => net}/ghttp/ghttp_response_view.go | 4 +-- {g/net => net}/ghttp/ghttp_response_writer.go | 0 {g/net => net}/ghttp/ghttp_server.go | 26 +++++++++---------- {g/net => net}/ghttp/ghttp_server_admin.go | 7 ++--- .../ghttp/ghttp_server_admin_process.go | 15 ++++++----- .../ghttp/ghttp_server_admin_unix.go | 0 .../ghttp/ghttp_server_admin_windows.go | 0 {g/net => net}/ghttp/ghttp_server_config.go | 4 +-- .../ghttp/ghttp_server_config_cookie.go | 2 +- .../ghttp/ghttp_server_config_logger.go | 2 +- .../ghttp/ghttp_server_config_route.go | 2 +- .../ghttp/ghttp_server_config_session.go | 2 +- .../ghttp/ghttp_server_config_static.go | 9 ++++--- {g/net => net}/ghttp/ghttp_server_cookie.go | 3 ++- {g/net => net}/ghttp/ghttp_server_domain.go | 0 {g/net => net}/ghttp/ghttp_server_graceful.go | 5 ++-- {g/net => net}/ghttp/ghttp_server_handler.go | 8 +++--- {g/net => net}/ghttp/ghttp_server_log.go | 2 +- {g/net => net}/ghttp/ghttp_server_pprof.go | 3 ++- {g/net => net}/ghttp/ghttp_server_router.go | 7 ++--- .../ghttp/ghttp_server_router_group.go | 4 +-- .../ghttp/ghttp_server_router_hook.go | 5 ++-- .../ghttp/ghttp_server_router_serve.go | 2 +- .../ghttp/ghttp_server_service_controller.go | 8 +++--- .../ghttp/ghttp_server_service_handler.go | 5 ++-- .../ghttp/ghttp_server_service_object.go | 8 +++--- {g/net => net}/ghttp/ghttp_server_session.go | 10 +++---- {g/net => net}/ghttp/ghttp_server_status.go | 0 .../ghttp/ghttp_server_websocket.go | 2 +- .../ghttp/ghttp_unit_cookie_test.go | 7 ++--- {g/net => net}/ghttp/ghttp_unit_init_test.go | 2 +- .../ghttp/ghttp_unit_param_json_test.go | 7 ++--- .../ghttp/ghttp_unit_param_struct_test.go | 8 +++--- {g/net => net}/ghttp/ghttp_unit_param_test.go | 6 ++--- .../ghttp/ghttp_unit_router_basic_test.go | 7 ++--- .../ghttp_unit_router_controller_rest_test.go | 9 ++++--- .../ghttp_unit_router_controller_test.go | 9 ++++--- .../ghttp_unit_router_domain_basic_test.go | 7 ++--- ...unit_router_domain_controller_rest_test.go | 9 ++++--- ...http_unit_router_domain_controller_test.go | 9 ++++--- ...ttp_unit_router_domain_object_rest_test.go | 7 ++--- .../ghttp_unit_router_domain_object_test.go | 7 ++--- .../ghttp/ghttp_unit_router_exit_test.go | 7 ++--- .../ghttp_unit_router_group_hook_test.go | 7 ++--- .../ghttp_unit_router_group_rest_test.go | 9 ++++--- .../ghttp/ghttp_unit_router_group_test.go | 9 ++++--- .../ghttp/ghttp_unit_router_hook_test.go | 7 ++--- .../ghttp/ghttp_unit_router_names_test.go | 7 ++--- .../ghttp_unit_router_object_rest_test.go | 7 ++--- .../ghttp/ghttp_unit_router_object_test.go | 7 ++--- .../ghttp/ghttp_unit_session_test.go | 7 ++--- .../ghttp/ghttp_unit_static_test.go | 9 ++++--- {g/net => net}/gipv4/gipv4.go | 3 ++- {g/net => net}/gipv6/gipv6.go | 2 +- {g/net => net}/gsmtp/gsmtp.go | 0 {g/net => net}/gtcp/gtcp.go | 0 {g/net => net}/gtcp/gtcp_conn.go | 2 +- {g/net => net}/gtcp/gtcp_conn_pkg.go | 2 +- {g/net => net}/gtcp/gtcp_func.go | 3 ++- {g/net => net}/gtcp/gtcp_func_pkg.go | 0 {g/net => net}/gtcp/gtcp_pool.go | 6 ++--- {g/net => net}/gtcp/gtcp_pool_pkg.go | 2 +- {g/net => net}/gtcp/gtcp_server.go | 7 ++--- {g/net => net}/gudp/gudp.go | 0 {g/net => net}/gudp/gudp_conn.go | 2 +- {g/net => net}/gudp/gudp_func.go | 0 {g/net => net}/gudp/gudp_server.go | 7 ++--- {g/os => os}/gcache/gcache.go | 0 {g/os => os}/gcache/gcache_cache.go | 3 ++- {g/os => os}/gcache/gcache_mem_cache.go | 12 ++++----- {g/os => os}/gcache/gcache_mem_cache_item.go | 2 +- {g/os => os}/gcache/gcache_mem_cache_lru.go | 9 ++++--- {g/os => os}/gcache/gcache_z_bench_test.go | 3 ++- {g/os => os}/gcache/gcache_z_unit_1_test.go | 10 +++---- {g/os => os}/gcfg/gcfg.go | 18 ++++++------- {g/os => os}/gcfg/gcfg_api.go | 6 ++--- {g/os => os}/gcfg/gcfg_config.go | 2 +- {g/os => os}/gcfg/gcfg_error.go | 2 +- {g/os => os}/gcfg/gcfg_instance.go | 2 +- {g/os => os}/gcfg/gcfg_z_unit_test.go | 10 +++---- {g/os => os}/gcmd/gcmd.go | 2 +- {g/os => os}/gcmd/gcmd_option.go | 2 +- {g/os => os}/gcmd/gcmd_value.go | 2 +- {g/os => os}/gcmd/gcmd_z_unit_test.go | 2 +- {g/os => os}/gcron/gcron.go | 3 ++- {g/os => os}/gcron/gcron_cron.go | 11 ++++---- {g/os => os}/gcron/gcron_entry.go | 9 ++++--- {g/os => os}/gcron/gcron_schedule.go | 3 ++- {g/os => os}/gcron/gcron_unit_1_test.go | 6 ++--- {g/os => os}/gcron/gcron_unit_2_test.go | 9 ++++--- {g/os => os}/gcron/gcron_z_bench_test.go | 3 ++- {g/os => os}/gcron/gcron_z_example_1_test.go | 5 ++-- {g/os => os}/genv/genv.go | 0 {g/os => os}/genv/genv_test.go | 13 +++++----- {g/os => os}/gfcache/gfcache.go | 8 +++--- {g/os => os}/gfcache/gfcache_z_unit_test.go | 6 ++--- {g/os => os}/gfile/gfile.go | 4 +-- {g/os => os}/gfile/gfile_contents.go | 0 {g/os => os}/gfile/gfile_replace.go | 2 +- {g/os => os}/gfile/gfile_scan.go | 0 {g/os => os}/gfile/gfile_search.go | 3 ++- {g/os => os}/gfile/gfile_size.go | 0 {g/os => os}/gfile/gfile_sort.go | 2 +- {g/os => os}/gfile/gfile_source.go | 11 ++++---- {g/os => os}/gfile/gfile_time.go | 0 {g/os => os}/gfile/gfile_z_contents_test.go | 4 +-- {g/os => os}/gfile/gfile_z_scan_test.go | 4 +-- {g/os => os}/gfile/gfile_z_search_test.go | 4 +-- {g/os => os}/gfile/gfile_z_size_test.go | 4 +-- {g/os => os}/gfile/gfile_z_test.go | 4 +-- {g/os => os}/gfile/gfile_z_time_test.go | 4 +-- {g/os => os}/gfile/testdata/dir1/file1 | 0 {g/os => os}/gfile/testdata/dir2/file2 | 0 {g/os => os}/gflock/gflock.go | 4 +-- {g/os => os}/gflock/gflock_unit_test.go | 8 +++--- {g/os => os}/gfpool/gfpool.go | 9 ++++--- {g/os => os}/gfpool/gfpool_z_bench_test.go | 0 {g/os => os}/gfpool/gfpool_z_unit_test.go | 8 +++--- {g/os => os}/gfsnotify/gfsnotify.go | 12 ++++----- {g/os => os}/gfsnotify/gfsnotify_event.go | 0 {g/os => os}/gfsnotify/gfsnotify_filefunc.go | 0 {g/os => os}/gfsnotify/gfsnotify_watcher.go | 2 +- .../gfsnotify/gfsnotify_watcher_loop.go | 2 +- .../gfsnotify/gfsnotify_z_unit_test.go | 12 ++++----- {g/os => os}/glog/glog.go | 4 +-- {g/os => os}/glog/glog_api.go | 0 {g/os => os}/glog/glog_chaining.go | 0 {g/os => os}/glog/glog_logger.go | 14 +++++----- {g/os => os}/glog/glog_logger_api.go | 0 {g/os => os}/glog/glog_logger_chaining.go | 2 +- {g/os => os}/glog/glog_logger_writer.go | 0 {g/os => os}/gmlock/gmlock.go | 0 {g/os => os}/gmlock/gmlock_locker.go | 4 +-- {g/os => os}/gmlock/gmlock_unit_lock_test.go | 6 ++--- {g/os => os}/gmlock/gmlock_unit_rlock_test.go | 6 ++--- {g/os => os}/gmutex/gmutex.go | 2 +- {g/os => os}/gmutex/gmutex_bench_test.go | 2 +- {g/os => os}/gmutex/gmutex_unit_test.go | 6 ++--- {g/os => os}/gproc/gproc.go | 4 +-- {g/os => os}/gproc/gproc_comm.go | 7 ++--- {g/os => os}/gproc/gproc_comm_receive.go | 13 +++++----- {g/os => os}/gproc/gproc_comm_send.go | 7 ++--- {g/os => os}/gproc/gproc_manager.go | 3 ++- {g/os => os}/gproc/gproc_proccess.go | 0 {g/os => os}/grpool/grpool.go | 4 +-- {g/os => os}/grpool/grpool_bench_1_test.go | 3 ++- {g/os => os}/grpool/grpool_bench_2_test.go | 3 ++- {g/os => os}/grpool/grpool_unit_test.go | 6 ++--- {g/os => os}/gspath/gspath.go | 9 ++++--- {g/os => os}/gspath/gspath_cache.go | 7 ++--- {g/os => os}/gspath/gspath_unit_test.go | 7 ++--- {g/os => os}/gtime/gtime.go | 2 +- {g/os => os}/gtime/gtime_format.go | 2 +- {g/os => os}/gtime/gtime_time.go | 0 {g/os => os}/gtime/gtime_z_bench_test.go | 2 +- {g/os => os}/gtime/gtime_z_unit_basic_test.go | 4 +-- .../gtime/gtime_z_unit_format_test.go | 5 ++-- {g/os => os}/gtime/gtime_z_unit_time_test.go | 4 +-- {g/os => os}/gtimer/gtimer.go | 3 ++- {g/os => os}/gtimer/gtimer_entry.go | 3 ++- {g/os => os}/gtimer/gtimer_loop.go | 3 ++- {g/os => os}/gtimer/gtimer_timer.go | 5 ++-- {g/os => os}/gtimer/gtimer_z_bench_test.go | 3 ++- {g/os => os}/gtimer/gtimer_z_example_test.go | 3 ++- {g/os => os}/gtimer/gtimer_z_unit_0_test.go | 7 ++--- {g/os => os}/gtimer/gtimer_z_unit_1_test.go | 7 ++--- {g/os => os}/gtimer/gtimer_z_unit_2_test.go | 7 ++--- {g/os => os}/gview/gview.go | 13 +++++----- {g/os => os}/gview/gview_buildin.go | 11 ++++---- {g/os => os}/gview/gview_config.go | 0 {g/os => os}/gview/gview_doparse.go | 21 ++++++++------- {g/os => os}/gview/gview_error.go | 2 +- {g/os => os}/gview/gview_instance.go | 2 +- {g/os => os}/gview/gview_unit_test.go | 11 ++++---- {g/test => test}/gtest/gtest.go | 6 ++--- {g/test => test}/gtest/gtest_test.go | 2 +- {g/text => text}/gregex/gregex.go | 0 {g/text => text}/gregex/gregex_cache.go | 0 .../gregex/gregex_z_bench_test.go | 2 +- {g/text => text}/gregex/gregex_z_unit_test.go | 5 ++-- {g/text => text}/gstr/gstr.go | 10 +++---- {g/text => text}/gstr/gstr_levenshtein.go | 0 {g/text => text}/gstr/gstr_parse.go | 0 {g/text => text}/gstr/gstr_pos.go | 0 {g/text => text}/gstr/gstr_similartext.go | 0 {g/text => text}/gstr/gstr_soundex.go | 0 {g/text => text}/gstr/gstr_trim.go | 0 .../gstr/gstr_z_unit_basic_test.go | 7 ++--- .../gstr/gstr_z_unit_parse_test.go | 7 ++--- {g/text => text}/gstr/gstr_z_unit_pos_test.go | 5 ++-- .../gstr/gstr_z_unit_trim_test.go | 5 ++-- third/README.MD | 1 - {g/util => util}/gconv/gconv.go | 2 +- {g/util => util}/gconv/gconv_map.go | 4 +-- {g/util => util}/gconv/gconv_slice.go | 2 +- {g/util => util}/gconv/gconv_struct.go | 4 +-- {g/util => util}/gconv/gconv_time.go | 4 +-- {g/util => util}/gconv/gconv_z_all_test.go | 8 +++--- .../gconv/gconv_z_bench_bytes_test.go | 2 +- .../gconv/gconv_z_bench_float_test.go | 0 .../gconv/gconv_z_bench_int_test.go | 0 .../gconv/gconv_z_bench_str_test.go | 0 .../gconv/gconv_z_unit_basic_test.go | 4 +-- .../gconv/gconv_z_unit_bool_test.go | 5 ++-- .../gconv/gconv_z_unit_map_test.go | 6 ++--- .../gconv/gconv_z_unit_slice_test.go | 6 ++--- .../gconv/gconv_z_unit_string_test.go | 5 ++-- .../gconv/gconv_z_unit_struct_test.go | 8 +++--- .../gconv/gconv_z_unit_time_test.go | 7 ++--- {g/util => util}/gpage/gpage.go | 9 ++++--- {g/util => util}/grand/grand.go | 0 {g/util => util}/grand/grand_intn.go | 0 {g/util => util}/grand/grand_z_bench_test.go | 3 ++- {g/util => util}/grand/grand_z_unit_test.go | 5 ++-- {g/util => util}/gutil/gutil.go | 4 +-- {g/util => util}/gutil/gutil_comparator.go | 3 ++- {g/util => util}/gutil/gutil_debug.go | 2 +- {g/util => util}/gutil/gutil_z_bench_test.go | 0 .../gutil/gutil_z_comparator_z_unit_test.go | 4 +-- {g/util => util}/gutil/gutil_z_unit_test.go | 4 +-- {g/util => util}/gvalid/gvalid.go | 3 ++- {g/util => util}/gvalid/gvalid_check.go | 14 +++++----- {g/util => util}/gvalid/gvalid_check_map.go | 2 +- .../gvalid/gvalid_check_struct.go | 4 +-- {g/util => util}/gvalid/gvalid_error.go | 0 {g/util => util}/gvalid/gvalid_message.go | 0 .../gvalid/gvalid_unit_basic_all_test.go | 6 ++--- .../gvalid/gvalid_unit_checkmap_test.go | 4 +-- .../gvalid/gvalid_unit_checkstruct_test.go | 6 ++--- .../gvalid/gvalid_unit_customerror_test.go | 4 +-- 1763 files changed, 2184 insertions(+), 1868 deletions(-) rename {g/container => container}/garray/garray.go (100%) rename {g/container => container}/garray/garray_func.go (100%) rename {g/container => container}/garray/garray_normal_int.go (99%) rename {g/container => container}/garray/garray_normal_interface.go (99%) rename {g/container => container}/garray/garray_normal_string.go (99%) rename {g/container => container}/garray/garray_sorted_int.go (98%) rename {g/container => container}/garray/garray_sorted_interface.go (98%) rename {g/container => container}/garray/garray_sorted_string.go (98%) rename {g/container => container}/garray/garray_z_bench_test.go (95%) rename {g/container => container}/garray/garray_z_example_test.go (98%) rename {g/container => container}/garray/garray_z_unit_basic_test.go (96%) rename {g/container => container}/garray/garray_z_unit_int_test.go (99%) rename {g/container => container}/garray/garray_z_unit_interface_test.go (99%) rename {g/container => container}/garray/garray_z_unit_string_test.go (99%) rename {g/container => container}/gchan/gchan.go (97%) rename {g/container => container}/gchan/gchan_example_test.go (92%) rename {g/container => container}/gchan/gchan_z_unit_test.go (90%) rename {g/container => container}/glist/glist.go (99%) rename {g/container => container}/glist/glist_example_test.go (94%) rename {g/container => container}/glist/glist_z_bench_test.go (100%) rename {g/container => container}/glist/glist_z_unit_test.go (99%) rename {g/container => container}/gmap/gmap.go (100%) rename {g/container => container}/gmap/gmap_hash_any_any_map.go (98%) rename {g/container => container}/gmap/gmap_hash_int_any_map.go (98%) rename {g/container => container}/gmap/gmap_hash_int_int_map.go (99%) rename {g/container => container}/gmap/gmap_hash_int_str_map.go (99%) rename {g/container => container}/gmap/gmap_hash_str_any_map.go (98%) rename {g/container => container}/gmap/gmap_hash_str_int_map.go (99%) rename {g/container => container}/gmap/gmap_hash_str_str_map.go (99%) rename {g/container => container}/gmap/gmap_link_map.go (98%) rename {g/container => container}/gmap/gmap_tree_map.go (96%) rename {g/container => container}/gmap/gmap_z_basic_test.go (97%) rename {g/container => container}/gmap/gmap_z_bench_maps_test.go (94%) rename {g/container => container}/gmap/gmap_z_bench_safe_test.go (98%) rename {g/container => container}/gmap/gmap_z_bench_syncmap_test.go (96%) rename {g/container => container}/gmap/gmap_z_bench_unsafe_test.go (98%) rename {g/container => container}/gmap/gmap_z_example_test.go (97%) rename {g/container => container}/gmap/gmap_z_int_any_test.go (97%) rename {g/container => container}/gmap/gmap_z_int_int_test.go (97%) rename {g/container => container}/gmap/gmap_z_int_str_test.go (97%) rename {g/container => container}/gmap/gmap_z_link_map_test.go (97%) rename {g/container => container}/gmap/gmap_z_str_any_test.go (97%) rename {g/container => container}/gmap/gmap_z_str_int_test.go (97%) rename {g/container => container}/gmap/gmap_z_str_str_test.go (97%) rename {g/container => container}/gmap/gmap_z_tree_map_test.go (96%) rename {g/container => container}/gpool/gpool.go (96%) rename {g/container => container}/gpool/gpool_bench_test.go (94%) rename {g/container => container}/gpool/gpool_z_unit_test.go (95%) rename {g/container => container}/gqueue/gqueue.go (97%) rename {g/container => container}/gqueue/gqueue_bench_test.go (95%) rename {g/container => container}/gqueue/gqueue_unit_test.go (92%) rename {g/container => container}/gring/gring.go (98%) rename {g/container => container}/gring/gring_test.go (100%) rename {g/container => container}/gring/gring_unit_test.go (97%) rename {g/container => container}/gset/gset.go (98%) rename {g/container => container}/gset/gset_int_set.go (98%) rename {g/container => container}/gset/gset_string_set.go (98%) rename {g/container => container}/gset/gset_z_bench_test.go (98%) rename {g/container => container}/gset/gset_z_unit_int_test.go (97%) rename {g/container => container}/gset/gset_z_unit_string_test.go (98%) rename {g/container => container}/gset/gset_z_unit_test.go (98%) rename {g/container => container}/gtree/gtree.go (100%) rename {g/container => container}/gtree/gtree_avltree.go (99%) rename {g/container => container}/gtree/gtree_btree.go (99%) rename {g/container => container}/gtree/gtree_redblacktree.go (99%) rename {g/container => container}/gtree/gtree_z_avl_tree_test.go (97%) rename {g/container => container}/gtree/gtree_z_b_tree_test.go (97%) rename {g/container => container}/gtree/gtree_z_redblack_tree_test.go (97%) rename {g/container => container}/gtype/bool.go (100%) rename {g/container => container}/gtype/byte.go (100%) rename {g/container => container}/gtype/bytes.go (100%) rename {g/container => container}/gtype/float32.go (100%) rename {g/container => container}/gtype/float64.go (100%) rename {g/container => container}/gtype/gtype.go (100%) rename {g/container => container}/gtype/gtype_test.go (98%) rename {g/container => container}/gtype/gtype_z_unit_test.go (98%) rename {g/container => container}/gtype/int.go (100%) rename {g/container => container}/gtype/int32.go (100%) rename {g/container => container}/gtype/int64.go (100%) rename {g/container => container}/gtype/interface.go (100%) rename {g/container => container}/gtype/string.go (100%) rename {g/container => container}/gtype/uint.go (100%) rename {g/container => container}/gtype/uint32.go (100%) rename {g/container => container}/gtype/uint64.go (100%) rename {g/container => container}/gvar/gvar.go (97%) rename {g/container => container}/gvar/gvar_test.go (98%) rename {g/container => container}/gvar/gvar_z_bench_test.go (100%) rename {g/crypto => crypto}/gaes/gaes.go (100%) rename {g/crypto => crypto}/gaes/gaes_test.go (97%) rename {g/crypto => crypto}/gcrc32/gcrc32.go (95%) rename {g/crypto => crypto}/gcrc32/gcrc32_test.go (90%) rename {g/crypto => crypto}/gdes/gdes.go (100%) rename {g/crypto => crypto}/gdes/gdes_test.go (99%) rename {g/crypto => crypto}/gmd5/gmd5.go (95%) rename {g/crypto => crypto}/gmd5/gmd5_test.go (95%) rename {g/crypto => crypto}/gsha1/gsha1.go (93%) rename {g/crypto => crypto}/gsha1/gsha1_test.go (95%) rename {g/database => database}/gdb/gdb.go (98%) rename {g/database => database}/gdb/gdb_base.go (99%) rename {g/database => database}/gdb/gdb_batch_result.go (100%) rename {g/database => database}/gdb/gdb_config.go (99%) rename {g/database => database}/gdb/gdb_func.go (96%) rename {g/database => database}/gdb/gdb_model.go (99%) rename {g/database => database}/gdb/gdb_mssql.go (99%) rename {g/database => database}/gdb/gdb_mysql.go (93%) rename {g/database => database}/gdb/gdb_oracle.go (99%) rename {g/database => database}/gdb/gdb_pgsql.go (94%) rename {g/database => database}/gdb/gdb_sqlite.go (93%) rename {g/database => database}/gdb/gdb_structure.go (96%) rename {g/database => database}/gdb/gdb_transaction.go (99%) rename {g/database => database}/gdb/gdb_type_record.go (96%) rename {g/database => database}/gdb/gdb_type_result.go (98%) rename {g/database => database}/gdb/gdb_unit_init_test.go (95%) rename {g/database => database}/gdb/gdb_unit_types_test.go (96%) rename {g/database => database}/gdb/gdb_unit_z_basic_test.go (89%) rename {g/database => database}/gdb/gdb_unit_z_method_test.go (99%) rename {g/database => database}/gdb/gdb_unit_z_model_test.go (99%) rename {g/database => database}/gdb/gdb_unit_z_struct_test.go (96%) rename {g/database => database}/gdb/gdb_unit_z_transaction_test.go (99%) rename {g/database => database}/gredis/gredis.go (97%) rename {g/database => database}/gredis/gredis_config.go (97%) rename {g/database => database}/gredis/gredis_conn.go (93%) rename {g/database => database}/gredis/gredis_unit_test.go (96%) rename {g/encoding => encoding}/gbase64/gbase64.go (100%) rename {g/encoding => encoding}/gbase64/gbase64_test.go (94%) rename {g/encoding => encoding}/gbinary/gbinary.go (100%) rename {g/encoding => encoding}/gbinary/gbinary_be.go (100%) rename {g/encoding => encoding}/gbinary/gbinary_bits.go (100%) rename {g/encoding => encoding}/gbinary/gbinary_func.go (100%) rename {g/encoding => encoding}/gbinary/gbinary_le.go (100%) rename {g/encoding => encoding}/gbinary/gbinary_z_be_test.go (97%) rename {g/encoding => encoding}/gbinary/gbinary_z_le_test.go (97%) rename {g/encoding => encoding}/gbinary/gbinary_z_test.go (97%) rename {g/encoding => encoding}/gcharset/gcharset.go (93%) rename {g/encoding => encoding}/gcharset/gcharset_test.go (98%) rename {g/encoding => encoding}/gcompress/gcompress.go (100%) rename {g/encoding => encoding}/gcompress/gcompress_file.go (98%) rename {g/encoding => encoding}/gcompress/gcompress_test.go (94%) rename {g/encoding => encoding}/ghash/ghash.go (100%) rename {g/encoding => encoding}/ghash/ghash_test.go (98%) rename {g/encoding => encoding}/ghash/ghash_z_unit_basic_test.go (97%) rename {g/encoding => encoding}/ghtml/ghtml.go (95%) rename {g/encoding => encoding}/ghtml/ghtml_test.go (92%) rename {g/encoding => encoding}/gjson/gjson.go (98%) rename {g/encoding => encoding}/gjson/gjson_api.go (98%) rename {g/encoding => encoding}/gjson/gjson_api_config.go (100%) rename {g/encoding => encoding}/gjson/gjson_api_encoding.go (93%) rename {g/encoding => encoding}/gjson/gjson_api_new_load.go (94%) rename {g/encoding => encoding}/gjson/gjson_z_bench_test.go (94%) rename {g/encoding => encoding}/gjson/gjson_z_unit_basic_test.go (99%) rename {g/encoding => encoding}/gjson/gjson_z_unit_load_test.go (97%) rename {g/encoding => encoding}/gjson/gjson_z_unit_set_test.go (99%) rename {g/encoding => encoding}/gparser/gparser.go (92%) rename {g/encoding => encoding}/gparser/gparser_api_encoding.go (100%) rename {g/encoding => encoding}/gparser/gparser_api_new_load.go (97%) rename {g/encoding => encoding}/gparser/gparser_unit_basic_test.go (98%) rename {g/encoding => encoding}/gparser/gparser_unit_load_test.go (97%) rename {g/encoding => encoding}/gparser/gparser_unit_set_test.go (99%) rename {g/encoding => encoding}/gtoml/gtoml.go (93%) rename {g/encoding => encoding}/gtoml/gtoml_test.go (96%) rename {g/encoding => encoding}/gurl/url.go (100%) rename {g/encoding => encoding}/gurl/url_test.go (96%) rename {g/encoding => encoding}/gxml/gxml.go (92%) rename {g/encoding => encoding}/gxml/gxml_test.go (96%) rename {g/encoding => encoding}/gyaml/gyaml.go (91%) rename {g/encoding => encoding}/gyaml/gyaml_test.go (96%) rename {g/errors => errors}/gerror/gerror.go (98%) rename {g/errors => errors}/gerror/gerror_error.go (98%) rename {g/errors => errors}/gerror/gerror_stack.go (100%) rename {g/errors => errors}/gerror/gerror_test.go (97%) rename {geg => example}/container/garray/array_unique.go (100%) rename {geg => example}/container/garray/garray1.go (96%) rename {geg => example}/container/garray/garray2.go (94%) rename {geg => example}/container/garray/garray_slice_safe.go (67%) rename {geg => example}/container/garray/sorted_string_array1.go (78%) rename {geg => example}/container/garray/sorted_string_array2.go (88%) rename {geg => example}/container/gmap/gmap.go (97%) rename {geg => example}/container/gmap/gmap_json.go (89%) rename {geg => example}/container/gmap/gmap_map_safe.go (67%) rename {geg => example}/container/gmap/gmap_order.go (86%) rename {geg => example}/container/gmap/gmap_treemap.go (93%) rename {geg => example}/container/gmap/safe_map_delete.go (100%) rename {geg => example}/container/gpool/gpool.go (91%) rename {geg => example}/container/gpool/gpool_expirefunc.go (85%) rename {geg => example}/container/gqueue/gqueue.go (81%) rename {geg => example}/container/gqueue/gqueue2.go (83%) rename {geg => example}/container/gqueue/gqueue3.go (78%) rename {geg => example}/container/gring/gring.go (91%) rename {geg => example}/container/gring/gring_josephus.go (96%) rename {geg => example}/container/gset/gset1.go (95%) rename {geg => example}/container/gset/gset2.go (84%) rename {geg => example}/container/gtree/gtree_avltree.go (85%) rename {geg => example}/container/gtree/gtree_btree.go (88%) rename {geg => example}/container/gtree/gtree_redblackmap.go (93%) rename {geg => example}/container/gtree/gtree_redblacktree.go (84%) rename {geg => example}/container/gtype/gtype_int.go (87%) rename {geg => example}/container/gvar/g.var.go (93%) rename {geg => example}/database/gdb/mssql/config.toml (100%) rename {geg => example}/database/gdb/mssql/gdb_all.go (86%) rename {geg => example}/database/gdb/mssql/gdb_sqlserver.go (99%) rename {geg => example}/database/gdb/mysql/config.toml (100%) rename {geg => example}/database/gdb/mysql/config2.toml (100%) rename {geg => example}/database/gdb/mysql/config3.toml (100%) rename {geg => example}/database/gdb/mysql/gdb.go (99%) rename {geg => example}/database/gdb/mysql/gdb_all.go (89%) rename {geg => example}/database/gdb/mysql/gdb_args_slice.go (94%) rename {geg => example}/database/gdb/mysql/gdb_binary.go (88%) rename {geg => example}/database/gdb/mysql/gdb_bit.go (86%) rename {geg => example}/database/gdb/mysql/gdb_cache.go (92%) rename {geg => example}/database/gdb/mysql/gdb_config.go (87%) rename {geg => example}/database/gdb/mysql/gdb_config2.go (89%) rename {geg => example}/database/gdb/mysql/gdb_config3.go (93%) rename {geg => example}/database/gdb/mysql/gdb_datetime.go (87%) rename {geg => example}/database/gdb/mysql/gdb_debug1.go (87%) rename {geg => example}/database/gdb/mysql/gdb_debug2.go (91%) rename {geg => example}/database/gdb/mysql/gdb_insert.go (92%) rename {geg => example}/database/gdb/mysql/gdb_json_xml.go (86%) rename {geg => example}/database/gdb/mysql/gdb_pool.go (91%) rename {geg => example}/database/gdb/mysql/gdb_struct.go (91%) rename {geg => example}/database/gdb/mysql/gdb_update_union.go (90%) rename {geg => example}/database/gdb/mysql/gdb_value.go (90%) rename {geg => example}/database/gdb/oracle/gdb.go (99%) rename {geg => example}/database/gdb/sqlite/sqlite.go (86%) rename {geg => example}/database/gredis/config.toml (100%) rename {geg => example}/database/gredis/gredis.go (81%) rename {geg => example}/database/gredis/gredis2.go (80%) rename {geg => example}/database/gredis/gredis_conn_do.go (73%) rename {geg => example}/database/gredis/gredis_conn_do_var.go (87%) rename {geg => example}/database/gredis/gredis_conn_send.go (81%) rename {geg => example}/database/gredis/gredis_conn_send_var.go (89%) rename {geg => example}/database/gredis/gredis_conn_subscribe.go (81%) rename {geg => example}/database/gredis/gredis_conn_subscribe_var.go (90%) rename {geg => example}/encoding/gbase64.go (79%) rename {geg => example}/encoding/gbinary/binary.go (96%) rename {geg => example}/encoding/gbinary/bits1.go (94%) rename {geg => example}/encoding/gbinary/bits2.go (96%) rename {geg => example}/encoding/gcfg/config.toml (100%) rename {geg => example}/encoding/gcfg/gcfg1.go (89%) rename {geg => example}/encoding/gcharset/gcharset.go (85%) rename {geg => example}/encoding/gcompress/unzip.go (84%) rename {geg => example}/encoding/gcompress/unzip_content.go (77%) rename {geg => example}/encoding/gcompress/zip.go (85%) rename {geg => example}/encoding/ghash.go (88%) rename {geg => example}/encoding/gjson.go (96%) rename {geg => example}/encoding/gparser/gparser.go (98%) rename {geg => example}/encoding/gparser/gparser_xml.go (88%) rename {geg => example}/errors/gerror/gerror1.go (91%) rename {geg => example}/errors/gerror/gerror2.go (91%) rename {geg => example}/errors/gerror/gerror3.go (88%) rename {geg => example}/errors/gerror/gerror4.go (90%) rename {geg => example}/errors/gerror/gerror5.go (74%) rename {geg => example}/frame/mvc/config.json (100%) rename {geg => example}/frame/mvc/config.toml (100%) rename {geg => example}/frame/mvc/config.xml (100%) rename {geg => example}/frame/mvc/config.yml (100%) rename {geg => example}/frame/mvc/controller/demo/apple_pen.go (84%) rename {geg => example}/frame/mvc/controller/demo/buildin_vars.go (75%) rename {geg => example}/frame/mvc/controller/demo/config.go (72%) rename {geg => example}/frame/mvc/controller/demo/cookie.go (78%) rename {geg => example}/frame/mvc/controller/demo/domain.go (93%) rename {geg => example}/frame/mvc/controller/demo/exit.go (84%) rename {geg => example}/frame/mvc/controller/demo/form.go (95%) rename {geg => example}/frame/mvc/controller/demo/hello.go (76%) rename {geg => example}/frame/mvc/controller/demo/method.go (91%) rename {geg => example}/frame/mvc/controller/demo/object.go (81%) rename {geg => example}/frame/mvc/controller/demo/object_method.go (90%) rename {geg => example}/frame/mvc/controller/demo/object_rest.go (93%) rename {geg => example}/frame/mvc/controller/demo/product.go (86%) rename {geg => example}/frame/mvc/controller/demo/rest.go (89%) rename {geg => example}/frame/mvc/controller/demo/rule.go (79%) rename {geg => example}/frame/mvc/controller/demo/session.go (87%) rename {geg => example}/frame/mvc/controller/demo/template.go (83%) rename {geg => example}/frame/mvc/controller/demo/template2.go (80%) rename {geg => example}/frame/mvc/controller/demo/template3.go (81%) rename {geg => example}/frame/mvc/controller/demo/upload.go (92%) rename {geg => example}/frame/mvc/controller/demo/user.go (88%) rename {geg => example}/frame/mvc/controller/stats/stats.go (75%) rename {geg => example}/frame/mvc/main.go (88%) rename {geg => example}/frame/mvc/view/upload/upload.tpl (100%) rename {geg => example}/frame/mvc/view/user/footer.tpl (100%) rename {geg => example}/frame/mvc/view/user/index.tpl (100%) rename {geg => example}/net/ghttp/client/cookie/client.go (78%) rename {geg => example}/net/ghttp/client/cookie/server.go (73%) rename {geg => example}/net/ghttp/client/get.go (89%) rename {geg => example}/net/ghttp/client/upload/client.go (82%) rename {geg => example}/net/ghttp/client/upload/server.go (91%) rename {geg => example}/net/ghttp/server/controller/user.go (85%) rename {geg => example}/net/ghttp/server/cookie.go (74%) rename {geg => example}/net/ghttp/server/denyroutes/config.toml (100%) rename {geg => example}/net/ghttp/server/denyroutes/denyroutes.go (76%) rename {geg => example}/net/ghttp/server/domain.go (89%) rename {geg => example}/net/ghttp/server/download/download.go (89%) rename {geg => example}/net/ghttp/server/download/text.txt (100%) rename {geg => example}/net/ghttp/server/duplicate/duplicate1.go (82%) rename {geg => example}/net/ghttp/server/duplicate/duplicate2.go (90%) rename {geg => example}/net/ghttp/server/duplicate/duplicate3.go (86%) rename {geg => example}/net/ghttp/server/exit.go (84%) rename {geg => example}/net/ghttp/server/hello.go (75%) rename {geg => example}/net/ghttp/server/hooks/cors1.go (81%) rename {geg => example}/net/ghttp/server/hooks/cors2.go (80%) rename {geg => example}/net/ghttp/server/hooks/hooks1.go (89%) rename {geg => example}/net/ghttp/server/hooks/hooks2.go (93%) rename {geg => example}/net/ghttp/server/hooks/hooks4.go (87%) rename {geg => example}/net/ghttp/server/hooks/hooks5.go (83%) rename {geg => example}/net/ghttp/server/hooks/hooks_param.go (84%) rename {geg => example}/net/ghttp/server/hooks/same_route_multi_hook.go (93%) rename {geg => example}/net/ghttp/server/https/https.go (89%) rename {geg => example}/net/ghttp/server/https/https_http.go (90%) rename {geg => example}/net/ghttp/server/https/server.crt (100%) rename {geg => example}/net/ghttp/server/https/server.key (100%) rename {geg => example}/net/ghttp/server/https/server.key.public (100%) rename {geg => example}/net/ghttp/server/log/log.go (94%) rename {geg => example}/net/ghttp/server/log/log_error.go (88%) rename {geg => example}/net/ghttp/server/name.go (92%) rename {geg => example}/net/ghttp/server/nethttp_server.go (100%) rename {geg => example}/net/ghttp/server/object/user.go (84%) rename {geg => example}/net/ghttp/server/ports.go (84%) rename {geg => example}/net/ghttp/server/pprof.go (85%) rename {geg => example}/net/ghttp/server/redirect/back.go (81%) rename {geg => example}/net/ghttp/server/reload/admin.go (89%) rename {geg => example}/net/ghttp/server/reload/https.go (80%) rename {geg => example}/net/ghttp/server/reload/https_http.go (91%) rename {geg => example}/net/ghttp/server/reload/multi_port_and_server.go (87%) rename {geg => example}/net/ghttp/server/reload/simple.go (82%) rename {geg => example}/net/ghttp/server/request/request_struct.go (90%) rename {geg => example}/net/ghttp/server/request/request_validation.go (87%) rename {geg => example}/net/ghttp/server/reuseport/reuseport.go (80%) rename {geg => example}/net/ghttp/server/router/group/group1.go (94%) rename {geg => example}/net/ghttp/server/router/router1.go (90%) rename {geg => example}/net/ghttp/server/router/router2.go (95%) rename {geg => example}/net/ghttp/server/router/router3.go (92%) rename {geg => example}/net/ghttp/server/router/router4.go (90%) rename {geg => example}/net/ghttp/server/router/router5.go (89%) rename {geg => example}/net/ghttp/server/router/router6.go (78%) rename {geg => example}/net/ghttp/server/server2.go (90%) rename {geg => example}/net/ghttp/server/session.go (72%) rename {geg => example}/net/ghttp/server/session/config.toml (100%) rename {geg => example}/net/ghttp/server/session/session.go (90%) rename {geg => example}/net/ghttp/server/session/session_redis.go (95%) rename {geg => example}/net/ghttp/server/static/static.go (85%) rename {geg => example}/net/ghttp/server/static/static_path.go (88%) rename {geg => example}/net/ghttp/server/static/static_path2.go (90%) rename {geg => example}/net/ghttp/server/status.go (81%) rename {geg => example}/net/ghttp/server/status_map.go (83%) rename {geg => example}/net/ghttp/server/status_redirect.go (83%) rename {geg => example}/net/ghttp/server/template/build-in/objects/objects.go (77%) rename {geg => example}/net/ghttp/server/template/build-in/vars/config.toml (100%) rename {geg => example}/net/ghttp/server/template/build-in/vars/vars.go (85%) rename {geg => example}/net/ghttp/server/template/layout/main.go (86%) rename {geg => example}/net/ghttp/server/template/layout/template/footer.html (100%) rename {geg => example}/net/ghttp/server/template/layout/template/header.html (100%) rename {geg => example}/net/ghttp/server/template/layout/template/layout.html (100%) rename {geg => example}/net/ghttp/server/template/layout/template/main/main1.html (100%) rename {geg => example}/net/ghttp/server/template/layout/template/main/main2.html (100%) rename {geg => example}/net/ghttp/server/template/tpl1/index.html (100%) rename {geg => example}/net/ghttp/server/template/tpl1/tpl1.go (79%) rename {geg => example}/net/ghttp/server/template/tpl2/main.go (78%) rename {geg => example}/net/ghttp/server/template/tpl2/public/test.html (100%) rename {geg => example}/net/ghttp/server/template/tpl2/template/test.html (100%) rename {geg => example}/net/ghttp/server/websocket/echo-wss/index.html (100%) rename {geg => example}/net/ghttp/server/websocket/echo-wss/main.go (79%) rename {geg => example}/net/ghttp/server/websocket/echo/index.html (100%) rename {geg => example}/net/ghttp/server/websocket/echo/main-group.go (78%) rename {geg => example}/net/ghttp/server/websocket/echo/main.go (77%) rename {geg => example}/net/gtcp/gtcp_conn.go (93%) rename {geg => example}/net/gtcp/gtcp_echo_server.go (91%) rename {geg => example}/net/gtcp/gtcp_func.go (88%) rename {geg => example}/net/gtcp/gtcp_pool1.go (88%) rename {geg => example}/net/gtcp/gtcp_pool2.go (88%) rename {geg => example}/net/gtcp/gtcp_server_client1.go (87%) rename {geg => example}/net/gtcp/gtcp_server_client2.go (88%) rename {geg => example}/net/gtcp/gtcp_timeout_client.go (72%) rename {geg => example}/net/gtcp/gtcp_timeout_server.go (91%) rename {geg => example}/net/gtcp/pkg_operations/common/funcs/funcs.go (95%) rename {geg => example}/net/gtcp/pkg_operations/common/gtcp_common_client.go (93%) rename {geg => example}/net/gtcp/pkg_operations/common/gtcp_common_server.go (91%) rename {geg => example}/net/gtcp/pkg_operations/common/types/types.go (100%) rename {geg => example}/net/gtcp/pkg_operations/gtcp_basic.go (85%) rename {geg => example}/net/gtcp/pkg_operations/gtcp_empty_data.go (89%) rename {geg => example}/net/gtcp/pkg_operations/gtcp_pkg_option.go (85%) rename {geg => example}/net/gtcp/pkg_operations/monitor/gtcp_monitor_client.go (86%) rename {geg => example}/net/gtcp/pkg_operations/monitor/gtcp_monitor_server.go (90%) rename {geg => example}/net/gtcp/pkg_operations/monitor/types/types.go (88%) rename {geg => example}/net/gtcp/server_client/gtcp_client.go (74%) rename {geg => example}/net/gtcp/server_client/gtcp_server.go (91%) rename {geg => example}/net/gtcp/tcp_server_client.go (100%) rename {geg => example}/net/gtcp/tls/gtcp_server_client.go (90%) rename {geg => example}/net/gtcp/tls/server.crt (100%) rename {geg => example}/net/gtcp/tls/server.key (100%) rename {geg => example}/net/gtcp/tls/server.key.public (100%) rename {geg => example}/net/gudp/gudp_server.go (86%) rename {geg => example}/net/gudp/gudp_server_client.go (88%) rename {geg => example}/net/gudp/udp_client.go (100%) rename {geg => example}/net/gudp/udp_server.go (100%) rename {geg => example}/os/console.go (87%) rename {geg => example}/os/gcache/usage_basic.go (93%) rename {geg => example}/os/gcache/usage_lru.go (93%) rename {geg => example}/os/gcache/usage_senior.go (94%) rename {geg => example}/os/gcfg/config.json (100%) rename {geg => example}/os/gcfg/config.toml (100%) rename {geg => example}/os/gcfg/gcfg1.go (89%) rename {geg => example}/os/gcfg/gcfg2.go (83%) rename {geg => example}/os/gcfg/gcfg3.go (81%) rename {geg => example}/os/gcfg/gcfg4.go (85%) rename {geg => example}/os/gcfg/gcfg_auto_update.go (84%) rename {geg => example}/os/gcfg/gcfg_error.go (83%) rename {geg => example}/os/gcfg/memcache.yml (100%) rename {geg => example}/os/gcfg/redis.toml (100%) rename {geg => example}/os/gcmd/gcmd1.go (87%) rename {geg => example}/os/gcron/gcron-log.go (73%) rename {geg => example}/os/gcron/gcron1.go (91%) rename {geg => example}/os/gcron/gcron2.go (74%) rename {geg => example}/os/gfcache/gfcache.go (86%) rename {geg => example}/os/gfile/gfile.go (91%) rename {geg => example}/os/gfile/gfile_contents.go (92%) rename {geg => example}/os/gfile/gfile_scan.go (71%) rename {geg => example}/os/gflock/flock.go (72%) rename {geg => example}/os/gflock/gflock.go (69%) rename {geg => example}/os/gfpool/gfpool.go (88%) rename {geg => example}/os/gfsnotify/fsnotify.go (87%) rename {geg => example}/os/gfsnotify/gfsnotify.go (77%) rename {geg => example}/os/gfsnotify/gfsnotify_callback.go (87%) rename {geg => example}/os/gfsnotify/gfsnotify_callback_folder.go (82%) rename {geg => example}/os/gfsnotify/gfsnotify_limit.go (81%) rename {geg => example}/os/glog/glog_async1.go (81%) rename {geg => example}/os/glog/glog_async2.go (83%) rename {geg => example}/os/glog/glog_category.go (70%) rename {geg => example}/os/glog/glog_debug.go (65%) rename {geg => example}/os/glog/glog_error.go (69%) rename {geg => example}/os/glog/glog_file.go (88%) rename {geg => example}/os/glog/glog_flags.go (91%) rename {geg => example}/os/glog/glog_gerror.go (82%) rename {geg => example}/os/glog/glog_json.go (76%) rename {geg => example}/os/glog/glog_level.go (85%) rename {geg => example}/os/glog/glog_line.go (84%) rename {geg => example}/os/glog/glog_line2.go (87%) rename {geg => example}/os/glog/glog_path.go (69%) rename {geg => example}/os/glog/glog_pool.go (78%) rename {geg => example}/os/glog/glog_prefix.go (80%) rename {geg => example}/os/glog/glog_stack.go (83%) rename {geg => example}/os/glog/glog_stdout.go (89%) rename {geg => example}/os/glog/glog_writer_greylog.go (94%) rename {geg => example}/os/glog/glog_writer_hook.go (82%) rename {geg => example}/os/gmlock/locker1.go (82%) rename {geg => example}/os/gmlock/locker2.go (79%) rename {geg => example}/os/gmlock/locker3.go (84%) rename {geg => example}/os/gmlock/locker4.go (91%) rename {geg => example}/os/gmlock/test_locker.go (97%) rename {geg => example}/os/gmlock/test_mutex.go (97%) rename {geg => example}/os/gmutex/gmutex_basic.go (85%) rename {geg => example}/os/gmutex/gmutex_func.go (80%) rename {geg => example}/os/gproc/gproc.go (89%) rename {geg => example}/os/gproc/gproc2.go (88%) rename {geg => example}/os/gproc/gproc3.go (93%) rename {geg => example}/os/gproc/gproc4.go (71%) rename {geg => example}/os/gproc/gproc_comm.go (84%) rename {geg => example}/os/gproc/gproc_comm_group.go (95%) rename {geg => example}/os/gproc/gproc_comm_send.go (81%) rename {geg => example}/os/gproc/gproc_shellexec.go (83%) rename {geg => example}/os/grpool/goroutine.go (89%) rename {geg => example}/os/grpool/grpool.go (82%) rename {geg => example}/os/grpool/grpool1.go (85%) rename {geg => example}/os/grpool/grpool2.go (85%) rename {geg => example}/os/grpool/grpool3.go (86%) rename {geg => example}/os/grpool/grpool4.go (100%) rename {geg => example}/os/grpool/grpool5.go (86%) rename {geg => example}/os/gspath/gspath.go (75%) rename {geg => example}/os/gtime/gtime_format.go (89%) rename {geg => example}/os/gtime/gtime_func.go (90%) rename {geg => example}/os/gtime/gtime_json.go (82%) rename {geg => example}/os/gtime/gtime_layout.go (89%) rename {geg => example}/os/gtime/gtime_linkop.go (93%) rename {geg => example}/os/gtime/gtime_parsertime.go (95%) rename {geg => example}/os/gtime/gtime_regex1.go (95%) rename {geg => example}/os/gtime/gtime_regex2.go (94%) rename {geg => example}/os/gtime/gtime_strtotime.go (93%) rename {geg => example}/os/gtime/gtime_strtotime2.go (85%) rename {geg => example}/os/gtime/gtime_zone.go (92%) rename {geg => example}/os/gtimer/gtimer-batch.go (84%) rename {geg => example}/os/gtimer/gtimer1.go (89%) rename {geg => example}/os/gtimer/gtimer2.go (86%) rename {geg => example}/os/gtimer/gtimer3.go (73%) rename {geg => example}/os/gtimer/gtimer4.go (77%) rename {geg => example}/os/gtimer/sleep1.go (100%) rename {geg => example}/os/gtimer/sleep2.go (100%) rename {geg => example}/os/gtimer/ticker1.go (100%) rename {geg => example}/os/gtimer/ticker2.go (100%) rename {geg => example}/os/gview/assign/assign.go (77%) rename {geg => example}/os/gview/basic/gview.go (86%) rename {geg => example}/os/gview/basic/gview.tpl (100%) rename {geg => example}/os/gview/bind_func/gview_func1.go (86%) rename {geg => example}/os/gview/bind_func/gview_func2.go (94%) rename {geg => example}/os/gview/bind_func/index.html (100%) rename {geg => example}/os/gview/build_in_funcs/build_in_funcs1.go (96%) rename {geg => example}/os/gview/build_in_funcs/build_in_funcs2.go (95%) rename {geg => example}/os/gview/define/main.go (80%) rename {geg => example}/os/gview/define/template/index.html (100%) rename {geg => example}/os/gview/define/template/subs/sub.html (100%) rename {geg => example}/os/gview/delimiters/gview_delimiters.go (87%) rename {geg => example}/os/gview/delimiters/gview_delimiters.tpl (100%) rename {geg => example}/os/gview/func_html/func_html.go (90%) rename {geg => example}/os/gview/func_text/func_text.go (69%) rename {geg => example}/os/gview/hot_update/controller_hot_update.go (86%) rename {geg => example}/os/gview/hot_update/gview_hot_update.go (81%) rename {geg => example}/os/gview/hot_update/web_hot_update.go (80%) rename {geg => example}/os/gview/include/main.go (84%) rename {geg => example}/os/gview/include/template/index.html (100%) rename {geg => example}/os/gview/include/template/subs/sub.html (100%) rename {geg => example}/os/gview/layout/layout1/main.go (79%) rename {geg => example}/os/gview/layout/layout1/template/container.html (100%) rename {geg => example}/os/gview/layout/layout1/template/footer.html (100%) rename {geg => example}/os/gview/layout/layout1/template/header.html (100%) rename {geg => example}/os/gview/layout/layout1/template/layout.html (100%) rename {geg => example}/os/gview/layout/layout2/main.go (85%) rename {geg => example}/os/gview/layout/layout2/template/footer.html (100%) rename {geg => example}/os/gview/layout/layout2/template/header.html (100%) rename {geg => example}/os/gview/layout/layout2/template/layout.html (100%) rename {geg => example}/os/gview/layout/layout2/template/main/main1.html (100%) rename {geg => example}/os/gview/layout/layout2/template/main/main2.html (100%) rename {geg => example}/os/gview/object/object.go (93%) rename {geg => example}/other/config.toml (100%) rename {geg => example}/other/terminal-color.go (100%) rename {geg => example}/other/test.go (63%) rename {geg => example}/other/test2.go (66%) rename {geg => example}/other/try-catch.go (83%) rename {geg => example}/util/gconv/gconv.go (96%) rename {geg => example}/util/gconv/gconv_map1.go (91%) rename {geg => example}/util/gconv/gconv_map2.go (90%) rename {geg => example}/util/gconv/gconv_map_deep.go (88%) rename {geg => example}/util/gconv/gconv_map_tag.go (77%) rename {geg => example}/util/gconv/gconv_slice.go (88%) rename {geg => example}/util/gconv/gconv_struct1.go (93%) rename {geg => example}/util/gconv/gconv_struct2.go (87%) rename {geg => example}/util/gconv/gconv_struct3.go (88%) rename {geg => example}/util/gconv/gconv_struct4.go (89%) rename {geg => example}/util/gconv/gconv_struct5.go (87%) rename {geg => example}/util/gconv/gconv_struct6.go (89%) rename {geg => example}/util/gconv/gconv_struct_create.go (79%) rename {geg => example}/util/gconv/gconv_struct_deep.go (89%) rename {geg => example}/util/gconv/strings.go (72%) rename {geg => example}/util/gconv/time1.go (85%) rename {geg => example}/util/gconv/time2.go (86%) rename {geg => example}/util/gpage/gpage.go (86%) rename {geg => example}/util/gpage/gpage_ajax.go (88%) rename {geg => example}/util/gpage/gpage_custom1.go (85%) rename {geg => example}/util/gpage/gpage_custom2.go (88%) rename {geg => example}/util/gpage/gpage_static1.go (87%) rename {geg => example}/util/gpage/gpage_static2.go (87%) rename {geg => example}/util/gpage/gpage_template.go (87%) rename {geg => example}/util/grand/grand.go (76%) rename {geg => example}/util/grand/rand.go (97%) rename {geg => example}/util/gregex/gregex.go (84%) rename {geg => example}/util/gstr/gstr_hidestr.go (83%) rename {geg => example}/util/gstr/gstr_substr.go (81%) rename {geg => example}/util/gutil/dump.go (74%) rename {geg => example}/util/gutil/stack.go (78%) rename {geg => example}/util/gutil/try_catch.go (83%) rename {geg => example}/util/gvalid/gvalid.go (96%) rename {geg => example}/util/gvalid/gvalid_error.go (88%) rename {geg => example}/util/gvalid/gvalid_result.go (88%) rename {geg => example}/util/gvalid/gvalid_sequence.go (95%) rename {geg => example}/util/gvalid/gvalid_struct1.go (93%) rename {geg => example}/util/gvalid/gvalid_struct2.go (74%) rename {geg => example}/util/gvalid/gvalid_struct3.go (79%) rename {g => frame/g}/g.go (96%) rename {g => frame/g}/g_func.go (89%) rename {g => frame/g}/g_logger.go (95%) rename {g => frame/g}/g_object.go (84%) rename {g => frame/g}/g_setting.go (92%) rename {g/frame => frame}/gins/gins.go (95%) rename {g/frame => frame}/gins/gins_basic_test.go (94%) rename {g/frame => frame}/gins/gins_config_test.go (97%) rename {g/frame => frame}/gins/gins_database_test.go (94%) rename {g/frame => frame}/gins/gins_redis_test.go (95%) rename {g/frame => frame}/gins/gins_view_test.go (90%) rename {g/frame => frame}/gmvc/controller.go (96%) rename {g/frame => frame}/gmvc/model.go (100%) rename {g/frame => frame}/gmvc/view.go (96%) rename {g/internal => internal}/cmdenv/cmdenv.go (97%) rename {g/internal => internal}/cmdenv/cmdenv_test.go (95%) rename {g/internal => internal}/debug/debug.go (98%) rename {g/internal => internal}/empty/empty.go (100%) rename {g/internal => internal}/empty/empty_test.go (95%) rename {g/internal => internal}/mutex/mutex.go (100%) rename {g/internal => internal}/mutex/mutex_z_bench_test.go (94%) rename {g/internal => internal}/mutex/mutex_z_unit_test.go (95%) rename {g/internal => internal}/rwmutex/rwmutex.go (100%) rename {g/internal => internal}/rwmutex/rwmutex_z_bench_test.go (95%) rename {g/internal => internal}/rwmutex/rwmutex_z_unit_test.go (96%) rename {g/internal => internal}/structs/structs.go (86%) rename {g/internal => internal}/structs/structs_map.go (95%) rename {g/internal => internal}/structs/structs_tag.go (97%) rename {g/internal => internal}/structs/structs_test.go (95%) rename {g/internal => internal}/strutils/strutils.go (100%) rename {third => internal/thirdparty}/github.com/BurntSushi/toml/.gitignore (100%) rename {third => internal/thirdparty}/github.com/BurntSushi/toml/.travis.yml (100%) rename {third => internal/thirdparty}/github.com/BurntSushi/toml/COMPATIBLE (100%) rename {third => internal/thirdparty}/github.com/BurntSushi/toml/COPYING (100%) rename {third => internal/thirdparty}/github.com/BurntSushi/toml/Makefile (100%) rename {third => internal/thirdparty}/github.com/BurntSushi/toml/README.md (100%) rename {third => internal/thirdparty}/github.com/BurntSushi/toml/decode.go (100%) rename {third => internal/thirdparty}/github.com/BurntSushi/toml/decode_meta.go (100%) rename {third => internal/thirdparty}/github.com/BurntSushi/toml/decode_test.go (100%) rename {third => internal/thirdparty}/github.com/BurntSushi/toml/doc.go (100%) rename {third => internal/thirdparty}/github.com/BurntSushi/toml/encode.go (100%) rename {third => internal/thirdparty}/github.com/BurntSushi/toml/encode_test.go (100%) rename {third => internal/thirdparty}/github.com/BurntSushi/toml/encoding_types.go (100%) rename {third => internal/thirdparty}/github.com/BurntSushi/toml/encoding_types_1.1.go (100%) rename {third => internal/thirdparty}/github.com/BurntSushi/toml/lex.go (100%) rename {third => internal/thirdparty}/github.com/BurntSushi/toml/parse.go (100%) rename {third => internal/thirdparty}/github.com/BurntSushi/toml/session.vim (100%) rename {third => internal/thirdparty}/github.com/BurntSushi/toml/type_check.go (100%) rename {third => internal/thirdparty}/github.com/BurntSushi/toml/type_fields.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/LICENSE (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/anyxml.go (98%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/anyxml_test.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/atomFeedString.xml (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/attrprefix_test.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/badxml_test.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/bom_test.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/bulk_test.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/bulkraw_test.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/data_test.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/doc.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/escapechars.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/escapechars_test.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/example_test.go (99%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/exists.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/exists_test.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/files.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/files_test.badjson (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/files_test.badxml (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/files_test.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/files_test.json (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/files_test.xml (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/files_test_dup.json (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/files_test_dup.xml (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/files_test_indent.json (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/files_test_indent.xml (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/gob.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/gob_test.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/j2x/j2x.go (98%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/j2x/j2x_test.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/j2x_test.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/json.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/json_test.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/keystolower_test.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/keyvalues.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/keyvalues2_test.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/keyvalues_test.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/leafnode.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/leafnode_test.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/misc.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/misc_test.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/mxj.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/mxj_test.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/namespace_test.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/nan_test.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/newmap.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/newmap_test.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/readme.md (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/remove.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/remove_test.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/rename.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/rename_test.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/seqnum_test.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/set.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/set_test.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/setfieldsep.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/snakecase_test.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/songtext.xml (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/strict.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/strict_test.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/struct.go (91%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/struct_test.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/updatevalues.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/updatevalues_test.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/x2j-wrapper/LICENSE (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/x2j-wrapper/README (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/x2j-wrapper/atomFeedString.xml (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/x2j-wrapper/goofy_test.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/x2j-wrapper/pathTestString.xml (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/x2j-wrapper/reader2j.go (96%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/x2j-wrapper/reader2j_test.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/x2j-wrapper/songTextString.xml (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/x2j-wrapper/x2j.go (99%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/x2j-wrapper/x2j_bulk.go (98%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/x2j-wrapper/x2j_findPath.go (98%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/x2j-wrapper/x2j_test.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/x2j-wrapper/x2j_test.xml (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/x2j-wrapper/x2j_valuesAt.go (97%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/x2j-wrapper/x2j_valuesFrom.go (98%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/x2j-wrapper/x2jat_test.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/x2j-wrapper/x2jfindPath_test.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/x2j-wrapper/x2jpath_test.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/x2j-wrapper/x2junmarshal_test.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/x2j-wrapper/x2m_bulk.go (98%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/x2j-wrapper/x2m_bulk.xml (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/x2j-wrapper/xml.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/x2j/x2j.go (98%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/xml.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/xml2_test.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/xml3_test.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/xml_test.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/xmlseq.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/xmlseq_test.go (100%) rename {third => internal/thirdparty}/github.com/clbanning/mxj/xmppStream_test.go (100%) rename {third => internal/thirdparty}/github.com/fatih/structs/.gitignore (100%) rename {third => internal/thirdparty}/github.com/fatih/structs/.travis.yml (100%) rename {third => internal/thirdparty}/github.com/fatih/structs/LICENSE (100%) rename {third => internal/thirdparty}/github.com/fatih/structs/README.md (100%) rename {third => internal/thirdparty}/github.com/fatih/structs/field.go (100%) rename {third => internal/thirdparty}/github.com/fatih/structs/field_test.go (100%) rename {third => internal/thirdparty}/github.com/fatih/structs/structs.go (100%) rename {third => internal/thirdparty}/github.com/fatih/structs/structs_example_test.go (100%) rename {third => internal/thirdparty}/github.com/fatih/structs/structs_test.go (100%) rename {third => internal/thirdparty}/github.com/fatih/structs/tags.go (100%) rename {third => internal/thirdparty}/github.com/fatih/structs/tags_test.go (100%) rename {third => internal/thirdparty}/github.com/fsnotify/fsnotify/.editorconfig (100%) rename {third => internal/thirdparty}/github.com/fsnotify/fsnotify/.gitignore (100%) rename {third => internal/thirdparty}/github.com/fsnotify/fsnotify/.travis.yml (100%) rename {third => internal/thirdparty}/github.com/fsnotify/fsnotify/AUTHORS (100%) rename {third => internal/thirdparty}/github.com/fsnotify/fsnotify/CHANGELOG.md (100%) rename {third => internal/thirdparty}/github.com/fsnotify/fsnotify/CONTRIBUTING.md (100%) rename {third => internal/thirdparty}/github.com/fsnotify/fsnotify/LICENSE (100%) rename {third => internal/thirdparty}/github.com/fsnotify/fsnotify/README.md (100%) rename {third => internal/thirdparty}/github.com/fsnotify/fsnotify/example_test.go (91%) rename {third => internal/thirdparty}/github.com/fsnotify/fsnotify/fen.go (100%) rename {third => internal/thirdparty}/github.com/fsnotify/fsnotify/fsnotify.go (100%) rename {third => internal/thirdparty}/github.com/fsnotify/fsnotify/fsnotify_test.go (100%) rename {third => internal/thirdparty}/github.com/fsnotify/fsnotify/inotify.go (99%) rename {third => internal/thirdparty}/github.com/fsnotify/fsnotify/inotify_poller.go (98%) rename {third => internal/thirdparty}/github.com/fsnotify/fsnotify/inotify_poller_test.go (98%) rename {third => internal/thirdparty}/github.com/fsnotify/fsnotify/inotify_test.go (100%) rename {third => internal/thirdparty}/github.com/fsnotify/fsnotify/integration_darwin_test.go (98%) rename {third => internal/thirdparty}/github.com/fsnotify/fsnotify/integration_test.go (100%) rename {third => internal/thirdparty}/github.com/fsnotify/fsnotify/kqueue.go (99%) rename {third => internal/thirdparty}/github.com/fsnotify/fsnotify/open_mode_bsd.go (79%) rename {third => internal/thirdparty}/github.com/fsnotify/fsnotify/open_mode_darwin.go (79%) rename {third => internal/thirdparty}/github.com/fsnotify/fsnotify/windows.go (100%) rename {third => internal/thirdparty}/github.com/gf-third/mysql/AUTHORS (100%) rename {third => internal/thirdparty}/github.com/gf-third/mysql/CHANGELOG.md (100%) rename {third => internal/thirdparty}/github.com/gf-third/mysql/CONTRIBUTING.md (100%) rename {third => internal/thirdparty}/github.com/gf-third/mysql/LICENSE (100%) rename {third => internal/thirdparty}/github.com/gf-third/mysql/README.md (100%) rename {third => internal/thirdparty}/github.com/gf-third/mysql/appengine.go (100%) rename {third => internal/thirdparty}/github.com/gf-third/mysql/auth.go (100%) rename {third => internal/thirdparty}/github.com/gf-third/mysql/auth_test.go (100%) rename {third => internal/thirdparty}/github.com/gf-third/mysql/benchmark_test.go (100%) rename {third => internal/thirdparty}/github.com/gf-third/mysql/buffer.go (100%) rename {third => internal/thirdparty}/github.com/gf-third/mysql/collations.go (100%) rename {third => internal/thirdparty}/github.com/gf-third/mysql/conncheck.go (100%) rename {third => internal/thirdparty}/github.com/gf-third/mysql/conncheck_dummy.go (100%) rename {third => internal/thirdparty}/github.com/gf-third/mysql/conncheck_test.go (100%) rename {third => internal/thirdparty}/github.com/gf-third/mysql/connection.go (100%) rename {third => internal/thirdparty}/github.com/gf-third/mysql/connection_test.go (100%) rename {third => internal/thirdparty}/github.com/gf-third/mysql/connector.go (100%) rename {third => internal/thirdparty}/github.com/gf-third/mysql/const.go (100%) rename {third => internal/thirdparty}/github.com/gf-third/mysql/driver.go (100%) rename {third => internal/thirdparty}/github.com/gf-third/mysql/driver_go110.go (100%) rename {third => internal/thirdparty}/github.com/gf-third/mysql/driver_go110_test.go (100%) rename {third => internal/thirdparty}/github.com/gf-third/mysql/driver_test.go (100%) rename {third => internal/thirdparty}/github.com/gf-third/mysql/dsn.go (100%) rename {third => internal/thirdparty}/github.com/gf-third/mysql/dsn_test.go (100%) rename {third => internal/thirdparty}/github.com/gf-third/mysql/errors.go (100%) rename {third => internal/thirdparty}/github.com/gf-third/mysql/errors_test.go (100%) rename {third => internal/thirdparty}/github.com/gf-third/mysql/fields.go (100%) rename {third => internal/thirdparty}/github.com/gf-third/mysql/infile.go (100%) rename {third => internal/thirdparty}/github.com/gf-third/mysql/packets.go (100%) rename {third => internal/thirdparty}/github.com/gf-third/mysql/packets_test.go (100%) rename {third => internal/thirdparty}/github.com/gf-third/mysql/result.go (100%) rename {third => internal/thirdparty}/github.com/gf-third/mysql/rows.go (100%) rename {third => internal/thirdparty}/github.com/gf-third/mysql/statement.go (100%) rename {third => internal/thirdparty}/github.com/gf-third/mysql/statement_test.go (100%) rename {third => internal/thirdparty}/github.com/gf-third/mysql/transaction.go (100%) rename {third => internal/thirdparty}/github.com/gf-third/mysql/utils.go (100%) rename {third => internal/thirdparty}/github.com/gf-third/mysql/utils_test.go (100%) rename {third => internal/thirdparty}/github.com/ghodss/yaml/.gitignore (100%) rename {third => internal/thirdparty}/github.com/ghodss/yaml/.travis.yml (100%) rename {third => internal/thirdparty}/github.com/ghodss/yaml/LICENSE (100%) rename {third => internal/thirdparty}/github.com/ghodss/yaml/README.md (93%) rename {third => internal/thirdparty}/github.com/ghodss/yaml/fields.go (100%) rename {third => internal/thirdparty}/github.com/ghodss/yaml/yaml.go (99%) rename {third => internal/thirdparty}/github.com/ghodss/yaml/yaml_test.go (100%) rename {third => internal/thirdparty}/github.com/gomodule/redigo/.travis.yml (100%) rename {third => internal/thirdparty}/github.com/gomodule/redigo/LICENSE (100%) rename {third => internal/thirdparty}/github.com/gomodule/redigo/README.markdown (100%) rename {third => internal/thirdparty}/github.com/gomodule/redigo/internal/commandinfo.go (92%) rename {third => internal/thirdparty}/github.com/gomodule/redigo/internal/commandinfo_test.go (100%) rename {third => internal/thirdparty}/github.com/gomodule/redigo/internal/redistest/testdb.go (95%) rename {third => internal/thirdparty}/github.com/gomodule/redigo/redis/conn.go (100%) rename {third => internal/thirdparty}/github.com/gomodule/redigo/redis/conn_test.go (99%) rename {third => internal/thirdparty}/github.com/gomodule/redigo/redis/doc.go (98%) rename {third => internal/thirdparty}/github.com/gomodule/redigo/redis/go16.go (100%) rename {third => internal/thirdparty}/github.com/gomodule/redigo/redis/go17.go (100%) rename {third => internal/thirdparty}/github.com/gomodule/redigo/redis/go18.go (100%) rename {third => internal/thirdparty}/github.com/gomodule/redigo/redis/list_test.go (100%) rename {third => internal/thirdparty}/github.com/gomodule/redigo/redis/log.go (100%) rename {third => internal/thirdparty}/github.com/gomodule/redigo/redis/pool.go (99%) rename {third => internal/thirdparty}/github.com/gomodule/redigo/redis/pool17.go (100%) rename {third => internal/thirdparty}/github.com/gomodule/redigo/redis/pool17_test.go (95%) rename {third => internal/thirdparty}/github.com/gomodule/redigo/redis/pool_test.go (99%) rename {third => internal/thirdparty}/github.com/gomodule/redigo/redis/pubsub.go (100%) rename {third => internal/thirdparty}/github.com/gomodule/redigo/redis/pubsub_example_test.go (98%) rename {third => internal/thirdparty}/github.com/gomodule/redigo/redis/pubsub_test.go (96%) rename {third => internal/thirdparty}/github.com/gomodule/redigo/redis/redis.go (100%) rename {third => internal/thirdparty}/github.com/gomodule/redigo/redis/redis_test.go (96%) rename {third => internal/thirdparty}/github.com/gomodule/redigo/redis/reply.go (100%) rename {third => internal/thirdparty}/github.com/gomodule/redigo/redis/reply_test.go (98%) rename {third => internal/thirdparty}/github.com/gomodule/redigo/redis/scan.go (100%) rename {third => internal/thirdparty}/github.com/gomodule/redigo/redis/scan_test.go (99%) rename {third => internal/thirdparty}/github.com/gomodule/redigo/redis/script.go (100%) rename {third => internal/thirdparty}/github.com/gomodule/redigo/redis/script_test.go (97%) rename {third => internal/thirdparty}/github.com/gomodule/redigo/redis/test_test.go (100%) rename {third => internal/thirdparty}/github.com/gomodule/redigo/redis/zpop_example_test.go (96%) rename {third => internal/thirdparty}/github.com/gomodule/redigo/redisx/connmux.go (95%) rename {third => internal/thirdparty}/github.com/gomodule/redigo/redisx/connmux_test.go (95%) rename {third => internal/thirdparty}/github.com/gomodule/redigo/redisx/doc.go (87%) rename {third => internal/thirdparty}/github.com/gorilla/websocket/.gitignore (100%) rename {third => internal/thirdparty}/github.com/gorilla/websocket/.travis.yml (100%) rename {third => internal/thirdparty}/github.com/gorilla/websocket/AUTHORS (100%) rename {third => internal/thirdparty}/github.com/gorilla/websocket/LICENSE (100%) rename {third => internal/thirdparty}/github.com/gorilla/websocket/README.md (100%) rename {third => internal/thirdparty}/github.com/gorilla/websocket/client.go (100%) rename {third => internal/thirdparty}/github.com/gorilla/websocket/client_clone.go (100%) rename {third => internal/thirdparty}/github.com/gorilla/websocket/client_clone_legacy.go (100%) rename {third => internal/thirdparty}/github.com/gorilla/websocket/client_server_test.go (100%) rename {third => internal/thirdparty}/github.com/gorilla/websocket/client_test.go (100%) rename {third => internal/thirdparty}/github.com/gorilla/websocket/compression.go (100%) rename {third => internal/thirdparty}/github.com/gorilla/websocket/compression_test.go (100%) rename {third => internal/thirdparty}/github.com/gorilla/websocket/conn.go (100%) rename {third => internal/thirdparty}/github.com/gorilla/websocket/conn_broadcast_test.go (100%) rename {third => internal/thirdparty}/github.com/gorilla/websocket/conn_read.go (100%) rename {third => internal/thirdparty}/github.com/gorilla/websocket/conn_read_legacy.go (100%) rename {third => internal/thirdparty}/github.com/gorilla/websocket/conn_test.go (100%) rename {third => internal/thirdparty}/github.com/gorilla/websocket/conn_write.go (100%) rename {third => internal/thirdparty}/github.com/gorilla/websocket/conn_write_legacy.go (100%) rename {third => internal/thirdparty}/github.com/gorilla/websocket/doc.go (100%) rename {third => internal/thirdparty}/github.com/gorilla/websocket/example_test.go (94%) rename {third => internal/thirdparty}/github.com/gorilla/websocket/json.go (100%) rename {third => internal/thirdparty}/github.com/gorilla/websocket/json_test.go (100%) rename {third => internal/thirdparty}/github.com/gorilla/websocket/mask.go (100%) rename {third => internal/thirdparty}/github.com/gorilla/websocket/mask_safe.go (100%) rename {third => internal/thirdparty}/github.com/gorilla/websocket/mask_test.go (100%) rename {third => internal/thirdparty}/github.com/gorilla/websocket/prepared.go (100%) rename {third => internal/thirdparty}/github.com/gorilla/websocket/prepared_test.go (100%) rename {third => internal/thirdparty}/github.com/gorilla/websocket/proxy.go (100%) rename {third => internal/thirdparty}/github.com/gorilla/websocket/server.go (100%) rename {third => internal/thirdparty}/github.com/gorilla/websocket/server_test.go (100%) rename {third => internal/thirdparty}/github.com/gorilla/websocket/util.go (100%) rename {third => internal/thirdparty}/github.com/gorilla/websocket/util_test.go (100%) rename {third => internal/thirdparty}/github.com/gorilla/websocket/x_net_proxy.go (100%) rename {third => internal/thirdparty}/github.com/grokify/html-strip-tags-go/.codeclimate.yml (100%) rename {third => internal/thirdparty}/github.com/grokify/html-strip-tags-go/.travis.yml (100%) rename {third => internal/thirdparty}/github.com/grokify/html-strip-tags-go/LICENSE (100%) rename {third => internal/thirdparty}/github.com/grokify/html-strip-tags-go/PATENTS (100%) rename {third => internal/thirdparty}/github.com/grokify/html-strip-tags-go/README.md (96%) rename {third => internal/thirdparty}/github.com/grokify/html-strip-tags-go/strip.go (100%) rename {third => internal/thirdparty}/github.com/grokify/html-strip-tags-go/strip_test.go (100%) rename {third => internal/thirdparty}/github.com/mattn/go-runewidth/.travis.yml (100%) rename {third => internal/thirdparty}/github.com/mattn/go-runewidth/LICENSE (100%) rename {third => internal/thirdparty}/github.com/mattn/go-runewidth/README.mkd (100%) rename {third => internal/thirdparty}/github.com/mattn/go-runewidth/runewidth.go (100%) rename {third => internal/thirdparty}/github.com/mattn/go-runewidth/runewidth_js.go (100%) rename {third => internal/thirdparty}/github.com/mattn/go-runewidth/runewidth_posix.go (100%) rename {third => internal/thirdparty}/github.com/mattn/go-runewidth/runewidth_posix_test.go (100%) rename {third => internal/thirdparty}/github.com/mattn/go-runewidth/runewidth_test.go (100%) rename {third => internal/thirdparty}/github.com/mattn/go-runewidth/runewidth_windows.go (100%) rename {third => internal/thirdparty}/github.com/olekukonko/tablewriter/.gitignore (100%) rename {third => internal/thirdparty}/github.com/olekukonko/tablewriter/.travis.yml (100%) rename {third => internal/thirdparty}/github.com/olekukonko/tablewriter/LICENCE.md (100%) rename {third => internal/thirdparty}/github.com/olekukonko/tablewriter/README.md (100%) rename {third => internal/thirdparty}/github.com/olekukonko/tablewriter/csv.go (100%) rename {third => internal/thirdparty}/github.com/olekukonko/tablewriter/csv2table/README.md (100%) rename {third => internal/thirdparty}/github.com/olekukonko/tablewriter/csv2table/csv2table.go (95%) rename {third => internal/thirdparty}/github.com/olekukonko/tablewriter/table.go (100%) rename {third => internal/thirdparty}/github.com/olekukonko/tablewriter/table_test.go (100%) rename {third => internal/thirdparty}/github.com/olekukonko/tablewriter/table_with_color.go (100%) rename {third => internal/thirdparty}/github.com/olekukonko/tablewriter/util.go (96%) rename {third => internal/thirdparty}/github.com/olekukonko/tablewriter/wrap.go (97%) rename {third => internal/thirdparty}/github.com/olekukonko/tablewriter/wrap_test.go (95%) rename {third => internal/thirdparty}/github.com/stathat/go/.gitignore (100%) rename {third => internal/thirdparty}/github.com/stathat/go/LICENSE (100%) rename {third => internal/thirdparty}/github.com/stathat/go/README.md (100%) rename {third => internal/thirdparty}/github.com/stathat/go/example_test.go (100%) rename {third => internal/thirdparty}/github.com/stathat/go/stathat.go (100%) rename {third => internal/thirdparty}/github.com/stathat/go/stathat_test.go (100%) rename {third => internal/thirdparty}/github.com/theckman/go-flock/LICENSE (100%) rename {third => internal/thirdparty}/github.com/theckman/go-flock/README.md (94%) rename {third => internal/thirdparty}/github.com/theckman/go-flock/flock.go (100%) rename {third => internal/thirdparty}/github.com/theckman/go-flock/flock_unix.go (100%) rename {third => internal/thirdparty}/github.com/theckman/go-flock/flock_winapi.go (100%) rename {third => internal/thirdparty}/github.com/theckman/go-flock/flock_windows.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/AUTHORS (100%) rename {third => internal/thirdparty}/golang.org/x/sys/CONTRIBUTING.md (100%) rename {third => internal/thirdparty}/golang.org/x/sys/CONTRIBUTORS (100%) rename {third => internal/thirdparty}/golang.org/x/sys/LICENSE (100%) rename {third => internal/thirdparty}/golang.org/x/sys/PATENTS (100%) rename {third => internal/thirdparty}/golang.org/x/sys/README.md (100%) rename {third => internal/thirdparty}/golang.org/x/sys/codereview.cfg (100%) rename {third => internal/thirdparty}/golang.org/x/sys/cpu/cpu.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/cpu/cpu_arm.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/cpu/cpu_arm64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/cpu/cpu_gc_x86.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/cpu/cpu_gccgo.c (100%) rename {third => internal/thirdparty}/golang.org/x/sys/cpu/cpu_gccgo.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/cpu/cpu_linux.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/cpu/cpu_mips64x.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/cpu/cpu_mipsx.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/cpu/cpu_ppc64x.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/cpu/cpu_s390x.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/cpu/cpu_test.go (95%) rename {third => internal/thirdparty}/golang.org/x/sys/cpu/cpu_x86.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/cpu/cpu_x86.s (100%) rename {third => internal/thirdparty}/golang.org/x/sys/plan9/asm.s (100%) rename {third => internal/thirdparty}/golang.org/x/sys/plan9/asm_plan9_386.s (100%) rename {third => internal/thirdparty}/golang.org/x/sys/plan9/asm_plan9_amd64.s (100%) rename {third => internal/thirdparty}/golang.org/x/sys/plan9/asm_plan9_arm.s (100%) rename {third => internal/thirdparty}/golang.org/x/sys/plan9/const_plan9.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/plan9/dir_plan9.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/plan9/env_plan9.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/plan9/errors_plan9.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/plan9/mkall.sh (100%) rename {third => internal/thirdparty}/golang.org/x/sys/plan9/mkerrors.sh (100%) rename {third => internal/thirdparty}/golang.org/x/sys/plan9/mksyscall.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/plan9/mksysnum_plan9.sh (100%) rename {third => internal/thirdparty}/golang.org/x/sys/plan9/pwd_go15_plan9.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/plan9/pwd_plan9.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/plan9/race.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/plan9/race0.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/plan9/str.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/plan9/syscall.go (96%) rename {third => internal/thirdparty}/golang.org/x/sys/plan9/syscall_plan9.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/plan9/syscall_test.go (92%) rename {third => internal/thirdparty}/golang.org/x/sys/plan9/zsyscall_plan9_386.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/plan9/zsyscall_plan9_amd64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/plan9/zsyscall_plan9_arm.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/plan9/zsysnum_plan9.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/.gitignore (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/README.md (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/affinity_linux.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/aliases.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/asm_aix_ppc64.s (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/asm_darwin_386.s (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/asm_darwin_amd64.s (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/asm_darwin_arm.s (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/asm_darwin_arm64.s (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/asm_dragonfly_amd64.s (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/asm_freebsd_386.s (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/asm_freebsd_amd64.s (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/asm_freebsd_arm.s (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/asm_freebsd_arm64.s (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/asm_linux_386.s (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/asm_linux_amd64.s (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/asm_linux_arm.s (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/asm_linux_arm64.s (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/asm_linux_mips64x.s (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/asm_linux_mipsx.s (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/asm_linux_ppc64x.s (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/asm_linux_s390x.s (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/asm_netbsd_386.s (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/asm_netbsd_amd64.s (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/asm_netbsd_arm.s (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/asm_netbsd_arm64.s (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/asm_openbsd_386.s (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/asm_openbsd_amd64.s (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/asm_openbsd_arm.s (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/asm_solaris_amd64.s (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/bluetooth_linux.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/cap_freebsd.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/constants.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/creds_test.go (98%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/darwin_test.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/dev_aix_ppc.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/dev_aix_ppc64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/dev_darwin.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/dev_dragonfly.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/dev_freebsd.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/dev_linux.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/dev_linux_test.go (95%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/dev_netbsd.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/dev_openbsd.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/dirent.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/endian_big.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/endian_little.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/env_unix.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/errors_freebsd_386.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/errors_freebsd_amd64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/errors_freebsd_arm.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/example_exec_test.go (85%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/example_flock_test.go (89%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/export_test.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/fcntl.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/fcntl_darwin.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/fcntl_linux_32bit.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/gccgo.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/gccgo_c.c (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/gccgo_linux_amd64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/ioctl.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/linux/Dockerfile (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/linux/mkall.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/linux/mksysnum.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/linux/types.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/mkall.sh (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/mkasm_darwin.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/mkerrors.sh (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/mkpost.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/mksyscall.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/mksyscall_aix_ppc.go (99%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/mksyscall_aix_ppc64.go (99%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/mksyscall_solaris.pl (98%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/mksysctl_openbsd.pl (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/mksysnum.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/mmap_unix_test.go (93%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/openbsd_pledge.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/openbsd_test.go (97%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/openbsd_unveil.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/pagesize_unix.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/race.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/race0.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/sendfile_test.go (97%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/sockcmsg_linux.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/sockcmsg_unix.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/str.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall.go (95%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_aix.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_aix_ppc.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_aix_ppc64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_aix_test.go (98%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_bsd.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_bsd_test.go (96%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_darwin.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_darwin_386.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_darwin_amd64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_darwin_arm.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_darwin_arm64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_darwin_libSystem.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_darwin_test.go (95%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_dragonfly.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_dragonfly_amd64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_freebsd.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_freebsd_386.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_freebsd_amd64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_freebsd_arm.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_freebsd_arm64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_freebsd_test.go (99%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_linux.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_linux_386.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_linux_amd64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_linux_amd64_gc.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_linux_arm.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_linux_arm64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_linux_gc.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_linux_gc_386.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_linux_gccgo_386.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_linux_gccgo_arm.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_linux_mips64x.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_linux_mipsx.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_linux_ppc64x.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_linux_riscv64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_linux_s390x.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_linux_sparc64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_linux_test.go (99%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_netbsd.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_netbsd_386.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_netbsd_amd64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_netbsd_arm.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_netbsd_arm64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_netbsd_test.go (95%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_openbsd.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_openbsd_386.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_openbsd_amd64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_openbsd_arm.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_openbsd_test.go (93%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_solaris.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_solaris_amd64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_solaris_test.go (94%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_test.go (95%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_unix.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_unix_gc.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_unix_gc_ppc64x.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/syscall_unix_test.go (99%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/timestruct.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/timestruct_test.go (96%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/types_aix.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/types_darwin.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/types_dragonfly.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/types_freebsd.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/types_netbsd.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/types_openbsd.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/types_solaris.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/xattr_bsd.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/xattr_test.go (98%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zerrors_aix_ppc.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zerrors_aix_ppc64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zerrors_darwin_386.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zerrors_darwin_amd64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zerrors_darwin_arm.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zerrors_darwin_arm64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zerrors_freebsd_386.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zerrors_freebsd_amd64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zerrors_freebsd_arm.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zerrors_freebsd_arm64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zerrors_linux_386.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zerrors_linux_amd64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zerrors_linux_arm.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zerrors_linux_arm64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zerrors_linux_mips.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zerrors_linux_mips64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zerrors_linux_mips64le.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zerrors_linux_mipsle.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zerrors_linux_ppc64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zerrors_linux_ppc64le.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zerrors_linux_riscv64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zerrors_linux_s390x.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zerrors_linux_sparc64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zerrors_netbsd_386.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zerrors_netbsd_amd64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zerrors_netbsd_arm.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zerrors_netbsd_arm64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zerrors_openbsd_386.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zerrors_openbsd_amd64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zerrors_openbsd_arm.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zerrors_solaris_amd64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zptrace386_linux.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zptracearm_linux.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zptracemips_linux.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zptracemipsle_linux.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsyscall_aix_ppc.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsyscall_aix_ppc64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsyscall_aix_ppc64_gc.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsyscall_aix_ppc64_gccgo.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsyscall_darwin_386.1_11.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsyscall_darwin_386.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsyscall_darwin_386.s (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsyscall_darwin_amd64.1_11.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsyscall_darwin_amd64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsyscall_darwin_amd64.s (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsyscall_darwin_arm.1_11.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsyscall_darwin_arm.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsyscall_darwin_arm.s (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsyscall_darwin_arm64.1_11.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsyscall_darwin_arm64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsyscall_darwin_arm64.s (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsyscall_freebsd_386.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsyscall_freebsd_arm.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsyscall_freebsd_arm64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsyscall_linux_386.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsyscall_linux_amd64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsyscall_linux_arm.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsyscall_linux_arm64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsyscall_linux_mips.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsyscall_linux_mips64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsyscall_linux_mips64le.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsyscall_linux_mipsle.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsyscall_linux_ppc64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsyscall_linux_riscv64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsyscall_linux_s390x.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsyscall_linux_sparc64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsyscall_netbsd_386.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsyscall_netbsd_arm.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsyscall_netbsd_arm64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsyscall_openbsd_386.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsyscall_openbsd_arm.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsyscall_solaris_amd64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsysctl_openbsd_386.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsysctl_openbsd_amd64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsysctl_openbsd_arm.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsysnum_darwin_386.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsysnum_darwin_amd64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsysnum_darwin_arm.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsysnum_darwin_arm64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsysnum_freebsd_386.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsysnum_freebsd_arm.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsysnum_freebsd_arm64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsysnum_linux_386.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsysnum_linux_amd64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsysnum_linux_arm.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsysnum_linux_arm64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsysnum_linux_mips.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsysnum_linux_mips64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsysnum_linux_mips64le.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsysnum_linux_mipsle.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsysnum_linux_ppc64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsysnum_linux_riscv64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsysnum_linux_s390x.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsysnum_linux_sparc64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsysnum_netbsd_386.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsysnum_netbsd_arm.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsysnum_netbsd_arm64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsysnum_openbsd_386.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/zsysnum_openbsd_arm.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/ztypes_aix_ppc.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/ztypes_aix_ppc64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/ztypes_darwin_386.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/ztypes_darwin_amd64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/ztypes_darwin_arm.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/ztypes_darwin_arm64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/ztypes_freebsd_386.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/ztypes_freebsd_amd64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/ztypes_freebsd_arm.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/ztypes_freebsd_arm64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/ztypes_linux_386.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/ztypes_linux_amd64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/ztypes_linux_arm.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/ztypes_linux_arm64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/ztypes_linux_mips.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/ztypes_linux_mips64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/ztypes_linux_mips64le.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/ztypes_linux_mipsle.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/ztypes_linux_ppc64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/ztypes_linux_ppc64le.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/ztypes_linux_riscv64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/ztypes_linux_s390x.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/ztypes_linux_sparc64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/ztypes_netbsd_386.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/ztypes_netbsd_amd64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/ztypes_netbsd_arm.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/ztypes_netbsd_arm64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/ztypes_openbsd_386.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/ztypes_openbsd_amd64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/ztypes_openbsd_arm.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/unix/ztypes_solaris_amd64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/aliases.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/asm_windows_386.s (100%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/asm_windows_amd64.s (100%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/asm_windows_arm.s (100%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/dll_windows.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/env_windows.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/eventlog.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/exec_windows.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/memory_windows.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/mksyscall.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/race.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/race0.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/registry/export_test.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/registry/key.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/registry/mksyscall.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/registry/registry_test.go (99%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/registry/syscall.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/registry/value.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/registry/zsyscall_windows.go (98%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/security_windows.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/service.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/str.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/svc/debug/log.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/svc/debug/service.go (93%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/svc/event.go (93%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/svc/eventlog/install.go (94%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/svc/eventlog/log.go (96%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/svc/eventlog/log_test.go (92%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/svc/example/beep.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/svc/example/install.go (91%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/svc/example/main.go (96%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/svc/example/manage.go (90%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/svc/example/service.go (89%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/svc/go12.c (100%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/svc/go12.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/svc/go13.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/svc/mgr/config.go (98%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/svc/mgr/mgr.go (98%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/svc/mgr/mgr_test.go (98%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/svc/mgr/recovery.go (98%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/svc/mgr/service.go (92%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/svc/security.go (95%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/svc/service.go (99%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/svc/svc_test.go (92%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/svc/sys_386.s (100%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/svc/sys_amd64.s (100%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/svc/sys_arm.s (100%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/syscall.go (96%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/syscall_test.go (95%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/syscall_windows.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/syscall_windows_test.go (97%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/types_windows.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/types_windows_386.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/types_windows_amd64.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/types_windows_arm.go (100%) rename {third => internal/thirdparty}/golang.org/x/sys/windows/zsyscall_windows.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/encoding/charmap/charmap.go (93%) rename {third => internal/thirdparty}/golang.org/x/text/encoding/charmap/charmap_test.go (95%) rename {third => internal/thirdparty}/golang.org/x/text/encoding/charmap/maketables.go (97%) rename {third => internal/thirdparty}/golang.org/x/text/encoding/charmap/tables.go (99%) rename {third => internal/thirdparty}/golang.org/x/text/encoding/encoding.go (97%) rename {third => internal/thirdparty}/golang.org/x/text/encoding/encoding_test.go (96%) rename {third => internal/thirdparty}/golang.org/x/text/encoding/example_test.go (78%) rename {third => internal/thirdparty}/golang.org/x/text/encoding/ianaindex/example_test.go (78%) rename {third => internal/thirdparty}/golang.org/x/text/encoding/ianaindex/gen.go (94%) rename {third => internal/thirdparty}/golang.org/x/text/encoding/ianaindex/ianaindex.go (90%) rename {third => internal/thirdparty}/golang.org/x/text/encoding/ianaindex/ianaindex_test.go (87%) rename {third => internal/thirdparty}/golang.org/x/text/encoding/ianaindex/tables.go (99%) rename {third => internal/thirdparty}/golang.org/x/text/encoding/internal/enctest/enctest.go (95%) rename {third => internal/thirdparty}/golang.org/x/text/encoding/internal/identifier/gen.go (97%) rename {third => internal/thirdparty}/golang.org/x/text/encoding/internal/identifier/identifier.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/encoding/internal/identifier/mib.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/encoding/internal/internal.go (89%) rename {third => internal/thirdparty}/golang.org/x/text/encoding/japanese/all.go (81%) rename {third => internal/thirdparty}/golang.org/x/text/encoding/japanese/all_test.go (96%) rename {third => internal/thirdparty}/golang.org/x/text/encoding/japanese/eucjp.go (94%) rename {third => internal/thirdparty}/golang.org/x/text/encoding/japanese/iso2022jp.go (95%) rename {third => internal/thirdparty}/golang.org/x/text/encoding/japanese/maketables.go (97%) rename {third => internal/thirdparty}/golang.org/x/text/encoding/japanese/shiftjis.go (93%) rename {third => internal/thirdparty}/golang.org/x/text/encoding/japanese/tables.go (99%) rename {third => internal/thirdparty}/golang.org/x/text/encoding/korean/all_test.go (89%) rename {third => internal/thirdparty}/golang.org/x/text/encoding/korean/euckr.go (92%) rename {third => internal/thirdparty}/golang.org/x/text/encoding/korean/maketables.go (96%) rename {third => internal/thirdparty}/golang.org/x/text/encoding/korean/tables.go (99%) rename {third => internal/thirdparty}/golang.org/x/text/encoding/simplifiedchinese/all.go (81%) rename {third => internal/thirdparty}/golang.org/x/text/encoding/simplifiedchinese/all_test.go (93%) rename {third => internal/thirdparty}/golang.org/x/text/encoding/simplifiedchinese/gbk.go (94%) rename {third => internal/thirdparty}/golang.org/x/text/encoding/simplifiedchinese/hzgb2312.go (94%) rename {third => internal/thirdparty}/golang.org/x/text/encoding/simplifiedchinese/maketables.go (98%) rename {third => internal/thirdparty}/golang.org/x/text/encoding/simplifiedchinese/tables.go (99%) rename {third => internal/thirdparty}/golang.org/x/text/encoding/traditionalchinese/all_test.go (91%) rename {third => internal/thirdparty}/golang.org/x/text/encoding/traditionalchinese/big5.go (93%) rename {third => internal/thirdparty}/golang.org/x/text/encoding/traditionalchinese/maketables.go (97%) rename {third => internal/thirdparty}/golang.org/x/text/encoding/traditionalchinese/tables.go (99%) rename {third => internal/thirdparty}/golang.org/x/text/encoding/unicode/override.go (97%) rename {third => internal/thirdparty}/golang.org/x/text/encoding/unicode/unicode.go (95%) rename {third => internal/thirdparty}/golang.org/x/text/encoding/unicode/unicode_test.go (97%) rename {third => internal/thirdparty}/golang.org/x/text/encoding/unicode/utf32/utf32.go (96%) rename {third => internal/thirdparty}/golang.org/x/text/encoding/unicode/utf32/utf32_test.go (97%) rename {third => internal/thirdparty}/golang.org/x/text/internal/catmsg/catmsg.go (98%) rename {third => internal/thirdparty}/golang.org/x/text/internal/catmsg/catmsg_test.go (96%) rename {third => internal/thirdparty}/golang.org/x/text/internal/catmsg/codec.go (99%) rename {third => internal/thirdparty}/golang.org/x/text/internal/catmsg/varint.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/catmsg/varint_test.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/cldrtree/cldrtree.go (97%) rename {third => internal/thirdparty}/golang.org/x/text/internal/cldrtree/cldrtree_test.go (98%) rename {third => internal/thirdparty}/golang.org/x/text/internal/cldrtree/generate.go (96%) rename {third => internal/thirdparty}/golang.org/x/text/internal/cldrtree/option.go (96%) rename {third => internal/thirdparty}/golang.org/x/text/internal/cldrtree/testdata/test1/common/main/root.xml (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/cldrtree/testdata/test1/output.go (99%) rename {third => internal/thirdparty}/golang.org/x/text/internal/cldrtree/testdata/test2/common/main/en.xml (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/cldrtree/testdata/test2/common/main/en_001.xml (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/cldrtree/testdata/test2/common/main/en_GB.xml (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/cldrtree/testdata/test2/common/main/root.xml (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/cldrtree/testdata/test2/output.go (99%) rename {third => internal/thirdparty}/golang.org/x/text/internal/cldrtree/tree.go (96%) rename {third => internal/thirdparty}/golang.org/x/text/internal/cldrtree/type.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/colltab/collate_test.go (93%) rename {third => internal/thirdparty}/golang.org/x/text/internal/colltab/collelem.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/colltab/collelem_test.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/colltab/colltab.go (95%) rename {third => internal/thirdparty}/golang.org/x/text/internal/colltab/colltab_test.go (97%) rename {third => internal/thirdparty}/golang.org/x/text/internal/colltab/contract.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/colltab/contract_test.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/colltab/iter.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/colltab/iter_test.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/colltab/numeric.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/colltab/numeric_test.go (98%) rename {third => internal/thirdparty}/golang.org/x/text/internal/colltab/table.go (99%) rename {third => internal/thirdparty}/golang.org/x/text/internal/colltab/trie.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/colltab/trie_test.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/colltab/weighter.go (92%) rename {third => internal/thirdparty}/golang.org/x/text/internal/colltab/weighter_test.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/export/README (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/export/idna/common_test.go (93%) rename {third => internal/thirdparty}/golang.org/x/text/internal/export/idna/example_test.go (95%) rename {third => internal/thirdparty}/golang.org/x/text/internal/export/idna/gen.go (96%) rename {third => internal/thirdparty}/golang.org/x/text/internal/export/idna/gen_common.go (94%) rename {third => internal/thirdparty}/golang.org/x/text/internal/export/idna/gen_test.go (90%) rename {third => internal/thirdparty}/golang.org/x/text/internal/export/idna/gen_trieval.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/export/idna/idna.go (98%) rename {third => internal/thirdparty}/golang.org/x/text/internal/export/idna/idna_test.go (97%) rename {third => internal/thirdparty}/golang.org/x/text/internal/export/idna/punycode.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/export/idna/punycode_test.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/export/idna/tables.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/export/idna/trie.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/export/idna/trieval.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/format/format.go (86%) rename {third => internal/thirdparty}/golang.org/x/text/internal/gen.go (82%) rename {third => internal/thirdparty}/golang.org/x/text/internal/gen/code.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/gen/gen.go (96%) rename {third => internal/thirdparty}/golang.org/x/text/internal/gen_test.go (92%) rename {third => internal/thirdparty}/golang.org/x/text/internal/internal.go (85%) rename {third => internal/thirdparty}/golang.org/x/text/internal/internal_test.go (91%) rename {third => internal/thirdparty}/golang.org/x/text/internal/match.go (96%) rename {third => internal/thirdparty}/golang.org/x/text/internal/match_test.go (96%) rename {third => internal/thirdparty}/golang.org/x/text/internal/number/common.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/number/decimal.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/number/decimal_test.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/number/format.go (99%) rename {third => internal/thirdparty}/golang.org/x/text/internal/number/format_test.go (99%) rename {third => internal/thirdparty}/golang.org/x/text/internal/number/gen.go (95%) rename {third => internal/thirdparty}/golang.org/x/text/internal/number/gen_common.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/number/number.go (97%) rename {third => internal/thirdparty}/golang.org/x/text/internal/number/number_test.go (96%) rename {third => internal/thirdparty}/golang.org/x/text/internal/number/pattern.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/number/pattern_test.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/number/roundingmode_string.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/number/tables.go (99%) rename {third => internal/thirdparty}/golang.org/x/text/internal/number/tables_test.go (91%) rename {third => internal/thirdparty}/golang.org/x/text/internal/stringset/set.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/stringset/set_test.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/tables.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/tag/tag.go (96%) rename {third => internal/thirdparty}/golang.org/x/text/internal/tag/tag_test.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/testtext/codesize.go (94%) rename {third => internal/thirdparty}/golang.org/x/text/internal/testtext/flag.go (88%) rename {third => internal/thirdparty}/golang.org/x/text/internal/testtext/gc.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/testtext/gccgo.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/testtext/go1_6.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/testtext/go1_7.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/testtext/text.go (98%) rename {third => internal/thirdparty}/golang.org/x/text/internal/triegen/compact.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/triegen/data_test.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/triegen/example_compact_test.go (95%) rename {third => internal/thirdparty}/golang.org/x/text/internal/triegen/example_test.go (97%) rename {third => internal/thirdparty}/golang.org/x/text/internal/triegen/gen_test.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/triegen/print.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/triegen/triegen.go (99%) rename {third => internal/thirdparty}/golang.org/x/text/internal/ucd/example_test.go (97%) rename {third => internal/thirdparty}/golang.org/x/text/internal/ucd/ucd.go (98%) rename {third => internal/thirdparty}/golang.org/x/text/internal/ucd/ucd_test.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/internal/utf8internal/utf8internal.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/runes/cond.go (98%) rename {third => internal/thirdparty}/golang.org/x/text/runes/runes.go (98%) rename {third => internal/thirdparty}/golang.org/x/text/transform/examples_test.go (84%) rename {third => internal/thirdparty}/golang.org/x/text/transform/transform.go (99%) rename {third => internal/thirdparty}/golang.org/x/text/transform/transform_test.go (99%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/bidi/bidi.go (98%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/bidi/bracket.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/bidi/core.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/bidi/core_test.go (95%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/bidi/gen.go (92%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/bidi/gen_ranges.go (86%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/bidi/gen_trieval.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/bidi/prop.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/bidi/ranges_test.go (85%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/bidi/tables.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/bidi/tables_test.go (87%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/bidi/trieval.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/cldr/base.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/cldr/cldr.go (97%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/cldr/cldr_test.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/cldr/collate.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/cldr/collate_test.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/cldr/data_test.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/cldr/decode.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/cldr/examples_test.go (83%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/cldr/makexml.go (99%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/cldr/resolve.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/cldr/resolve_test.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/cldr/slice.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/cldr/slice_test.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/cldr/xml.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/doc.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/norm/composition.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/norm/composition_test.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/norm/example_iter_test.go (96%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/norm/example_test.go (86%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/norm/forminfo.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/norm/forminfo_test.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/norm/input.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/norm/iter.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/norm/iter_test.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/norm/maketables.go (99%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/norm/normalize.go (98%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/norm/normalize_test.go (99%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/norm/readwriter.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/norm/readwriter_test.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/norm/tables.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/norm/transform.go (97%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/norm/transform_test.go (97%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/norm/trie.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/norm/triegen.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/norm/ucd_test.go (97%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/rangetable/gen.go (88%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/rangetable/merge.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/rangetable/merge_test.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/rangetable/rangetable.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/rangetable/rangetable_test.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/rangetable/tables.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/runenames/bits.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/runenames/example_test.go (96%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/runenames/gen.go (96%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/runenames/gen_bits.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/runenames/runenames.go (100%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/runenames/runenames_test.go (78%) rename {third => internal/thirdparty}/golang.org/x/text/unicode/runenames/tables.go (100%) rename {third => internal/thirdparty}/gopkg.in/yaml.v2/.travis.yml (100%) rename {third => internal/thirdparty}/gopkg.in/yaml.v2/LICENSE (100%) rename {third => internal/thirdparty}/gopkg.in/yaml.v2/LICENSE.libyaml (100%) rename {third => internal/thirdparty}/gopkg.in/yaml.v2/README.md (97%) rename {third => internal/thirdparty}/gopkg.in/yaml.v2/apic.go (100%) rename {third => internal/thirdparty}/gopkg.in/yaml.v2/decode.go (100%) rename {third => internal/thirdparty}/gopkg.in/yaml.v2/emitterc.go (100%) rename {third => internal/thirdparty}/gopkg.in/yaml.v2/encode.go (100%) rename {third => internal/thirdparty}/gopkg.in/yaml.v2/parserc.go (100%) rename {third => internal/thirdparty}/gopkg.in/yaml.v2/readerc.go (100%) rename {third => internal/thirdparty}/gopkg.in/yaml.v2/resolve.go (100%) rename {third => internal/thirdparty}/gopkg.in/yaml.v2/scannerc.go (100%) rename {third => internal/thirdparty}/gopkg.in/yaml.v2/sorter.go (100%) rename {third => internal/thirdparty}/gopkg.in/yaml.v2/writerc.go (100%) rename {third => internal/thirdparty}/gopkg.in/yaml.v2/yaml.go (100%) rename {third => internal/thirdparty}/gopkg.in/yaml.v2/yamlh.go (100%) rename {third => internal/thirdparty}/gopkg.in/yaml.v2/yamlprivateh.go (100%) rename {g/net => net}/ghttp/ghttp.go (100%) rename {g/net => net}/ghttp/ghttp_client_api.go (100%) rename {g/net => net}/ghttp/ghttp_client_bytes.go (100%) rename {g/net => net}/ghttp/ghttp_client_config.go (98%) rename {g/net => net}/ghttp/ghttp_client_content.go (100%) rename {g/net => net}/ghttp/ghttp_client_request.go (99%) rename {g/net => net}/ghttp/ghttp_client_response.go (100%) rename {g/net => net}/ghttp/ghttp_controller.go (100%) rename {g/net => net}/ghttp/ghttp_func.go (93%) rename {g/net => net}/ghttp/ghttp_request.go (97%) rename {g/net => net}/ghttp/ghttp_request_auth.go (97%) rename {g/net => net}/ghttp/ghttp_request_log.go (100%) rename {g/net => net}/ghttp/ghttp_request_params.go (94%) rename {g/net => net}/ghttp/ghttp_request_post.go (97%) rename {g/net => net}/ghttp/ghttp_request_query.go (97%) rename {g/net => net}/ghttp/ghttp_request_request.go (97%) rename {g/net => net}/ghttp/ghttp_request_router.go (100%) rename {g/net => net}/ghttp/ghttp_response.go (98%) rename {g/net => net}/ghttp/ghttp_response_cors.go (98%) rename {g/net => net}/ghttp/ghttp_response_gzip.go (100%) rename {g/net => net}/ghttp/ghttp_response_view.go (96%) rename {g/net => net}/ghttp/ghttp_response_writer.go (100%) rename {g/net => net}/ghttp/ghttp_server.go (96%) rename {g/net => net}/ghttp/ghttp_server_admin.go (95%) rename {g/net => net}/ghttp/ghttp_server_admin_process.go (96%) rename {g/net => net}/ghttp/ghttp_server_admin_unix.go (100%) rename {g/net => net}/ghttp/ghttp_server_admin_windows.go (100%) rename {g/net => net}/ghttp/ghttp_server_config.go (99%) rename {g/net => net}/ghttp/ghttp_server_config_cookie.go (97%) rename {g/net => net}/ghttp/ghttp_server_config_logger.go (98%) rename {g/net => net}/ghttp/ghttp_server_config_route.go (97%) rename {g/net => net}/ghttp/ghttp_server_config_session.go (96%) rename {g/net => net}/ghttp/ghttp_server_config_static.go (96%) rename {g/net => net}/ghttp/ghttp_server_cookie.go (99%) rename {g/net => net}/ghttp/ghttp_server_domain.go (100%) rename {g/net => net}/ghttp/ghttp_server_graceful.go (98%) rename {g/net => net}/ghttp/ghttp_server_handler.go (98%) rename {g/net => net}/ghttp/ghttp_server_log.go (98%) rename {g/net => net}/ghttp/ghttp_server_pprof.go (98%) rename {g/net => net}/ghttp/ghttp_server_router.go (98%) rename {g/net => net}/ghttp/ghttp_server_router_group.go (98%) rename {g/net => net}/ghttp/ghttp_server_router_hook.go (98%) rename {g/net => net}/ghttp/ghttp_server_router_serve.go (99%) rename {g/net => net}/ghttp/ghttp_server_service_controller.go (97%) rename {g/net => net}/ghttp/ghttp_server_service_handler.go (98%) rename {g/net => net}/ghttp/ghttp_server_service_object.go (97%) rename {g/net => net}/ghttp/ghttp_server_session.go (97%) rename {g/net => net}/ghttp/ghttp_server_status.go (100%) rename {g/net => net}/ghttp/ghttp_server_websocket.go (93%) rename {g/net => net}/ghttp/ghttp_unit_cookie_test.go (94%) rename {g/net => net}/ghttp/ghttp_unit_init_test.go (92%) rename {g/net => net}/ghttp/ghttp_unit_param_json_test.go (97%) rename {g/net => net}/ghttp/ghttp_unit_param_struct_test.go (93%) rename {g/net => net}/ghttp/ghttp_unit_param_test.go (98%) rename {g/net => net}/ghttp/ghttp_unit_router_basic_test.go (98%) rename {g/net => net}/ghttp/ghttp_unit_router_controller_rest_test.go (95%) rename {g/net => net}/ghttp/ghttp_unit_router_controller_test.go (96%) rename {g/net => net}/ghttp/ghttp_unit_router_domain_basic_test.go (98%) rename {g/net => net}/ghttp/ghttp_unit_router_domain_controller_rest_test.go (96%) rename {g/net => net}/ghttp/ghttp_unit_router_domain_controller_test.go (98%) rename {g/net => net}/ghttp/ghttp_unit_router_domain_object_rest_test.go (97%) rename {g/net => net}/ghttp/ghttp_unit_router_domain_object_test.go (98%) rename {g/net => net}/ghttp/ghttp_unit_router_exit_test.go (97%) rename {g/net => net}/ghttp/ghttp_unit_router_group_hook_test.go (96%) rename {g/net => net}/ghttp/ghttp_unit_router_group_rest_test.go (97%) rename {g/net => net}/ghttp/ghttp_unit_router_group_test.go (97%) rename {g/net => net}/ghttp/ghttp_unit_router_hook_test.go (97%) rename {g/net => net}/ghttp/ghttp_unit_router_names_test.go (96%) rename {g/net => net}/ghttp/ghttp_unit_router_object_rest_test.go (96%) rename {g/net => net}/ghttp/ghttp_unit_router_object_test.go (97%) rename {g/net => net}/ghttp/ghttp_unit_session_test.go (94%) rename {g/net => net}/ghttp/ghttp_unit_static_test.go (98%) rename {g/net => net}/gipv4/gipv4.go (99%) rename {g/net => net}/gipv6/gipv6.go (95%) rename {g/net => net}/gsmtp/gsmtp.go (100%) rename {g/net => net}/gtcp/gtcp.go (100%) rename {g/net => net}/gtcp/gtcp_conn.go (99%) rename {g/net => net}/gtcp/gtcp_conn_pkg.go (99%) rename {g/net => net}/gtcp/gtcp_func.go (99%) rename {g/net => net}/gtcp/gtcp_func_pkg.go (100%) rename {g/net => net}/gtcp/gtcp_pool.go (97%) rename {g/net => net}/gtcp/gtcp_pool_pkg.go (98%) rename {g/net => net}/gtcp/gtcp_server.go (97%) rename {g/net => net}/gudp/gudp.go (100%) rename {g/net => net}/gudp/gudp_conn.go (99%) rename {g/net => net}/gudp/gudp_func.go (100%) rename {g/net => net}/gudp/gudp_server.go (95%) rename {g/os => os}/gcache/gcache.go (100%) rename {g/os => os}/gcache/gcache_cache.go (96%) rename {g/os => os}/gcache/gcache_mem_cache.go (98%) rename {g/os => os}/gcache/gcache_mem_cache_item.go (93%) rename {g/os => os}/gcache/gcache_mem_cache_lru.go (94%) rename {g/os => os}/gcache/gcache_z_bench_test.go (97%) rename {g/os => os}/gcache/gcache_z_unit_1_test.go (97%) rename {g/os => os}/gcfg/gcfg.go (96%) rename {g/os => os}/gcfg/gcfg_api.go (98%) rename {g/os => os}/gcfg/gcfg_config.go (97%) rename {g/os => os}/gcfg/gcfg_error.go (93%) rename {g/os => os}/gcfg/gcfg_instance.go (95%) rename {g/os => os}/gcfg/gcfg_z_unit_test.go (98%) rename {g/os => os}/gcmd/gcmd.go (98%) rename {g/os => os}/gcmd/gcmd_option.go (96%) rename {g/os => os}/gcmd/gcmd_value.go (95%) rename {g/os => os}/gcmd/gcmd_z_unit_test.go (97%) rename {g/os => os}/gcron/gcron.go (99%) rename {g/os => os}/gcron/gcron_cron.go (96%) rename {g/os => os}/gcron/gcron_entry.go (96%) rename {g/os => os}/gcron/gcron_schedule.go (99%) rename {g/os => os}/gcron/gcron_unit_1_test.go (98%) rename {g/os => os}/gcron/gcron_unit_2_test.go (91%) rename {g/os => os}/gcron/gcron_z_bench_test.go (92%) rename {g/os => os}/gcron/gcron_z_example_1_test.go (87%) rename {g/os => os}/genv/genv.go (100%) rename {g/os => os}/genv/genv_test.go (92%) rename {g/os => os}/gfcache/gfcache.go (94%) rename {g/os => os}/gfcache/gfcache_z_unit_test.go (94%) rename {g/os => os}/gfile/gfile.go (99%) rename {g/os => os}/gfile/gfile_contents.go (100%) rename {g/os => os}/gfile/gfile_replace.go (97%) rename {g/os => os}/gfile/gfile_scan.go (100%) rename {g/os => os}/gfile/gfile_search.go (97%) rename {g/os => os}/gfile/gfile_size.go (100%) rename {g/os => os}/gfile/gfile_sort.go (96%) rename {g/os => os}/gfile/gfile_source.go (87%) rename {g/os => os}/gfile/gfile_time.go (100%) rename {g/os => os}/gfile/gfile_z_contents_test.go (99%) rename {g/os => os}/gfile/gfile_z_scan_test.go (95%) rename {g/os => os}/gfile/gfile_z_search_test.go (94%) rename {g/os => os}/gfile/gfile_z_size_test.go (94%) rename {g/os => os}/gfile/gfile_z_test.go (99%) rename {g/os => os}/gfile/gfile_z_time_test.go (92%) rename {g/os => os}/gfile/testdata/dir1/file1 (100%) rename {g/os => os}/gfile/testdata/dir2/file2 (100%) rename {g/os => os}/gflock/gflock.go (97%) rename {g/os => os}/gflock/gflock_unit_test.go (96%) rename {g/os => os}/gfpool/gfpool.go (96%) rename {g/os => os}/gfpool/gfpool_z_bench_test.go (100%) rename {g/os => os}/gfpool/gfpool_z_unit_test.go (96%) rename {g/os => os}/gfsnotify/gfsnotify.go (93%) rename {g/os => os}/gfsnotify/gfsnotify_event.go (100%) rename {g/os => os}/gfsnotify/gfsnotify_filefunc.go (100%) rename {g/os => os}/gfsnotify/gfsnotify_watcher.go (99%) rename {g/os => os}/gfsnotify/gfsnotify_watcher_loop.go (99%) rename {g/os => os}/gfsnotify/gfsnotify_z_unit_test.go (94%) rename {g/os => os}/glog/glog.go (98%) rename {g/os => os}/glog/glog_api.go (100%) rename {g/os => os}/glog/glog_chaining.go (100%) rename {g/os => os}/glog/glog_logger.go (97%) rename {g/os => os}/glog/glog_logger_api.go (100%) rename {g/os => os}/glog/glog_logger_chaining.go (99%) rename {g/os => os}/glog/glog_logger_writer.go (100%) rename {g/os => os}/gmlock/gmlock.go (100%) rename {g/os => os}/gmlock/gmlock_locker.go (98%) rename {g/os => os}/gmlock/gmlock_unit_lock_test.go (96%) rename {g/os => os}/gmlock/gmlock_unit_rlock_test.go (98%) rename {g/os => os}/gmutex/gmutex.go (99%) rename {g/os => os}/gmutex/gmutex_bench_test.go (97%) rename {g/os => os}/gmutex/gmutex_unit_test.go (98%) rename {g/os => os}/gproc/gproc.go (98%) rename {g/os => os}/gproc/gproc_comm.go (92%) rename {g/os => os}/gproc/gproc_comm_receive.go (93%) rename {g/os => os}/gproc/gproc_comm_send.go (95%) rename {g/os => os}/gproc/gproc_manager.go (98%) rename {g/os => os}/gproc/gproc_proccess.go (100%) rename {g/os => os}/grpool/grpool.go (97%) rename {g/os => os}/grpool/grpool_bench_1_test.go (94%) rename {g/os => os}/grpool/grpool_bench_2_test.go (94%) rename {g/os => os}/grpool/grpool_unit_test.go (94%) rename {g/os => os}/gspath/gspath.go (97%) rename {g/os => os}/gspath/gspath_cache.go (96%) rename {g/os => os}/gspath/gspath_unit_test.go (96%) rename {g/os => os}/gtime/gtime.go (99%) rename {g/os => os}/gtime/gtime_format.go (99%) rename {g/os => os}/gtime/gtime_time.go (100%) rename {g/os => os}/gtime/gtime_z_bench_test.go (97%) rename {g/os => os}/gtime/gtime_z_unit_basic_test.go (98%) rename {g/os => os}/gtime/gtime_z_unit_format_test.go (98%) rename {g/os => os}/gtime/gtime_z_unit_time_test.go (98%) rename {g/os => os}/gtimer/gtimer.go (98%) rename {g/os => os}/gtimer/gtimer_entry.go (99%) rename {g/os => os}/gtimer/gtimer_loop.go (97%) rename {g/os => os}/gtimer/gtimer_timer.go (98%) rename {g/os => os}/gtimer/gtimer_z_bench_test.go (94%) rename {g/os => os}/gtimer/gtimer_z_example_test.go (94%) rename {g/os => os}/gtimer/gtimer_z_unit_0_test.go (96%) rename {g/os => os}/gtimer/gtimer_z_unit_1_test.go (98%) rename {g/os => os}/gtimer/gtimer_z_unit_2_test.go (94%) rename {g/os => os}/gview/gview.go (97%) rename {g/os => os}/gview/gview_buildin.go (96%) rename {g/os => os}/gview/gview_config.go (100%) rename {g/os => os}/gview/gview_doparse.go (94%) rename {g/os => os}/gview/gview_error.go (93%) rename {g/os => os}/gview/gview_instance.go (94%) rename {g/os => os}/gview/gview_unit_test.go (97%) rename {g/test => test}/gtest/gtest.go (98%) rename {g/test => test}/gtest/gtest_test.go (93%) rename {g/text => text}/gregex/gregex.go (100%) rename {g/text => text}/gregex/gregex_cache.go (100%) rename {g/text => text}/gregex/gregex_z_bench_test.go (95%) rename {g/text => text}/gregex/gregex_z_unit_test.go (99%) rename {g/text => text}/gstr/gstr.go (98%) rename {g/text => text}/gstr/gstr_levenshtein.go (100%) rename {g/text => text}/gstr/gstr_parse.go (100%) rename {g/text => text}/gstr/gstr_pos.go (100%) rename {g/text => text}/gstr/gstr_similartext.go (100%) rename {g/text => text}/gstr/gstr_soundex.go (100%) rename {g/text => text}/gstr/gstr_trim.go (100%) rename {g/text => text}/gstr/gstr_z_unit_basic_test.go (99%) rename {g/text => text}/gstr/gstr_z_unit_parse_test.go (93%) rename {g/text => text}/gstr/gstr_z_unit_pos_test.go (95%) rename {g/text => text}/gstr/gstr_z_unit_trim_test.go (94%) delete mode 100644 third/README.MD rename {g/util => util}/gconv/gconv.go (99%) rename {g/util => util}/gconv/gconv_map.go (99%) rename {g/util => util}/gconv/gconv_slice.go (99%) rename {g/util => util}/gconv/gconv_struct.go (99%) rename {g/util => util}/gconv/gconv_time.go (94%) rename {g/util => util}/gconv/gconv_z_all_test.go (99%) rename {g/util => util}/gconv/gconv_z_bench_bytes_test.go (98%) rename {g/util => util}/gconv/gconv_z_bench_float_test.go (100%) rename {g/util => util}/gconv/gconv_z_bench_int_test.go (100%) rename {g/util => util}/gconv/gconv_z_bench_str_test.go (100%) rename {g/util => util}/gconv/gconv_z_unit_basic_test.go (94%) rename {g/util => util}/gconv/gconv_z_unit_bool_test.go (94%) rename {g/util => util}/gconv/gconv_z_unit_map_test.go (98%) rename {g/util => util}/gconv/gconv_z_unit_slice_test.go (95%) rename {g/util => util}/gconv/gconv_z_unit_string_test.go (96%) rename {g/util => util}/gconv/gconv_z_unit_struct_test.go (98%) rename {g/util => util}/gconv/gconv_z_unit_time_test.go (85%) rename {g/util => util}/gpage/gpage.go (98%) rename {g/util => util}/grand/grand.go (100%) rename {g/util => util}/grand/grand_intn.go (100%) rename {g/util => util}/grand/grand_z_bench_test.go (94%) rename {g/util => util}/grand/grand_z_unit_test.go (97%) rename {g/util => util}/gutil/gutil.go (96%) rename {g/util => util}/gutil/gutil_comparator.go (98%) rename {g/util => util}/gutil/gutil_debug.go (95%) rename {g/util => util}/gutil/gutil_z_bench_test.go (100%) rename {g/util => util}/gutil/gutil_z_comparator_z_unit_test.go (98%) rename {g/util => util}/gutil/gutil_z_unit_test.go (93%) rename {g/util => util}/gvalid/gvalid.go (99%) rename {g/util => util}/gvalid/gvalid_check.go (98%) rename {g/util => util}/gvalid/gvalid_check_map.go (99%) rename {g/util => util}/gvalid/gvalid_check_struct.go (98%) rename {g/util => util}/gvalid/gvalid_error.go (100%) rename {g/util => util}/gvalid/gvalid_message.go (100%) rename {g/util => util}/gvalid/gvalid_unit_basic_all_test.go (99%) rename {g/util => util}/gvalid/gvalid_unit_checkmap_test.go (98%) rename {g/util => util}/gvalid/gvalid_unit_checkstruct_test.go (98%) rename {g/util => util}/gvalid/gvalid_unit_customerror_test.go (97%) diff --git a/README.MD b/README.MD index aa3e5a7f8..0c4b3ab7e 100644 --- a/README.MD +++ b/README.MD @@ -45,8 +45,8 @@ golang version >= 1.10 package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" ) func main() { @@ -62,8 +62,8 @@ func main() { package main import ( - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/frame/g" ) func main() { @@ -83,8 +83,8 @@ func main() { package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" ) type Object struct {} @@ -139,8 +139,8 @@ func main() { package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" ) func Hello1(r *ghttp.Request) { @@ -164,8 +164,8 @@ func main() { package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" ) func main() { diff --git a/README_ZH.MD b/README_ZH.MD index 59bb9de75..41835f17e 100644 --- a/README_ZH.MD +++ b/README_ZH.MD @@ -57,8 +57,8 @@ golang版本 >= 1.10 package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" ) func main() { diff --git a/RELEASE.MD b/RELEASE.MD index cd947af5e..8ce74ae84 100644 --- a/RELEASE.MD +++ b/RELEASE.MD @@ -182,14 +182,14 @@ ## 新特性 1. 主库从`gitee`迁移到了`github`( https://github.com/gogf/gf )，`gitee`作为镜像站，用于国内的代码贡献及ISSUE提交，迁移说明详见：https://goframe.org/upgradeto150 -1. 对常用的`container`数组模块: `garray`做了大量改进/完善工作，新增大量常用方法，并完善单元测试用例及方法注释，详见API文档：https://godoc.org/github.com/gogf/gf/g/container/garray -1. 对常用的`container`集合模块: `gset`做了大量改进/完善工作，新增大量常用方法，并完善单元测试用例及方法注释，详见API文档：https://godoc.org/github.com/gogf/gf/g/container/gset -1. 对常用的`container`MAP模块: `gmap`做了大量改进/完善工作，新增大量常用方法，并完善单元测试用例及方法注释，详见API文档：https://godoc.org/github.com/gogf/gf/g/container/gmap -1. 对常用的字符串模块: `gstr`做了大量改进/完善工作，新增大量常用方法，并完善单元测试用例及方法注释，详见API文档：https://godoc.org/github.com/gogf/gf/g/text/gstr +1. 对常用的`container`数组模块: `garray`做了大量改进/完善工作，新增大量常用方法，并完善单元测试用例及方法注释，详见API文档：https://godoc.org/github.com/gogf/gf/container/garray +1. 对常用的`container`集合模块: `gset`做了大量改进/完善工作，新增大量常用方法，并完善单元测试用例及方法注释，详见API文档：https://godoc.org/github.com/gogf/gf/container/gset +1. 对常用的`container`MAP模块: `gmap`做了大量改进/完善工作，新增大量常用方法，并完善单元测试用例及方法注释，详见API文档：https://godoc.org/github.com/gogf/gf/container/gmap +1. 对常用的字符串模块: `gstr`做了大量改进/完善工作，新增大量常用方法，并完善单元测试用例及方法注释，详见API文档：https://godoc.org/github.com/gogf/gf/text/gstr 1. 改进`gform`中对`struct`/`*struct`参数的支持，`*Insert/*Save/*Replace/*Update/Where/Data`方法的参数调整为`interface{}`类型，并支持任意类型的: `string/map/slice/struct/*struct`参数传递，具体请参考：https://goframe.org/database/orm/chaining 1. 新增/完善若干模块的单元测试用例, 包括：`gvalid`/`gregex`/`garray`/`gset`/`gmap`/`gstr`/`gconv`/`ghttp`/`gdb`； 1. 由于`gkafka`模块比较重，且不是框架核心模块，因此将该模块迁移到新的仓库中独立管理，并去掉相关依赖包：https://github.com/gogf/gkafka -1. 新增`greuseport`模块，用以实现TCP的`REUSEPORT`特性：https://godoc.org/github.com/gogf/gf/g/net/greuseport +1. 新增`greuseport`模块，用以实现TCP的`REUSEPORT`特性：https://godoc.org/github.com/gogf/gf/net/greuseport ## 新功能/改进 1. 去掉模板引擎内置变量中自动初始化`session`对象带来的内存占用问题； diff --git a/g/container/garray/garray.go b/container/garray/garray.go similarity index 100% rename from g/container/garray/garray.go rename to container/garray/garray.go diff --git a/g/container/garray/garray_func.go b/container/garray/garray_func.go similarity index 100% rename from g/container/garray/garray_func.go rename to container/garray/garray_func.go diff --git a/g/container/garray/garray_normal_int.go b/container/garray/garray_normal_int.go similarity index 99% rename from g/container/garray/garray_normal_int.go rename to container/garray/garray_normal_int.go index 31e62fc27..1b1056dde 100644 --- a/g/container/garray/garray_normal_int.go +++ b/container/garray/garray_normal_int.go @@ -12,9 +12,9 @@ import ( "math" "sort" - "github.com/gogf/gf/g/internal/rwmutex" - "github.com/gogf/gf/g/util/gconv" - "github.com/gogf/gf/g/util/grand" + "github.com/gogf/gf/internal/rwmutex" + "github.com/gogf/gf/util/gconv" + "github.com/gogf/gf/util/grand" ) type IntArray struct { diff --git a/g/container/garray/garray_normal_interface.go b/container/garray/garray_normal_interface.go similarity index 99% rename from g/container/garray/garray_normal_interface.go rename to container/garray/garray_normal_interface.go index 7b166b073..b5131f62e 100644 --- a/g/container/garray/garray_normal_interface.go +++ b/container/garray/garray_normal_interface.go @@ -12,9 +12,9 @@ import ( "math" "sort" - "github.com/gogf/gf/g/internal/rwmutex" - "github.com/gogf/gf/g/util/gconv" - "github.com/gogf/gf/g/util/grand" + "github.com/gogf/gf/internal/rwmutex" + "github.com/gogf/gf/util/gconv" + "github.com/gogf/gf/util/grand" ) type Array struct { diff --git a/g/container/garray/garray_normal_string.go b/container/garray/garray_normal_string.go similarity index 99% rename from g/container/garray/garray_normal_string.go rename to container/garray/garray_normal_string.go index b489afb85..72dfcb3fd 100644 --- a/g/container/garray/garray_normal_string.go +++ b/container/garray/garray_normal_string.go @@ -13,9 +13,9 @@ import ( "sort" "strings" - "github.com/gogf/gf/g/internal/rwmutex" - "github.com/gogf/gf/g/util/gconv" - "github.com/gogf/gf/g/util/grand" + "github.com/gogf/gf/internal/rwmutex" + "github.com/gogf/gf/util/gconv" + "github.com/gogf/gf/util/grand" ) type StringArray struct { diff --git a/g/container/garray/garray_sorted_int.go b/container/garray/garray_sorted_int.go similarity index 98% rename from g/container/garray/garray_sorted_int.go rename to container/garray/garray_sorted_int.go index 632bc1f75..ce8fb5917 100644 --- a/g/container/garray/garray_sorted_int.go +++ b/container/garray/garray_sorted_int.go @@ -12,10 +12,10 @@ import ( "math" "sort" - "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" + "github.com/gogf/gf/container/gtype" + "github.com/gogf/gf/internal/rwmutex" + "github.com/gogf/gf/util/gconv" + "github.com/gogf/gf/util/grand" ) // It's using increasing order in default. diff --git a/g/container/garray/garray_sorted_interface.go b/container/garray/garray_sorted_interface.go similarity index 98% rename from g/container/garray/garray_sorted_interface.go rename to container/garray/garray_sorted_interface.go index 382fe5b1d..14cbeabdc 100644 --- a/g/container/garray/garray_sorted_interface.go +++ b/container/garray/garray_sorted_interface.go @@ -12,10 +12,10 @@ import ( "math" "sort" - "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" + "github.com/gogf/gf/container/gtype" + "github.com/gogf/gf/internal/rwmutex" + "github.com/gogf/gf/util/gconv" + "github.com/gogf/gf/util/grand" ) // It's using increasing order in default. diff --git a/g/container/garray/garray_sorted_string.go b/container/garray/garray_sorted_string.go similarity index 98% rename from g/container/garray/garray_sorted_string.go rename to container/garray/garray_sorted_string.go index 085db2732..3f7e24ef4 100644 --- a/g/container/garray/garray_sorted_string.go +++ b/container/garray/garray_sorted_string.go @@ -11,10 +11,10 @@ import ( "encoding/json" "math" - "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" + "github.com/gogf/gf/container/gtype" + "github.com/gogf/gf/internal/rwmutex" + "github.com/gogf/gf/util/gconv" + "github.com/gogf/gf/util/grand" ) // It's using increasing order in default. diff --git a/g/container/garray/garray_z_bench_test.go b/container/garray/garray_z_bench_test.go similarity index 95% rename from g/container/garray/garray_z_bench_test.go rename to container/garray/garray_z_bench_test.go index 6d48bafd5..ab9d676ba 100644 --- a/g/container/garray/garray_z_bench_test.go +++ b/container/garray/garray_z_bench_test.go @@ -11,7 +11,7 @@ package garray_test import ( "testing" - "github.com/gogf/gf/g/container/garray" + "github.com/gogf/gf/container/garray" ) var ( diff --git a/g/container/garray/garray_z_example_test.go b/container/garray/garray_z_example_test.go similarity index 98% rename from g/container/garray/garray_z_example_test.go rename to container/garray/garray_z_example_test.go index 3711e8cd5..7ab4da733 100644 --- a/g/container/garray/garray_z_example_test.go +++ b/container/garray/garray_z_example_test.go @@ -8,7 +8,8 @@ package garray_test import ( "fmt" - "github.com/gogf/gf/g/container/garray" + + "github.com/gogf/gf/container/garray" ) func Example_basic() { diff --git a/g/container/garray/garray_z_unit_basic_test.go b/container/garray/garray_z_unit_basic_test.go similarity index 96% rename from g/container/garray/garray_z_unit_basic_test.go rename to container/garray/garray_z_unit_basic_test.go index 61a40cf5d..07ed16855 100644 --- a/g/container/garray/garray_z_unit_basic_test.go +++ b/container/garray/garray_z_unit_basic_test.go @@ -9,11 +9,12 @@ package garray_test import ( - "github.com/gogf/gf/g/container/garray" - "github.com/gogf/gf/g/test/gtest" - "github.com/gogf/gf/g/util/gconv" "strings" "testing" + + "github.com/gogf/gf/container/garray" + "github.com/gogf/gf/test/gtest" + "github.com/gogf/gf/util/gconv" ) func Test_IntArray_Unique(t *testing.T) { diff --git a/g/container/garray/garray_z_unit_int_test.go b/container/garray/garray_z_unit_int_test.go similarity index 99% rename from g/container/garray/garray_z_unit_int_test.go rename to container/garray/garray_z_unit_int_test.go index d13aba193..2dfa8a6a6 100644 --- a/g/container/garray/garray_z_unit_int_test.go +++ b/container/garray/garray_z_unit_int_test.go @@ -9,12 +9,13 @@ package garray_test import ( - "github.com/gogf/gf/g/util/gconv" "testing" "time" - "github.com/gogf/gf/g/container/garray" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/util/gconv" + + "github.com/gogf/gf/container/garray" + "github.com/gogf/gf/test/gtest" ) func Test_IntArray_Basic(t *testing.T) { diff --git a/g/container/garray/garray_z_unit_interface_test.go b/container/garray/garray_z_unit_interface_test.go similarity index 99% rename from g/container/garray/garray_z_unit_interface_test.go rename to container/garray/garray_z_unit_interface_test.go index a1e16e20b..c67c3f011 100644 --- a/g/container/garray/garray_z_unit_interface_test.go +++ b/container/garray/garray_z_unit_interface_test.go @@ -9,12 +9,13 @@ package garray_test import ( - "github.com/gogf/gf/g/container/garray" - "github.com/gogf/gf/g/test/gtest" - "github.com/gogf/gf/g/util/gconv" "strings" "testing" "time" + + "github.com/gogf/gf/container/garray" + "github.com/gogf/gf/test/gtest" + "github.com/gogf/gf/util/gconv" ) func Test_Array_Basic(t *testing.T) { diff --git a/g/container/garray/garray_z_unit_string_test.go b/container/garray/garray_z_unit_string_test.go similarity index 99% rename from g/container/garray/garray_z_unit_string_test.go rename to container/garray/garray_z_unit_string_test.go index 99966f8ac..d8c186f3d 100644 --- a/g/container/garray/garray_z_unit_string_test.go +++ b/container/garray/garray_z_unit_string_test.go @@ -9,12 +9,13 @@ package garray_test import ( - "github.com/gogf/gf/g/container/garray" - "github.com/gogf/gf/g/test/gtest" - "github.com/gogf/gf/g/util/gconv" "strings" "testing" "time" + + "github.com/gogf/gf/container/garray" + "github.com/gogf/gf/test/gtest" + "github.com/gogf/gf/util/gconv" ) func Test_StringArray_Basic(t *testing.T) { diff --git a/g/container/gchan/gchan.go b/container/gchan/gchan.go similarity index 97% rename from g/container/gchan/gchan.go rename to container/gchan/gchan.go index eeba2e153..a0c7955dd 100644 --- a/g/container/gchan/gchan.go +++ b/container/gchan/gchan.go @@ -12,7 +12,7 @@ package gchan import ( "errors" - "github.com/gogf/gf/g/container/gtype" + "github.com/gogf/gf/container/gtype" ) // Graceful channel. diff --git a/g/container/gchan/gchan_example_test.go b/container/gchan/gchan_example_test.go similarity index 92% rename from g/container/gchan/gchan_example_test.go rename to container/gchan/gchan_example_test.go index 2545b55e3..592f7f9de 100644 --- a/g/container/gchan/gchan_example_test.go +++ b/container/gchan/gchan_example_test.go @@ -8,7 +8,8 @@ package gchan_test import ( "fmt" - "github.com/gogf/gf/g/container/gchan" + + "github.com/gogf/gf/container/gchan" ) func Example_basic() { diff --git a/g/container/gchan/gchan_z_unit_test.go b/container/gchan/gchan_z_unit_test.go similarity index 90% rename from g/container/gchan/gchan_z_unit_test.go rename to container/gchan/gchan_z_unit_test.go index 057113627..ed60f15ca 100644 --- a/g/container/gchan/gchan_z_unit_test.go +++ b/container/gchan/gchan_z_unit_test.go @@ -4,8 +4,8 @@ import ( "errors" "testing" - "github.com/gogf/gf/g/container/gchan" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/container/gchan" + "github.com/gogf/gf/test/gtest" ) func Test_Gchan(t *testing.T) { diff --git a/g/container/glist/glist.go b/container/glist/glist.go similarity index 99% rename from g/container/glist/glist.go rename to container/glist/glist.go index 3c28a4773..f8dc0a2f9 100644 --- a/g/container/glist/glist.go +++ b/container/glist/glist.go @@ -10,7 +10,8 @@ package glist import ( "container/list" - "github.com/gogf/gf/g/internal/rwmutex" + + "github.com/gogf/gf/internal/rwmutex" ) type ( diff --git a/g/container/glist/glist_example_test.go b/container/glist/glist_example_test.go similarity index 94% rename from g/container/glist/glist_example_test.go rename to container/glist/glist_example_test.go index 29b863196..d03fcbf30 100644 --- a/g/container/glist/glist_example_test.go +++ b/container/glist/glist_example_test.go @@ -8,7 +8,8 @@ package glist_test import ( "fmt" - "github.com/gogf/gf/g/container/glist" + + "github.com/gogf/gf/container/glist" ) func Example_basic() { diff --git a/g/container/glist/glist_z_bench_test.go b/container/glist/glist_z_bench_test.go similarity index 100% rename from g/container/glist/glist_z_bench_test.go rename to container/glist/glist_z_bench_test.go diff --git a/g/container/glist/glist_z_unit_test.go b/container/glist/glist_z_unit_test.go similarity index 99% rename from g/container/glist/glist_z_unit_test.go rename to container/glist/glist_z_unit_test.go index bc12fb1f0..0e2a33ef2 100644 --- a/g/container/glist/glist_z_unit_test.go +++ b/container/glist/glist_z_unit_test.go @@ -9,8 +9,8 @@ package glist import ( "container/list" - "github.com/gogf/gf/g/test/gtest" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/test/gtest" + "github.com/gogf/gf/util/gconv" "testing" ) diff --git a/g/container/gmap/gmap.go b/container/gmap/gmap.go similarity index 100% rename from g/container/gmap/gmap.go rename to container/gmap/gmap.go diff --git a/g/container/gmap/gmap_hash_any_any_map.go b/container/gmap/gmap_hash_any_any_map.go similarity index 98% rename from g/container/gmap/gmap_hash_any_any_map.go rename to container/gmap/gmap_hash_any_any_map.go index 2643fca78..8b4c35ffc 100644 --- a/g/container/gmap/gmap_hash_any_any_map.go +++ b/container/gmap/gmap_hash_any_any_map.go @@ -9,10 +9,10 @@ package gmap import ( "encoding/json" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/util/gconv" - "github.com/gogf/gf/g/container/gvar" - "github.com/gogf/gf/g/internal/rwmutex" + "github.com/gogf/gf/container/gvar" + "github.com/gogf/gf/internal/rwmutex" ) type AnyAnyMap struct { diff --git a/g/container/gmap/gmap_hash_int_any_map.go b/container/gmap/gmap_hash_int_any_map.go similarity index 98% rename from g/container/gmap/gmap_hash_int_any_map.go rename to container/gmap/gmap_hash_int_any_map.go index f25de6cda..9936e0757 100644 --- a/g/container/gmap/gmap_hash_int_any_map.go +++ b/container/gmap/gmap_hash_int_any_map.go @@ -10,9 +10,9 @@ package gmap import ( "encoding/json" - "github.com/gogf/gf/g/container/gvar" - "github.com/gogf/gf/g/internal/rwmutex" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/container/gvar" + "github.com/gogf/gf/internal/rwmutex" + "github.com/gogf/gf/util/gconv" ) type IntAnyMap struct { diff --git a/g/container/gmap/gmap_hash_int_int_map.go b/container/gmap/gmap_hash_int_int_map.go similarity index 99% rename from g/container/gmap/gmap_hash_int_int_map.go rename to container/gmap/gmap_hash_int_int_map.go index 02c81d42d..b53598cbe 100644 --- a/g/container/gmap/gmap_hash_int_int_map.go +++ b/container/gmap/gmap_hash_int_int_map.go @@ -9,7 +9,7 @@ package gmap import ( "encoding/json" - "github.com/gogf/gf/g/internal/rwmutex" + "github.com/gogf/gf/internal/rwmutex" ) type IntIntMap struct { diff --git a/g/container/gmap/gmap_hash_int_str_map.go b/container/gmap/gmap_hash_int_str_map.go similarity index 99% rename from g/container/gmap/gmap_hash_int_str_map.go rename to container/gmap/gmap_hash_int_str_map.go index 41c0c6d7f..dd23bd8db 100644 --- a/g/container/gmap/gmap_hash_int_str_map.go +++ b/container/gmap/gmap_hash_int_str_map.go @@ -9,8 +9,8 @@ package gmap import ( "encoding/json" - "github.com/gogf/gf/g/internal/rwmutex" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/internal/rwmutex" + "github.com/gogf/gf/util/gconv" ) type IntStrMap struct { diff --git a/g/container/gmap/gmap_hash_str_any_map.go b/container/gmap/gmap_hash_str_any_map.go similarity index 98% rename from g/container/gmap/gmap_hash_str_any_map.go rename to container/gmap/gmap_hash_str_any_map.go index ab0327969..7467311b1 100644 --- a/g/container/gmap/gmap_hash_str_any_map.go +++ b/container/gmap/gmap_hash_str_any_map.go @@ -10,9 +10,9 @@ package gmap import ( "encoding/json" - "github.com/gogf/gf/g/container/gvar" - "github.com/gogf/gf/g/internal/rwmutex" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/container/gvar" + "github.com/gogf/gf/internal/rwmutex" + "github.com/gogf/gf/util/gconv" ) type StrAnyMap struct { diff --git a/g/container/gmap/gmap_hash_str_int_map.go b/container/gmap/gmap_hash_str_int_map.go similarity index 99% rename from g/container/gmap/gmap_hash_str_int_map.go rename to container/gmap/gmap_hash_str_int_map.go index c006398e9..d3ff9b453 100644 --- a/g/container/gmap/gmap_hash_str_int_map.go +++ b/container/gmap/gmap_hash_str_int_map.go @@ -10,8 +10,8 @@ package gmap import ( "encoding/json" - "github.com/gogf/gf/g/internal/rwmutex" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/internal/rwmutex" + "github.com/gogf/gf/util/gconv" ) type StrIntMap struct { diff --git a/g/container/gmap/gmap_hash_str_str_map.go b/container/gmap/gmap_hash_str_str_map.go similarity index 99% rename from g/container/gmap/gmap_hash_str_str_map.go rename to container/gmap/gmap_hash_str_str_map.go index 2c93394ff..fba6866ae 100644 --- a/g/container/gmap/gmap_hash_str_str_map.go +++ b/container/gmap/gmap_hash_str_str_map.go @@ -10,7 +10,7 @@ package gmap import ( "encoding/json" - "github.com/gogf/gf/g/internal/rwmutex" + "github.com/gogf/gf/internal/rwmutex" ) type StrStrMap struct { diff --git a/g/container/gmap/gmap_link_map.go b/container/gmap/gmap_link_map.go similarity index 98% rename from g/container/gmap/gmap_link_map.go rename to container/gmap/gmap_link_map.go index ebc3a3884..2d0512ada 100644 --- a/g/container/gmap/gmap_link_map.go +++ b/container/gmap/gmap_link_map.go @@ -9,11 +9,11 @@ package gmap import ( "encoding/json" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/util/gconv" - "github.com/gogf/gf/g/container/glist" - "github.com/gogf/gf/g/container/gvar" - "github.com/gogf/gf/g/internal/rwmutex" + "github.com/gogf/gf/container/glist" + "github.com/gogf/gf/container/gvar" + "github.com/gogf/gf/internal/rwmutex" ) type ListMap struct { diff --git a/g/container/gmap/gmap_tree_map.go b/container/gmap/gmap_tree_map.go similarity index 96% rename from g/container/gmap/gmap_tree_map.go rename to container/gmap/gmap_tree_map.go index cf1a7b1e5..0e696e802 100644 --- a/g/container/gmap/gmap_tree_map.go +++ b/container/gmap/gmap_tree_map.go @@ -7,7 +7,7 @@ package gmap import ( - "github.com/gogf/gf/g/container/gtree" + "github.com/gogf/gf/container/gtree" ) // Map based on red-black tree, alias of RedBlackTree. diff --git a/g/container/gmap/gmap_z_basic_test.go b/container/gmap/gmap_z_basic_test.go similarity index 97% rename from g/container/gmap/gmap_z_basic_test.go rename to container/gmap/gmap_z_basic_test.go index 8380af42b..0502916bc 100644 --- a/g/container/gmap/gmap_z_basic_test.go +++ b/container/gmap/gmap_z_basic_test.go @@ -7,9 +7,10 @@ package gmap_test import ( - "github.com/gogf/gf/g/container/gmap" - "github.com/gogf/gf/g/test/gtest" "testing" + + "github.com/gogf/gf/container/gmap" + "github.com/gogf/gf/test/gtest" ) func getValue() interface{} { diff --git a/g/container/gmap/gmap_z_bench_maps_test.go b/container/gmap/gmap_z_bench_maps_test.go similarity index 94% rename from g/container/gmap/gmap_z_bench_maps_test.go rename to container/gmap/gmap_z_bench_maps_test.go index 67e6da596..a0d4e9f50 100644 --- a/g/container/gmap/gmap_z_bench_maps_test.go +++ b/container/gmap/gmap_z_bench_maps_test.go @@ -11,8 +11,8 @@ package gmap_test import ( "testing" - "github.com/gogf/gf/g/container/gmap" - "github.com/gogf/gf/g/util/gutil" + "github.com/gogf/gf/container/gmap" + "github.com/gogf/gf/util/gutil" ) var hashMap = gmap.New() diff --git a/g/container/gmap/gmap_z_bench_safe_test.go b/container/gmap/gmap_z_bench_safe_test.go similarity index 98% rename from g/container/gmap/gmap_z_bench_safe_test.go rename to container/gmap/gmap_z_bench_safe_test.go index 81f316c49..6f1a334ed 100644 --- a/g/container/gmap/gmap_z_bench_safe_test.go +++ b/container/gmap/gmap_z_bench_safe_test.go @@ -12,7 +12,7 @@ import ( "strconv" "testing" - "github.com/gogf/gf/g/container/gmap" + "github.com/gogf/gf/container/gmap" ) var anyAnyMap = gmap.NewAnyAnyMap() diff --git a/g/container/gmap/gmap_z_bench_syncmap_test.go b/container/gmap/gmap_z_bench_syncmap_test.go similarity index 96% rename from g/container/gmap/gmap_z_bench_syncmap_test.go rename to container/gmap/gmap_z_bench_syncmap_test.go index 083fa8fa2..def6e7dd5 100644 --- a/g/container/gmap/gmap_z_bench_syncmap_test.go +++ b/container/gmap/gmap_z_bench_syncmap_test.go @@ -12,7 +12,7 @@ import ( "sync" "testing" - "github.com/gogf/gf/g/container/gmap" + "github.com/gogf/gf/container/gmap" ) var gm = gmap.NewIntIntMap() diff --git a/g/container/gmap/gmap_z_bench_unsafe_test.go b/container/gmap/gmap_z_bench_unsafe_test.go similarity index 98% rename from g/container/gmap/gmap_z_bench_unsafe_test.go rename to container/gmap/gmap_z_bench_unsafe_test.go index 66a99f7b0..dbdd967f6 100644 --- a/g/container/gmap/gmap_z_bench_unsafe_test.go +++ b/container/gmap/gmap_z_bench_unsafe_test.go @@ -12,7 +12,7 @@ import ( "strconv" "testing" - "github.com/gogf/gf/g/container/gmap" + "github.com/gogf/gf/container/gmap" ) var ififmUnsafe = gmap.New(true) diff --git a/g/container/gmap/gmap_z_example_test.go b/container/gmap/gmap_z_example_test.go similarity index 97% rename from g/container/gmap/gmap_z_example_test.go rename to container/gmap/gmap_z_example_test.go index 6d330d901..88a7217c9 100644 --- a/g/container/gmap/gmap_z_example_test.go +++ b/container/gmap/gmap_z_example_test.go @@ -2,7 +2,8 @@ package gmap_test import ( "fmt" - "github.com/gogf/gf/g/container/gmap" + + "github.com/gogf/gf/container/gmap" ) func Example_Normal_Basic() { diff --git a/g/container/gmap/gmap_z_int_any_test.go b/container/gmap/gmap_z_int_any_test.go similarity index 97% rename from g/container/gmap/gmap_z_int_any_test.go rename to container/gmap/gmap_z_int_any_test.go index e97ca03e7..0866ebfc4 100644 --- a/g/container/gmap/gmap_z_int_any_test.go +++ b/container/gmap/gmap_z_int_any_test.go @@ -7,9 +7,10 @@ package gmap_test import ( - "github.com/gogf/gf/g/container/gmap" - "github.com/gogf/gf/g/test/gtest" "testing" + + "github.com/gogf/gf/container/gmap" + "github.com/gogf/gf/test/gtest" ) func getAny() interface{} { diff --git a/g/container/gmap/gmap_z_int_int_test.go b/container/gmap/gmap_z_int_int_test.go similarity index 97% rename from g/container/gmap/gmap_z_int_int_test.go rename to container/gmap/gmap_z_int_int_test.go index 2a5949238..1bed90412 100644 --- a/g/container/gmap/gmap_z_int_int_test.go +++ b/container/gmap/gmap_z_int_int_test.go @@ -7,9 +7,10 @@ package gmap_test import ( - "github.com/gogf/gf/g/container/gmap" - "github.com/gogf/gf/g/test/gtest" "testing" + + "github.com/gogf/gf/container/gmap" + "github.com/gogf/gf/test/gtest" ) func getInt() int { diff --git a/g/container/gmap/gmap_z_int_str_test.go b/container/gmap/gmap_z_int_str_test.go similarity index 97% rename from g/container/gmap/gmap_z_int_str_test.go rename to container/gmap/gmap_z_int_str_test.go index f18a4e404..0658299e0 100644 --- a/g/container/gmap/gmap_z_int_str_test.go +++ b/container/gmap/gmap_z_int_str_test.go @@ -7,9 +7,10 @@ package gmap_test import ( - "github.com/gogf/gf/g/container/gmap" - "github.com/gogf/gf/g/test/gtest" "testing" + + "github.com/gogf/gf/container/gmap" + "github.com/gogf/gf/test/gtest" ) func getStr() string { diff --git a/g/container/gmap/gmap_z_link_map_test.go b/container/gmap/gmap_z_link_map_test.go similarity index 97% rename from g/container/gmap/gmap_z_link_map_test.go rename to container/gmap/gmap_z_link_map_test.go index fe5a88e0a..2d3fb5fe6 100644 --- a/g/container/gmap/gmap_z_link_map_test.go +++ b/container/gmap/gmap_z_link_map_test.go @@ -7,10 +7,11 @@ package gmap_test import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/container/gmap" - "github.com/gogf/gf/g/test/gtest" "testing" + + "github.com/gogf/gf/container/gmap" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/test/gtest" ) func Test_List_Map_Basic(t *testing.T) { diff --git a/g/container/gmap/gmap_z_str_any_test.go b/container/gmap/gmap_z_str_any_test.go similarity index 97% rename from g/container/gmap/gmap_z_str_any_test.go rename to container/gmap/gmap_z_str_any_test.go index 51cf9a83b..4ba2714f3 100644 --- a/g/container/gmap/gmap_z_str_any_test.go +++ b/container/gmap/gmap_z_str_any_test.go @@ -7,9 +7,10 @@ package gmap_test import ( - "github.com/gogf/gf/g/container/gmap" - "github.com/gogf/gf/g/test/gtest" "testing" + + "github.com/gogf/gf/container/gmap" + "github.com/gogf/gf/test/gtest" ) func stringAnyCallBack(string, interface{}) bool { diff --git a/g/container/gmap/gmap_z_str_int_test.go b/container/gmap/gmap_z_str_int_test.go similarity index 97% rename from g/container/gmap/gmap_z_str_int_test.go rename to container/gmap/gmap_z_str_int_test.go index bb8dad9d5..37a8caa3c 100644 --- a/g/container/gmap/gmap_z_str_int_test.go +++ b/container/gmap/gmap_z_str_int_test.go @@ -7,9 +7,10 @@ package gmap_test import ( - "github.com/gogf/gf/g/container/gmap" - "github.com/gogf/gf/g/test/gtest" "testing" + + "github.com/gogf/gf/container/gmap" + "github.com/gogf/gf/test/gtest" ) func stringIntCallBack(string, int) bool { diff --git a/g/container/gmap/gmap_z_str_str_test.go b/container/gmap/gmap_z_str_str_test.go similarity index 97% rename from g/container/gmap/gmap_z_str_str_test.go rename to container/gmap/gmap_z_str_str_test.go index 0c65f5b08..590077197 100644 --- a/g/container/gmap/gmap_z_str_str_test.go +++ b/container/gmap/gmap_z_str_str_test.go @@ -7,9 +7,10 @@ package gmap_test import ( - "github.com/gogf/gf/g/container/gmap" - "github.com/gogf/gf/g/test/gtest" "testing" + + "github.com/gogf/gf/container/gmap" + "github.com/gogf/gf/test/gtest" ) func stringStrCallBack(string, string) bool { diff --git a/g/container/gmap/gmap_z_tree_map_test.go b/container/gmap/gmap_z_tree_map_test.go similarity index 96% rename from g/container/gmap/gmap_z_tree_map_test.go rename to container/gmap/gmap_z_tree_map_test.go index 302db4368..e04347dfc 100644 --- a/g/container/gmap/gmap_z_tree_map_test.go +++ b/container/gmap/gmap_z_tree_map_test.go @@ -7,10 +7,11 @@ package gmap_test import ( - "github.com/gogf/gf/g/container/gmap" - "github.com/gogf/gf/g/test/gtest" - "github.com/gogf/gf/g/util/gutil" "testing" + + "github.com/gogf/gf/container/gmap" + "github.com/gogf/gf/test/gtest" + "github.com/gogf/gf/util/gutil" ) func Test_Tree_Map_Basic(t *testing.T) { diff --git a/g/container/gpool/gpool.go b/container/gpool/gpool.go similarity index 96% rename from g/container/gpool/gpool.go rename to container/gpool/gpool.go index 343c0622b..1238b10f1 100644 --- a/g/container/gpool/gpool.go +++ b/container/gpool/gpool.go @@ -11,10 +11,10 @@ import ( "errors" "time" - "github.com/gogf/gf/g/container/glist" - "github.com/gogf/gf/g/container/gtype" - "github.com/gogf/gf/g/os/gtime" - "github.com/gogf/gf/g/os/gtimer" + "github.com/gogf/gf/container/glist" + "github.com/gogf/gf/container/gtype" + "github.com/gogf/gf/os/gtime" + "github.com/gogf/gf/os/gtimer" ) // Object-Reusable Pool. diff --git a/g/container/gpool/gpool_bench_test.go b/container/gpool/gpool_bench_test.go similarity index 94% rename from g/container/gpool/gpool_bench_test.go rename to container/gpool/gpool_bench_test.go index 8e313201d..f7dbea5b1 100644 --- a/g/container/gpool/gpool_bench_test.go +++ b/container/gpool/gpool_bench_test.go @@ -9,9 +9,10 @@ package gpool_test import ( - "github.com/gogf/gf/g/container/gpool" "sync" "testing" + + "github.com/gogf/gf/container/gpool" ) var pool = gpool.New(99999999, nil) diff --git a/g/container/gpool/gpool_z_unit_test.go b/container/gpool/gpool_z_unit_test.go similarity index 95% rename from g/container/gpool/gpool_z_unit_test.go rename to container/gpool/gpool_z_unit_test.go index 19bea8843..4f691d335 100644 --- a/g/container/gpool/gpool_z_unit_test.go +++ b/container/gpool/gpool_z_unit_test.go @@ -8,12 +8,13 @@ package gpool_test import ( "errors" - "github.com/gogf/gf/g" "testing" "time" - "github.com/gogf/gf/g/container/gpool" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/frame/g" + + "github.com/gogf/gf/container/gpool" + "github.com/gogf/gf/test/gtest" ) var nf gpool.NewFunc = func() (i interface{}, e error) { diff --git a/g/container/gqueue/gqueue.go b/container/gqueue/gqueue.go similarity index 97% rename from g/container/gqueue/gqueue.go rename to container/gqueue/gqueue.go index 8362c25cf..436ff1ebb 100644 --- a/g/container/gqueue/gqueue.go +++ b/container/gqueue/gqueue.go @@ -19,9 +19,10 @@ package gqueue import ( - "github.com/gogf/gf/g/container/glist" - "github.com/gogf/gf/g/container/gtype" "math" + + "github.com/gogf/gf/container/glist" + "github.com/gogf/gf/container/gtype" ) type Queue struct { diff --git a/g/container/gqueue/gqueue_bench_test.go b/container/gqueue/gqueue_bench_test.go similarity index 95% rename from g/container/gqueue/gqueue_bench_test.go rename to container/gqueue/gqueue_bench_test.go index 76448fe6d..cdddbc57e 100644 --- a/g/container/gqueue/gqueue_bench_test.go +++ b/container/gqueue/gqueue_bench_test.go @@ -9,8 +9,9 @@ package gqueue_test import ( - "github.com/gogf/gf/g/container/gqueue" "testing" + + "github.com/gogf/gf/container/gqueue" ) var bn = 20000000 diff --git a/g/container/gqueue/gqueue_unit_test.go b/container/gqueue/gqueue_unit_test.go similarity index 92% rename from g/container/gqueue/gqueue_unit_test.go rename to container/gqueue/gqueue_unit_test.go index 322c63985..b6139e60b 100644 --- a/g/container/gqueue/gqueue_unit_test.go +++ b/container/gqueue/gqueue_unit_test.go @@ -9,9 +9,10 @@ package gqueue_test import ( - "github.com/gogf/gf/g/container/gqueue" - "github.com/gogf/gf/g/test/gtest" "testing" + + "github.com/gogf/gf/container/gqueue" + "github.com/gogf/gf/test/gtest" ) func TestQueue_Len(t *testing.T) { diff --git a/g/container/gring/gring.go b/container/gring/gring.go similarity index 98% rename from g/container/gring/gring.go rename to container/gring/gring.go index eb22508a9..884be1159 100644 --- a/g/container/gring/gring.go +++ b/container/gring/gring.go @@ -9,8 +9,9 @@ package gring import ( "container/ring" - "github.com/gogf/gf/g/container/gtype" - "github.com/gogf/gf/g/internal/rwmutex" + + "github.com/gogf/gf/container/gtype" + "github.com/gogf/gf/internal/rwmutex" ) type Ring struct { diff --git a/g/container/gring/gring_test.go b/container/gring/gring_test.go similarity index 100% rename from g/container/gring/gring_test.go rename to container/gring/gring_test.go diff --git a/g/container/gring/gring_unit_test.go b/container/gring/gring_unit_test.go similarity index 97% rename from g/container/gring/gring_unit_test.go rename to container/gring/gring_unit_test.go index 2fd7147bc..6f735e8f3 100644 --- a/g/container/gring/gring_unit_test.go +++ b/container/gring/gring_unit_test.go @@ -2,10 +2,11 @@ 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" + + "github.com/gogf/gf/container/gring" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/test/gtest" ) type Student struct { diff --git a/g/container/gset/gset.go b/container/gset/gset.go similarity index 98% rename from g/container/gset/gset.go rename to container/gset/gset.go index 52b74d68a..69f6dde49 100644 --- a/g/container/gset/gset.go +++ b/container/gset/gset.go @@ -8,9 +8,10 @@ package gset import ( - "github.com/gogf/gf/g/internal/rwmutex" - "github.com/gogf/gf/g/util/gconv" "strings" + + "github.com/gogf/gf/internal/rwmutex" + "github.com/gogf/gf/util/gconv" ) type Set struct { diff --git a/g/container/gset/gset_int_set.go b/container/gset/gset_int_set.go similarity index 98% rename from g/container/gset/gset_int_set.go rename to container/gset/gset_int_set.go index f8e0541ee..40bea6e08 100644 --- a/g/container/gset/gset_int_set.go +++ b/container/gset/gset_int_set.go @@ -8,9 +8,10 @@ package gset import ( - "github.com/gogf/gf/g/internal/rwmutex" - "github.com/gogf/gf/g/util/gconv" "strings" + + "github.com/gogf/gf/internal/rwmutex" + "github.com/gogf/gf/util/gconv" ) type IntSet struct { diff --git a/g/container/gset/gset_string_set.go b/container/gset/gset_string_set.go similarity index 98% rename from g/container/gset/gset_string_set.go rename to container/gset/gset_string_set.go index 7a0c68251..ceb07b704 100644 --- a/g/container/gset/gset_string_set.go +++ b/container/gset/gset_string_set.go @@ -8,9 +8,10 @@ package gset import ( - "github.com/gogf/gf/g/internal/rwmutex" - "github.com/gogf/gf/g/util/gconv" "strings" + + "github.com/gogf/gf/internal/rwmutex" + "github.com/gogf/gf/util/gconv" ) type StringSet struct { diff --git a/g/container/gset/gset_z_bench_test.go b/container/gset/gset_z_bench_test.go similarity index 98% rename from g/container/gset/gset_z_bench_test.go rename to container/gset/gset_z_bench_test.go index 7b1000f30..5d0bbc9ef 100644 --- a/g/container/gset/gset_z_bench_test.go +++ b/container/gset/gset_z_bench_test.go @@ -12,7 +12,7 @@ import ( "strconv" "testing" - "github.com/gogf/gf/g/container/gset" + "github.com/gogf/gf/container/gset" ) var intSet = gset.NewIntSet() diff --git a/g/container/gset/gset_z_unit_int_test.go b/container/gset/gset_z_unit_int_test.go similarity index 97% rename from g/container/gset/gset_z_unit_int_test.go rename to container/gset/gset_z_unit_int_test.go index d9b707c52..5369743d1 100644 --- a/g/container/gset/gset_z_unit_int_test.go +++ b/container/gset/gset_z_unit_int_test.go @@ -9,11 +9,12 @@ package gset_test import ( - "github.com/gogf/gf/g/container/garray" - "github.com/gogf/gf/g/container/gset" - "github.com/gogf/gf/g/test/gtest" "strings" "testing" + + "github.com/gogf/gf/container/garray" + "github.com/gogf/gf/container/gset" + "github.com/gogf/gf/test/gtest" ) func TestIntSet_Basic(t *testing.T) { diff --git a/g/container/gset/gset_z_unit_string_test.go b/container/gset/gset_z_unit_string_test.go similarity index 98% rename from g/container/gset/gset_z_unit_string_test.go rename to container/gset/gset_z_unit_string_test.go index 57354d803..a7f985fa7 100644 --- a/g/container/gset/gset_z_unit_string_test.go +++ b/container/gset/gset_z_unit_string_test.go @@ -9,11 +9,12 @@ package gset_test import ( - "github.com/gogf/gf/g/container/garray" - "github.com/gogf/gf/g/container/gset" - "github.com/gogf/gf/g/test/gtest" "strings" "testing" + + "github.com/gogf/gf/container/garray" + "github.com/gogf/gf/container/gset" + "github.com/gogf/gf/test/gtest" ) func TestStringSet_Basic(t *testing.T) { diff --git a/g/container/gset/gset_z_unit_test.go b/container/gset/gset_z_unit_test.go similarity index 98% rename from g/container/gset/gset_z_unit_test.go rename to container/gset/gset_z_unit_test.go index fba78f7ee..6a3982e46 100644 --- a/g/container/gset/gset_z_unit_test.go +++ b/container/gset/gset_z_unit_test.go @@ -9,11 +9,12 @@ package gset_test import ( - "github.com/gogf/gf/g/container/garray" - "github.com/gogf/gf/g/container/gset" - "github.com/gogf/gf/g/test/gtest" "strings" + "github.com/gogf/gf/container/garray" + "github.com/gogf/gf/container/gset" + "github.com/gogf/gf/test/gtest" + "testing" ) diff --git a/g/container/gtree/gtree.go b/container/gtree/gtree.go similarity index 100% rename from g/container/gtree/gtree.go rename to container/gtree/gtree.go diff --git a/g/container/gtree/gtree_avltree.go b/container/gtree/gtree_avltree.go similarity index 99% rename from g/container/gtree/gtree_avltree.go rename to container/gtree/gtree_avltree.go index 760bb6948..25f7599b5 100644 --- a/g/container/gtree/gtree_avltree.go +++ b/container/gtree/gtree_avltree.go @@ -10,8 +10,8 @@ import ( "encoding/json" "fmt" - "github.com/gogf/gf/g/container/gvar" - "github.com/gogf/gf/g/internal/rwmutex" + "github.com/gogf/gf/container/gvar" + "github.com/gogf/gf/internal/rwmutex" ) // AVLTree holds elements of the AVL tree. diff --git a/g/container/gtree/gtree_btree.go b/container/gtree/gtree_btree.go similarity index 99% rename from g/container/gtree/gtree_btree.go rename to container/gtree/gtree_btree.go index 2e3c46788..8db70f8f7 100644 --- a/g/container/gtree/gtree_btree.go +++ b/container/gtree/gtree_btree.go @@ -12,8 +12,8 @@ import ( "fmt" "strings" - "github.com/gogf/gf/g/container/gvar" - "github.com/gogf/gf/g/internal/rwmutex" + "github.com/gogf/gf/container/gvar" + "github.com/gogf/gf/internal/rwmutex" ) // BTree holds elements of the B-tree. diff --git a/g/container/gtree/gtree_redblacktree.go b/container/gtree/gtree_redblacktree.go similarity index 99% rename from g/container/gtree/gtree_redblacktree.go rename to container/gtree/gtree_redblacktree.go index 00da32861..81e5694b2 100644 --- a/g/container/gtree/gtree_redblacktree.go +++ b/container/gtree/gtree_redblacktree.go @@ -10,8 +10,8 @@ import ( "encoding/json" "fmt" - "github.com/gogf/gf/g/container/gvar" - "github.com/gogf/gf/g/internal/rwmutex" + "github.com/gogf/gf/container/gvar" + "github.com/gogf/gf/internal/rwmutex" ) type color bool diff --git a/g/container/gtree/gtree_z_avl_tree_test.go b/container/gtree/gtree_z_avl_tree_test.go similarity index 97% rename from g/container/gtree/gtree_z_avl_tree_test.go rename to container/gtree/gtree_z_avl_tree_test.go index 8cf58032f..cc6b1046a 100644 --- a/g/container/gtree/gtree_z_avl_tree_test.go +++ b/container/gtree/gtree_z_avl_tree_test.go @@ -10,10 +10,10 @@ import ( "fmt" "testing" - "github.com/gogf/gf/g/container/gtree" - "github.com/gogf/gf/g/container/gvar" - "github.com/gogf/gf/g/test/gtest" - "github.com/gogf/gf/g/util/gutil" + "github.com/gogf/gf/container/gtree" + "github.com/gogf/gf/container/gvar" + "github.com/gogf/gf/test/gtest" + "github.com/gogf/gf/util/gutil" ) func Test_AVLTree_Basic(t *testing.T) { diff --git a/g/container/gtree/gtree_z_b_tree_test.go b/container/gtree/gtree_z_b_tree_test.go similarity index 97% rename from g/container/gtree/gtree_z_b_tree_test.go rename to container/gtree/gtree_z_b_tree_test.go index 8659b5366..bb88dce8d 100644 --- a/g/container/gtree/gtree_z_b_tree_test.go +++ b/container/gtree/gtree_z_b_tree_test.go @@ -10,10 +10,10 @@ import ( "fmt" "testing" - "github.com/gogf/gf/g/container/gtree" - "github.com/gogf/gf/g/container/gvar" - "github.com/gogf/gf/g/test/gtest" - "github.com/gogf/gf/g/util/gutil" + "github.com/gogf/gf/container/gtree" + "github.com/gogf/gf/container/gvar" + "github.com/gogf/gf/test/gtest" + "github.com/gogf/gf/util/gutil" ) func Test_BTree_Basic(t *testing.T) { diff --git a/g/container/gtree/gtree_z_redblack_tree_test.go b/container/gtree/gtree_z_redblack_tree_test.go similarity index 97% rename from g/container/gtree/gtree_z_redblack_tree_test.go rename to container/gtree/gtree_z_redblack_tree_test.go index 29406bad8..c9f61bdbd 100644 --- a/g/container/gtree/gtree_z_redblack_tree_test.go +++ b/container/gtree/gtree_z_redblack_tree_test.go @@ -10,10 +10,10 @@ import ( "fmt" "testing" - "github.com/gogf/gf/g/container/gtree" - "github.com/gogf/gf/g/container/gvar" - "github.com/gogf/gf/g/test/gtest" - "github.com/gogf/gf/g/util/gutil" + "github.com/gogf/gf/container/gtree" + "github.com/gogf/gf/container/gvar" + "github.com/gogf/gf/test/gtest" + "github.com/gogf/gf/util/gutil" ) func getValue() interface{} { diff --git a/g/container/gtype/bool.go b/container/gtype/bool.go similarity index 100% rename from g/container/gtype/bool.go rename to container/gtype/bool.go diff --git a/g/container/gtype/byte.go b/container/gtype/byte.go similarity index 100% rename from g/container/gtype/byte.go rename to container/gtype/byte.go diff --git a/g/container/gtype/bytes.go b/container/gtype/bytes.go similarity index 100% rename from g/container/gtype/bytes.go rename to container/gtype/bytes.go diff --git a/g/container/gtype/float32.go b/container/gtype/float32.go similarity index 100% rename from g/container/gtype/float32.go rename to container/gtype/float32.go diff --git a/g/container/gtype/float64.go b/container/gtype/float64.go similarity index 100% rename from g/container/gtype/float64.go rename to container/gtype/float64.go diff --git a/g/container/gtype/gtype.go b/container/gtype/gtype.go similarity index 100% rename from g/container/gtype/gtype.go rename to container/gtype/gtype.go diff --git a/g/container/gtype/gtype_test.go b/container/gtype/gtype_test.go similarity index 98% rename from g/container/gtype/gtype_test.go rename to container/gtype/gtype_test.go index 086fca021..d9570f631 100644 --- a/g/container/gtype/gtype_test.go +++ b/container/gtype/gtype_test.go @@ -9,10 +9,11 @@ package gtype import ( - "github.com/gogf/gf/g/encoding/gbinary" "strconv" "sync/atomic" "testing" + + "github.com/gogf/gf/encoding/gbinary" ) var it = NewInt() diff --git a/g/container/gtype/gtype_z_unit_test.go b/container/gtype/gtype_z_unit_test.go similarity index 98% rename from g/container/gtype/gtype_z_unit_test.go rename to container/gtype/gtype_z_unit_test.go index 9870ed8c6..dd4ab0bca 100644 --- a/g/container/gtype/gtype_z_unit_test.go +++ b/container/gtype/gtype_z_unit_test.go @@ -4,8 +4,8 @@ import ( "sync" "testing" - "github.com/gogf/gf/g/container/gtype" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/container/gtype" + "github.com/gogf/gf/test/gtest" ) type Temp struct { diff --git a/g/container/gtype/int.go b/container/gtype/int.go similarity index 100% rename from g/container/gtype/int.go rename to container/gtype/int.go diff --git a/g/container/gtype/int32.go b/container/gtype/int32.go similarity index 100% rename from g/container/gtype/int32.go rename to container/gtype/int32.go diff --git a/g/container/gtype/int64.go b/container/gtype/int64.go similarity index 100% rename from g/container/gtype/int64.go rename to container/gtype/int64.go diff --git a/g/container/gtype/interface.go b/container/gtype/interface.go similarity index 100% rename from g/container/gtype/interface.go rename to container/gtype/interface.go diff --git a/g/container/gtype/string.go b/container/gtype/string.go similarity index 100% rename from g/container/gtype/string.go rename to container/gtype/string.go diff --git a/g/container/gtype/uint.go b/container/gtype/uint.go similarity index 100% rename from g/container/gtype/uint.go rename to container/gtype/uint.go diff --git a/g/container/gtype/uint32.go b/container/gtype/uint32.go similarity index 100% rename from g/container/gtype/uint32.go rename to container/gtype/uint32.go diff --git a/g/container/gtype/uint64.go b/container/gtype/uint64.go similarity index 100% rename from g/container/gtype/uint64.go rename to container/gtype/uint64.go diff --git a/g/container/gvar/gvar.go b/container/gvar/gvar.go similarity index 97% rename from g/container/gvar/gvar.go rename to container/gvar/gvar.go index 68101eeb4..12b2815fe 100644 --- a/g/container/gvar/gvar.go +++ b/container/gvar/gvar.go @@ -11,11 +11,11 @@ import ( "encoding/json" "time" - "github.com/gogf/gf/g/internal/empty" + "github.com/gogf/gf/internal/empty" - "github.com/gogf/gf/g/container/gtype" - "github.com/gogf/gf/g/os/gtime" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/container/gtype" + "github.com/gogf/gf/os/gtime" + "github.com/gogf/gf/util/gconv" ) // Var is an universal variable type. diff --git a/g/container/gvar/gvar_test.go b/container/gvar/gvar_test.go similarity index 98% rename from g/container/gvar/gvar_test.go rename to container/gvar/gvar_test.go index 68fe77131..04670ddd0 100644 --- a/g/container/gvar/gvar_test.go +++ b/container/gvar/gvar_test.go @@ -11,8 +11,8 @@ import ( "encoding/binary" "testing" - "github.com/gogf/gf/g/container/gvar" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/container/gvar" + "github.com/gogf/gf/test/gtest" ) func TestSet(t *testing.T) { diff --git a/g/container/gvar/gvar_z_bench_test.go b/container/gvar/gvar_z_bench_test.go similarity index 100% rename from g/container/gvar/gvar_z_bench_test.go rename to container/gvar/gvar_z_bench_test.go diff --git a/g/crypto/gaes/gaes.go b/crypto/gaes/gaes.go similarity index 100% rename from g/crypto/gaes/gaes.go rename to crypto/gaes/gaes.go diff --git a/g/crypto/gaes/gaes_test.go b/crypto/gaes/gaes_test.go similarity index 97% rename from g/crypto/gaes/gaes_test.go rename to crypto/gaes/gaes_test.go index 249e99c87..3c86e7767 100644 --- a/g/crypto/gaes/gaes_test.go +++ b/crypto/gaes/gaes_test.go @@ -11,10 +11,10 @@ package gaes_test import ( "testing" - "github.com/gogf/gf/g/encoding/gbase64" + "github.com/gogf/gf/encoding/gbase64" - "github.com/gogf/gf/g/crypto/gaes" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/crypto/gaes" + "github.com/gogf/gf/test/gtest" ) var ( diff --git a/g/crypto/gcrc32/gcrc32.go b/crypto/gcrc32/gcrc32.go similarity index 95% rename from g/crypto/gcrc32/gcrc32.go rename to crypto/gcrc32/gcrc32.go index fe4b5e6c9..e18e01e73 100644 --- a/g/crypto/gcrc32/gcrc32.go +++ b/crypto/gcrc32/gcrc32.go @@ -8,8 +8,9 @@ package gcrc32 import ( - "github.com/gogf/gf/g/util/gconv" "hash/crc32" + + "github.com/gogf/gf/util/gconv" ) // Encrypt encrypts any type of variable using CRC32 algorithms. diff --git a/g/crypto/gcrc32/gcrc32_test.go b/crypto/gcrc32/gcrc32_test.go similarity index 90% rename from g/crypto/gcrc32/gcrc32_test.go rename to crypto/gcrc32/gcrc32_test.go index 6472a7a01..98b4b0b55 100644 --- a/g/crypto/gcrc32/gcrc32_test.go +++ b/crypto/gcrc32/gcrc32_test.go @@ -11,9 +11,9 @@ package gcrc32_test import ( "testing" - "github.com/gogf/gf/g/crypto/gcrc32" - "github.com/gogf/gf/g/crypto/gmd5" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/crypto/gcrc32" + "github.com/gogf/gf/crypto/gmd5" + "github.com/gogf/gf/test/gtest" ) func TestEncryptString(t *testing.T) { diff --git a/g/crypto/gdes/gdes.go b/crypto/gdes/gdes.go similarity index 100% rename from g/crypto/gdes/gdes.go rename to crypto/gdes/gdes.go diff --git a/g/crypto/gdes/gdes_test.go b/crypto/gdes/gdes_test.go similarity index 99% rename from g/crypto/gdes/gdes_test.go rename to crypto/gdes/gdes_test.go index b1a0e86d2..01a3bc69d 100644 --- a/g/crypto/gdes/gdes_test.go +++ b/crypto/gdes/gdes_test.go @@ -10,8 +10,8 @@ import ( "encoding/hex" "testing" - "github.com/gogf/gf/g/crypto/gdes" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/crypto/gdes" + "github.com/gogf/gf/test/gtest" ) var ( diff --git a/g/crypto/gmd5/gmd5.go b/crypto/gmd5/gmd5.go similarity index 95% rename from g/crypto/gmd5/gmd5.go rename to crypto/gmd5/gmd5.go index 903b82f2d..4e527cf97 100644 --- a/g/crypto/gmd5/gmd5.go +++ b/crypto/gmd5/gmd5.go @@ -13,8 +13,8 @@ import ( "io" "os" - "github.com/gogf/gf/g/errors/gerror" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/errors/gerror" + "github.com/gogf/gf/util/gconv" ) // Encrypt encrypts any type of variable using MD5 algorithms. diff --git a/g/crypto/gmd5/gmd5_test.go b/crypto/gmd5/gmd5_test.go similarity index 95% rename from g/crypto/gmd5/gmd5_test.go rename to crypto/gmd5/gmd5_test.go index 7cbfcf696..82eb3a306 100644 --- a/g/crypto/gmd5/gmd5_test.go +++ b/crypto/gmd5/gmd5_test.go @@ -12,8 +12,8 @@ import ( "os" "testing" - "github.com/gogf/gf/g/crypto/gmd5" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/crypto/gmd5" + "github.com/gogf/gf/test/gtest" ) var ( diff --git a/g/crypto/gsha1/gsha1.go b/crypto/gsha1/gsha1.go similarity index 93% rename from g/crypto/gsha1/gsha1.go rename to crypto/gsha1/gsha1.go index 904625078..7b0e28370 100644 --- a/g/crypto/gsha1/gsha1.go +++ b/crypto/gsha1/gsha1.go @@ -13,8 +13,8 @@ import ( "io" "os" - "github.com/gogf/gf/g/errors/gerror" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/errors/gerror" + "github.com/gogf/gf/util/gconv" ) // Encrypt encrypts any type of variable using SHA1 algorithms. diff --git a/g/crypto/gsha1/gsha1_test.go b/crypto/gsha1/gsha1_test.go similarity index 95% rename from g/crypto/gsha1/gsha1_test.go rename to crypto/gsha1/gsha1_test.go index b3c1dad76..d303daf8c 100644 --- a/g/crypto/gsha1/gsha1_test.go +++ b/crypto/gsha1/gsha1_test.go @@ -12,8 +12,8 @@ import ( "os" "testing" - "github.com/gogf/gf/g/crypto/gsha1" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/crypto/gsha1" + "github.com/gogf/gf/test/gtest" ) type user struct { diff --git a/g/database/gdb/gdb.go b/database/gdb/gdb.go similarity index 98% rename from g/database/gdb/gdb.go rename to database/gdb/gdb.go index 4d6baa601..4442b5cb9 100644 --- a/g/database/gdb/gdb.go +++ b/database/gdb/gdb.go @@ -16,12 +16,12 @@ import ( "fmt" "time" - "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/container/gmap" + "github.com/gogf/gf/container/gring" + "github.com/gogf/gf/container/gtype" + "github.com/gogf/gf/container/gvar" + "github.com/gogf/gf/os/gcache" + "github.com/gogf/gf/util/grand" ) // 数据库操作接口 diff --git a/g/database/gdb/gdb_base.go b/database/gdb/gdb_base.go similarity index 99% rename from g/database/gdb/gdb_base.go rename to database/gdb/gdb_base.go index 30264634b..73679282a 100644 --- a/g/database/gdb/gdb_base.go +++ b/database/gdb/gdb_base.go @@ -16,13 +16,13 @@ import ( "regexp" "strings" - "github.com/gogf/gf/g/text/gstr" + "github.com/gogf/gf/text/gstr" - "github.com/gogf/gf/g/container/gvar" - "github.com/gogf/gf/g/os/gcache" - "github.com/gogf/gf/g/os/gtime" - "github.com/gogf/gf/g/text/gregex" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/container/gvar" + "github.com/gogf/gf/os/gcache" + "github.com/gogf/gf/os/gtime" + "github.com/gogf/gf/text/gregex" + "github.com/gogf/gf/util/gconv" ) const ( diff --git a/g/database/gdb/gdb_batch_result.go b/database/gdb/gdb_batch_result.go similarity index 100% rename from g/database/gdb/gdb_batch_result.go rename to database/gdb/gdb_batch_result.go diff --git a/g/database/gdb/gdb_config.go b/database/gdb/gdb_config.go similarity index 99% rename from g/database/gdb/gdb_config.go rename to database/gdb/gdb_config.go index d77eade19..3352de1ad 100644 --- a/g/database/gdb/gdb_config.go +++ b/database/gdb/gdb_config.go @@ -10,7 +10,7 @@ import ( "fmt" "sync" - "github.com/gogf/gf/g/container/gring" + "github.com/gogf/gf/container/gring" ) const ( diff --git a/g/database/gdb/gdb_func.go b/database/gdb/gdb_func.go similarity index 96% rename from g/database/gdb/gdb_func.go rename to database/gdb/gdb_func.go index cd21f3e8b..d0fb615fd 100644 --- a/g/database/gdb/gdb_func.go +++ b/database/gdb/gdb_func.go @@ -14,11 +14,11 @@ import ( "strings" "time" - "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/os/glog" + "github.com/gogf/gf/os/gtime" + "github.com/gogf/gf/text/gregex" + "github.com/gogf/gf/text/gstr" + "github.com/gogf/gf/util/gconv" ) // Type assert api for String(). diff --git a/g/database/gdb/gdb_model.go b/database/gdb/gdb_model.go similarity index 99% rename from g/database/gdb/gdb_model.go rename to database/gdb/gdb_model.go index 1f373b58a..dbbb641e7 100644 --- a/g/database/gdb/gdb_model.go +++ b/database/gdb/gdb_model.go @@ -12,7 +12,7 @@ import ( "fmt" "reflect" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/util/gconv" ) // 数据库链式操作模型对象 diff --git a/g/database/gdb/gdb_mssql.go b/database/gdb/gdb_mssql.go similarity index 99% rename from g/database/gdb/gdb_mssql.go rename to database/gdb/gdb_mssql.go index 9d8f1ad0f..9af5ef5e3 100644 --- a/g/database/gdb/gdb_mssql.go +++ b/database/gdb/gdb_mssql.go @@ -17,7 +17,7 @@ import ( "strconv" "strings" - "github.com/gogf/gf/g/text/gregex" + "github.com/gogf/gf/text/gregex" ) // 数据库链接对象 diff --git a/g/database/gdb/gdb_mysql.go b/database/gdb/gdb_mysql.go similarity index 93% rename from g/database/gdb/gdb_mysql.go rename to database/gdb/gdb_mysql.go index aed23dc5c..0cfbfc8e3 100644 --- a/g/database/gdb/gdb_mysql.go +++ b/database/gdb/gdb_mysql.go @@ -9,7 +9,8 @@ package gdb import ( "database/sql" "fmt" - _ "github.com/gogf/gf/third/github.com/gf-third/mysql" + + _ "github.com/gogf/gf/internal/thirdparty/github.com/gf-third/mysql" ) // 数据库链接对象 diff --git a/g/database/gdb/gdb_oracle.go b/database/gdb/gdb_oracle.go similarity index 99% rename from g/database/gdb/gdb_oracle.go rename to database/gdb/gdb_oracle.go index b17324555..456085cfe 100644 --- a/g/database/gdb/gdb_oracle.go +++ b/database/gdb/gdb_oracle.go @@ -16,7 +16,7 @@ import ( "strconv" "strings" - "github.com/gogf/gf/g/text/gregex" + "github.com/gogf/gf/text/gregex" ) // 数据库链接对象 diff --git a/g/database/gdb/gdb_pgsql.go b/database/gdb/gdb_pgsql.go similarity index 94% rename from g/database/gdb/gdb_pgsql.go rename to database/gdb/gdb_pgsql.go index 44a1c72e2..22c11dd47 100644 --- a/g/database/gdb/gdb_pgsql.go +++ b/database/gdb/gdb_pgsql.go @@ -10,14 +10,14 @@ import ( "database/sql" "fmt" - "github.com/gogf/gf/g/text/gregex" + "github.com/gogf/gf/text/gregex" ) // PostgreSQL的适配. // // 使用时需要import: // -// _ "github.com/gogf/gf/third/github.com/lib/pq" +// _ "github.com/gogf/gf/internal/thirdparty/github.com/lib/pq" // // @todo 需要完善replace和save的操作覆盖 diff --git a/g/database/gdb/gdb_sqlite.go b/database/gdb/gdb_sqlite.go similarity index 93% rename from g/database/gdb/gdb_sqlite.go rename to database/gdb/gdb_sqlite.go index e890c4ddf..97a3c683d 100644 --- a/g/database/gdb/gdb_sqlite.go +++ b/database/gdb/gdb_sqlite.go @@ -11,7 +11,7 @@ import ( ) // 使用时需要import: -// _ "github.com/gogf/gf/third/github.com/mattn/go-sqlite3" +// _ "github.com/gogf/gf/internal/thirdparty/github.com/mattn/go-sqlite3" // Sqlite接口对象 // @author wxkj diff --git a/g/database/gdb/gdb_structure.go b/database/gdb/gdb_structure.go similarity index 96% rename from g/database/gdb/gdb_structure.go rename to database/gdb/gdb_structure.go index c18c2fd51..3c3bffc85 100644 --- a/g/database/gdb/gdb_structure.go +++ b/database/gdb/gdb_structure.go @@ -10,10 +10,10 @@ import ( "fmt" "strings" - "github.com/gogf/gf/g/encoding/gbinary" + "github.com/gogf/gf/encoding/gbinary" - "github.com/gogf/gf/g/text/gregex" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/text/gregex" + "github.com/gogf/gf/util/gconv" ) //// 同步数据库表结构到内存中 diff --git a/g/database/gdb/gdb_transaction.go b/database/gdb/gdb_transaction.go similarity index 99% rename from g/database/gdb/gdb_transaction.go rename to database/gdb/gdb_transaction.go index 5cd896469..c047c5594 100644 --- a/g/database/gdb/gdb_transaction.go +++ b/database/gdb/gdb_transaction.go @@ -11,7 +11,7 @@ import ( "fmt" "reflect" - "github.com/gogf/gf/g/text/gregex" + "github.com/gogf/gf/text/gregex" ) // 数据库事务对象 diff --git a/g/database/gdb/gdb_type_record.go b/database/gdb/gdb_type_record.go similarity index 96% rename from g/database/gdb/gdb_type_record.go rename to database/gdb/gdb_type_record.go index 27f4e3a3c..82a6ddedf 100644 --- a/g/database/gdb/gdb_type_record.go +++ b/database/gdb/gdb_type_record.go @@ -9,7 +9,7 @@ package gdb import ( "database/sql" - "github.com/gogf/gf/g/encoding/gparser" + "github.com/gogf/gf/encoding/gparser" ) // 将记录结果转换为JSON字符串 diff --git a/g/database/gdb/gdb_type_result.go b/database/gdb/gdb_type_result.go similarity index 98% rename from g/database/gdb/gdb_type_result.go rename to database/gdb/gdb_type_result.go index 91854d043..86e11c51c 100644 --- a/g/database/gdb/gdb_type_result.go +++ b/database/gdb/gdb_type_result.go @@ -11,7 +11,7 @@ import ( "fmt" "reflect" - "github.com/gogf/gf/g/encoding/gparser" + "github.com/gogf/gf/encoding/gparser" ) // 将结果集转换为JSON字符串 diff --git a/g/database/gdb/gdb_unit_init_test.go b/database/gdb/gdb_unit_init_test.go similarity index 95% rename from g/database/gdb/gdb_unit_init_test.go rename to database/gdb/gdb_unit_init_test.go index d7a8fe759..359ebf47b 100644 --- a/g/database/gdb/gdb_unit_init_test.go +++ b/database/gdb/gdb_unit_init_test.go @@ -10,12 +10,12 @@ import ( "fmt" "os" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/container/garray" + "github.com/gogf/gf/container/garray" + "github.com/gogf/gf/frame/g" - "github.com/gogf/gf/g/database/gdb" - "github.com/gogf/gf/g/os/gtime" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/database/gdb" + "github.com/gogf/gf/os/gtime" + "github.com/gogf/gf/test/gtest" ) const ( diff --git a/g/database/gdb/gdb_unit_types_test.go b/database/gdb/gdb_unit_types_test.go similarity index 96% rename from g/database/gdb/gdb_unit_types_test.go rename to database/gdb/gdb_unit_types_test.go index df9b8d4e6..ff29a5627 100644 --- a/g/database/gdb/gdb_unit_types_test.go +++ b/database/gdb/gdb_unit_types_test.go @@ -10,9 +10,9 @@ import ( "fmt" "testing" - "github.com/gogf/gf/g" + "github.com/gogf/gf/frame/g" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/test/gtest" ) func Test_Types(t *testing.T) { diff --git a/g/database/gdb/gdb_unit_z_basic_test.go b/database/gdb/gdb_unit_z_basic_test.go similarity index 89% rename from g/database/gdb/gdb_unit_z_basic_test.go rename to database/gdb/gdb_unit_z_basic_test.go index 3a28160f8..01902497a 100644 --- a/g/database/gdb/gdb_unit_z_basic_test.go +++ b/database/gdb/gdb_unit_z_basic_test.go @@ -9,8 +9,8 @@ package gdb_test import ( "testing" - "github.com/gogf/gf/g/database/gdb" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/database/gdb" + "github.com/gogf/gf/test/gtest" ) func Test_Instance(t *testing.T) { diff --git a/g/database/gdb/gdb_unit_z_method_test.go b/database/gdb/gdb_unit_z_method_test.go similarity index 99% rename from g/database/gdb/gdb_unit_z_method_test.go rename to database/gdb/gdb_unit_z_method_test.go index 0cf089f9c..ddaf4f388 100644 --- a/g/database/gdb/gdb_unit_z_method_test.go +++ b/database/gdb/gdb_unit_z_method_test.go @@ -11,9 +11,9 @@ import ( "testing" "time" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/os/gtime" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/os/gtime" + "github.com/gogf/gf/test/gtest" ) func Test_DB_Ping(t *testing.T) { diff --git a/g/database/gdb/gdb_unit_z_model_test.go b/database/gdb/gdb_unit_z_model_test.go similarity index 99% rename from g/database/gdb/gdb_unit_z_model_test.go rename to database/gdb/gdb_unit_z_model_test.go index d74ff5354..f331f8f02 100644 --- a/g/database/gdb/gdb_unit_z_model_test.go +++ b/database/gdb/gdb_unit_z_model_test.go @@ -11,9 +11,9 @@ import ( "fmt" "testing" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/os/gtime" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/os/gtime" + "github.com/gogf/gf/test/gtest" ) func Test_Model_Insert(t *testing.T) { diff --git a/g/database/gdb/gdb_unit_z_struct_test.go b/database/gdb/gdb_unit_z_struct_test.go similarity index 96% rename from g/database/gdb/gdb_unit_z_struct_test.go rename to database/gdb/gdb_unit_z_struct_test.go index 6d27b560e..e116d00b4 100644 --- a/g/database/gdb/gdb_unit_z_struct_test.go +++ b/database/gdb/gdb_unit_z_struct_test.go @@ -9,9 +9,9 @@ package gdb_test import ( "testing" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/os/gtime" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/os/gtime" + "github.com/gogf/gf/test/gtest" ) func Test_Model_Inherit_Insert(t *testing.T) { diff --git a/g/database/gdb/gdb_unit_z_transaction_test.go b/database/gdb/gdb_unit_z_transaction_test.go similarity index 99% rename from g/database/gdb/gdb_unit_z_transaction_test.go rename to database/gdb/gdb_unit_z_transaction_test.go index 27d7c67b1..f532819d3 100644 --- a/g/database/gdb/gdb_unit_z_transaction_test.go +++ b/database/gdb/gdb_unit_z_transaction_test.go @@ -10,9 +10,9 @@ import ( "fmt" "testing" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/os/gtime" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/os/gtime" + "github.com/gogf/gf/test/gtest" ) func Test_TX_Query(t *testing.T) { diff --git a/g/database/gredis/gredis.go b/database/gredis/gredis.go similarity index 97% rename from g/database/gredis/gredis.go rename to database/gredis/gredis.go index 9250a1328..7bab16969 100644 --- a/g/database/gredis/gredis.go +++ b/database/gredis/gredis.go @@ -15,10 +15,11 @@ package gredis import ( "fmt" - "github.com/gogf/gf/g/container/gmap" - "github.com/gogf/gf/g/container/gvar" - "github.com/gogf/gf/third/github.com/gomodule/redigo/redis" "time" + + "github.com/gogf/gf/container/gmap" + "github.com/gogf/gf/container/gvar" + "github.com/gogf/gf/internal/thirdparty/github.com/gomodule/redigo/redis" ) const ( diff --git a/g/database/gredis/gredis_config.go b/database/gredis/gredis_config.go similarity index 97% rename from g/database/gredis/gredis_config.go rename to database/gredis/gredis_config.go index bb17c6477..79a56706b 100644 --- a/g/database/gredis/gredis_config.go +++ b/database/gredis/gredis_config.go @@ -6,7 +6,7 @@ package gredis -import "github.com/gogf/gf/g/container/gmap" +import "github.com/gogf/gf/container/gmap" const ( // Default configuration group name. diff --git a/g/database/gredis/gredis_conn.go b/database/gredis/gredis_conn.go similarity index 93% rename from g/database/gredis/gredis_conn.go rename to database/gredis/gredis_conn.go index 121bf2749..3d4688c69 100644 --- a/g/database/gredis/gredis_conn.go +++ b/database/gredis/gredis_conn.go @@ -6,7 +6,7 @@ package gredis -import "github.com/gogf/gf/g/container/gvar" +import "github.com/gogf/gf/container/gvar" // DoVar returns value from Do as gvar.Var. func (c *Conn) DoVar(command string, args ...interface{}) (*gvar.Var, error) { diff --git a/g/database/gredis/gredis_unit_test.go b/database/gredis/gredis_unit_test.go similarity index 96% rename from g/database/gredis/gredis_unit_test.go rename to database/gredis/gredis_unit_test.go index c58bed430..5d48765fc 100644 --- a/g/database/gredis/gredis_unit_test.go +++ b/database/gredis/gredis_unit_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "github.com/gogf/gf/g/database/gredis" - "github.com/gogf/gf/g/test/gtest" - redis2 "github.com/gogf/gf/third/github.com/gomodule/redigo/redis" + "github.com/gogf/gf/database/gredis" + redis2 "github.com/gogf/gf/internal/thirdparty/github.com/gomodule/redigo/redis" + "github.com/gogf/gf/test/gtest" ) var ( diff --git a/g/encoding/gbase64/gbase64.go b/encoding/gbase64/gbase64.go similarity index 100% rename from g/encoding/gbase64/gbase64.go rename to encoding/gbase64/gbase64.go diff --git a/g/encoding/gbase64/gbase64_test.go b/encoding/gbase64/gbase64_test.go similarity index 94% rename from g/encoding/gbase64/gbase64_test.go rename to encoding/gbase64/gbase64_test.go index 5e6cb4e91..0c3c418c4 100644 --- a/g/encoding/gbase64/gbase64_test.go +++ b/encoding/gbase64/gbase64_test.go @@ -8,8 +8,8 @@ package gbase64_test import ( "testing" - "github.com/gogf/gf/g/encoding/gbase64" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/encoding/gbase64" + "github.com/gogf/gf/test/gtest" ) type testpair struct { diff --git a/g/encoding/gbinary/gbinary.go b/encoding/gbinary/gbinary.go similarity index 100% rename from g/encoding/gbinary/gbinary.go rename to encoding/gbinary/gbinary.go diff --git a/g/encoding/gbinary/gbinary_be.go b/encoding/gbinary/gbinary_be.go similarity index 100% rename from g/encoding/gbinary/gbinary_be.go rename to encoding/gbinary/gbinary_be.go diff --git a/g/encoding/gbinary/gbinary_bits.go b/encoding/gbinary/gbinary_bits.go similarity index 100% rename from g/encoding/gbinary/gbinary_bits.go rename to encoding/gbinary/gbinary_bits.go diff --git a/g/encoding/gbinary/gbinary_func.go b/encoding/gbinary/gbinary_func.go similarity index 100% rename from g/encoding/gbinary/gbinary_func.go rename to encoding/gbinary/gbinary_func.go diff --git a/g/encoding/gbinary/gbinary_le.go b/encoding/gbinary/gbinary_le.go similarity index 100% rename from g/encoding/gbinary/gbinary_le.go rename to encoding/gbinary/gbinary_le.go diff --git a/g/encoding/gbinary/gbinary_z_be_test.go b/encoding/gbinary/gbinary_z_be_test.go similarity index 97% rename from g/encoding/gbinary/gbinary_z_be_test.go rename to encoding/gbinary/gbinary_z_be_test.go index 4eccc3324..806ca4b3a 100644 --- a/g/encoding/gbinary/gbinary_z_be_test.go +++ b/encoding/gbinary/gbinary_z_be_test.go @@ -9,8 +9,8 @@ package gbinary_test import ( "testing" - "github.com/gogf/gf/g/encoding/gbinary" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/encoding/gbinary" + "github.com/gogf/gf/test/gtest" ) func Test_BeEncodeAndBeDecode(t *testing.T) { diff --git a/g/encoding/gbinary/gbinary_z_le_test.go b/encoding/gbinary/gbinary_z_le_test.go similarity index 97% rename from g/encoding/gbinary/gbinary_z_le_test.go rename to encoding/gbinary/gbinary_z_le_test.go index f5c81ff57..71215197e 100644 --- a/g/encoding/gbinary/gbinary_z_le_test.go +++ b/encoding/gbinary/gbinary_z_le_test.go @@ -9,8 +9,8 @@ package gbinary_test import ( "testing" - "github.com/gogf/gf/g/encoding/gbinary" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/encoding/gbinary" + "github.com/gogf/gf/test/gtest" ) func Test_LeEncodeAndLeDecode(t *testing.T) { diff --git a/g/encoding/gbinary/gbinary_z_test.go b/encoding/gbinary/gbinary_z_test.go similarity index 97% rename from g/encoding/gbinary/gbinary_z_test.go rename to encoding/gbinary/gbinary_z_test.go index 1a6fc2c0c..77cbb8ae7 100644 --- a/g/encoding/gbinary/gbinary_z_test.go +++ b/encoding/gbinary/gbinary_z_test.go @@ -10,8 +10,8 @@ import ( "math" "testing" - "github.com/gogf/gf/g/encoding/gbinary" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/encoding/gbinary" + "github.com/gogf/gf/test/gtest" ) type User struct { diff --git a/g/encoding/gcharset/gcharset.go b/encoding/gcharset/gcharset.go similarity index 93% rename from g/encoding/gcharset/gcharset.go rename to encoding/gcharset/gcharset.go index 6210e6b45..b6e023323 100644 --- a/g/encoding/gcharset/gcharset.go +++ b/encoding/gcharset/gcharset.go @@ -23,10 +23,11 @@ import ( "bytes" "errors" "fmt" - "github.com/gogf/gf/third/golang.org/x/text/encoding" - "github.com/gogf/gf/third/golang.org/x/text/encoding/ianaindex" - "github.com/gogf/gf/third/golang.org/x/text/transform" "io/ioutil" + + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/ianaindex" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/transform" ) var ( diff --git a/g/encoding/gcharset/gcharset_test.go b/encoding/gcharset/gcharset_test.go similarity index 98% rename from g/encoding/gcharset/gcharset_test.go rename to encoding/gcharset/gcharset_test.go index c02ce6dd4..fae9e6c12 100644 --- a/g/encoding/gcharset/gcharset_test.go +++ b/encoding/gcharset/gcharset_test.go @@ -7,9 +7,10 @@ package gcharset_test import ( - "github.com/gogf/gf/g/encoding/gcharset" - "github.com/gogf/gf/g/test/gtest" "testing" + + "github.com/gogf/gf/encoding/gcharset" + "github.com/gogf/gf/test/gtest" ) var testData = []struct { diff --git a/g/encoding/gcompress/gcompress.go b/encoding/gcompress/gcompress.go similarity index 100% rename from g/encoding/gcompress/gcompress.go rename to encoding/gcompress/gcompress.go diff --git a/g/encoding/gcompress/gcompress_file.go b/encoding/gcompress/gcompress_file.go similarity index 98% rename from g/encoding/gcompress/gcompress_file.go rename to encoding/gcompress/gcompress_file.go index ea556bdfe..fac5016e8 100644 --- a/g/encoding/gcompress/gcompress_file.go +++ b/encoding/gcompress/gcompress_file.go @@ -9,11 +9,12 @@ package gcompress import ( "archive/zip" "bytes" - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/text/gstr" "io" "os" "path/filepath" + + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/text/gstr" ) // Zip compresses to using zip compressing algorithm. diff --git a/g/encoding/gcompress/gcompress_test.go b/encoding/gcompress/gcompress_test.go similarity index 94% rename from g/encoding/gcompress/gcompress_test.go rename to encoding/gcompress/gcompress_test.go index 31f161649..1b563f716 100644 --- a/g/encoding/gcompress/gcompress_test.go +++ b/encoding/gcompress/gcompress_test.go @@ -9,8 +9,8 @@ package gcompress_test import ( "testing" - "github.com/gogf/gf/g/encoding/gcompress" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/encoding/gcompress" + "github.com/gogf/gf/test/gtest" ) func TestZlib(t *testing.T) { diff --git a/g/encoding/ghash/ghash.go b/encoding/ghash/ghash.go similarity index 100% rename from g/encoding/ghash/ghash.go rename to encoding/ghash/ghash.go diff --git a/g/encoding/ghash/ghash_test.go b/encoding/ghash/ghash_test.go similarity index 98% rename from g/encoding/ghash/ghash_test.go rename to encoding/ghash/ghash_test.go index 4fda1968e..bb91711e8 100644 --- a/g/encoding/ghash/ghash_test.go +++ b/encoding/ghash/ghash_test.go @@ -9,8 +9,9 @@ package ghash_test import ( - "github.com/gogf/gf/g/encoding/ghash" "testing" + + "github.com/gogf/gf/encoding/ghash" ) var ( diff --git a/g/encoding/ghash/ghash_z_unit_basic_test.go b/encoding/ghash/ghash_z_unit_basic_test.go similarity index 97% rename from g/encoding/ghash/ghash_z_unit_basic_test.go rename to encoding/ghash/ghash_z_unit_basic_test.go index 903e71def..e1d8ec908 100755 --- a/g/encoding/ghash/ghash_z_unit_basic_test.go +++ b/encoding/ghash/ghash_z_unit_basic_test.go @@ -3,8 +3,8 @@ package ghash_test import ( "testing" - "github.com/gogf/gf/g/encoding/ghash" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/encoding/ghash" + "github.com/gogf/gf/test/gtest" ) var ( diff --git a/g/encoding/ghtml/ghtml.go b/encoding/ghtml/ghtml.go similarity index 95% rename from g/encoding/ghtml/ghtml.go rename to encoding/ghtml/ghtml.go index acc7dd923..ddfcde869 100644 --- a/g/encoding/ghtml/ghtml.go +++ b/encoding/ghtml/ghtml.go @@ -10,9 +10,10 @@ package ghtml import ( - "github.com/gogf/gf/third/github.com/grokify/html-strip-tags-go" "html" "strings" + + "github.com/gogf/gf/internal/thirdparty/github.com/grokify/html-strip-tags-go" ) // 过滤掉HTML标签，只返回text内容 diff --git a/g/encoding/ghtml/ghtml_test.go b/encoding/ghtml/ghtml_test.go similarity index 92% rename from g/encoding/ghtml/ghtml_test.go rename to encoding/ghtml/ghtml_test.go index f88f5d0a1..5ebf2bada 100644 --- a/g/encoding/ghtml/ghtml_test.go +++ b/encoding/ghtml/ghtml_test.go @@ -6,9 +6,10 @@ package ghtml_test import ( - "github.com/gogf/gf/g/encoding/ghtml" - "github.com/gogf/gf/g/test/gtest" "testing" + + "github.com/gogf/gf/encoding/ghtml" + "github.com/gogf/gf/test/gtest" ) func TestStripTags(t *testing.T) { diff --git a/g/encoding/gjson/gjson.go b/encoding/gjson/gjson.go similarity index 98% rename from g/encoding/gjson/gjson.go rename to encoding/gjson/gjson.go index 7ad9a8a64..ae962bf41 100644 --- a/g/encoding/gjson/gjson.go +++ b/encoding/gjson/gjson.go @@ -12,9 +12,9 @@ import ( "strconv" "strings" - "github.com/gogf/gf/g/internal/rwmutex" - "github.com/gogf/gf/g/text/gstr" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/internal/rwmutex" + "github.com/gogf/gf/text/gstr" + "github.com/gogf/gf/util/gconv" ) const ( diff --git a/g/encoding/gjson/gjson_api.go b/encoding/gjson/gjson_api.go similarity index 98% rename from g/encoding/gjson/gjson_api.go rename to encoding/gjson/gjson_api.go index 7d57a00c9..f50fbda44 100644 --- a/g/encoding/gjson/gjson_api.go +++ b/encoding/gjson/gjson_api.go @@ -10,11 +10,11 @@ import ( "fmt" "time" - "github.com/gogf/gf/g/util/gutil" + "github.com/gogf/gf/util/gutil" - "github.com/gogf/gf/g/container/gvar" - "github.com/gogf/gf/g/os/gtime" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/container/gvar" + "github.com/gogf/gf/os/gtime" + "github.com/gogf/gf/util/gconv" ) // Val returns the json value. diff --git a/g/encoding/gjson/gjson_api_config.go b/encoding/gjson/gjson_api_config.go similarity index 100% rename from g/encoding/gjson/gjson_api_config.go rename to encoding/gjson/gjson_api_config.go diff --git a/g/encoding/gjson/gjson_api_encoding.go b/encoding/gjson/gjson_api_encoding.go similarity index 93% rename from g/encoding/gjson/gjson_api_encoding.go rename to encoding/gjson/gjson_api_encoding.go index faf9c8bef..bbce2cf8f 100644 --- a/g/encoding/gjson/gjson_api_encoding.go +++ b/encoding/gjson/gjson_api_encoding.go @@ -8,9 +8,10 @@ package gjson import ( "encoding/json" - "github.com/gogf/gf/g/encoding/gtoml" - "github.com/gogf/gf/g/encoding/gxml" - "github.com/gogf/gf/g/encoding/gyaml" + + "github.com/gogf/gf/encoding/gtoml" + "github.com/gogf/gf/encoding/gxml" + "github.com/gogf/gf/encoding/gyaml" ) func (j *Json) ToXml(rootTag ...string) ([]byte, error) { diff --git a/g/encoding/gjson/gjson_api_new_load.go b/encoding/gjson/gjson_api_new_load.go similarity index 94% rename from g/encoding/gjson/gjson_api_new_load.go rename to encoding/gjson/gjson_api_new_load.go index e929154f1..0746cc34d 100644 --- a/g/encoding/gjson/gjson_api_new_load.go +++ b/encoding/gjson/gjson_api_new_load.go @@ -14,15 +14,15 @@ import ( "fmt" "reflect" - "github.com/gogf/gf/g/os/gfile" + "github.com/gogf/gf/os/gfile" - "github.com/gogf/gf/g/encoding/gtoml" - "github.com/gogf/gf/g/encoding/gxml" - "github.com/gogf/gf/g/encoding/gyaml" - "github.com/gogf/gf/g/internal/rwmutex" - "github.com/gogf/gf/g/os/gfcache" - "github.com/gogf/gf/g/text/gregex" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/encoding/gtoml" + "github.com/gogf/gf/encoding/gxml" + "github.com/gogf/gf/encoding/gyaml" + "github.com/gogf/gf/internal/rwmutex" + "github.com/gogf/gf/os/gfcache" + "github.com/gogf/gf/text/gregex" + "github.com/gogf/gf/util/gconv" ) // New creates a Json object with any variable type of , @@ -127,7 +127,7 @@ func Load(path string, safe ...bool) (*Json, error) { return nil, err } else { path = p - } + } return doLoadContent(gfile.Ext(path), gfcache.GetBinContents(path), safe...) } diff --git a/g/encoding/gjson/gjson_z_bench_test.go b/encoding/gjson/gjson_z_bench_test.go similarity index 94% rename from g/encoding/gjson/gjson_z_bench_test.go rename to encoding/gjson/gjson_z_bench_test.go index 888340bb3..6496fc657 100644 --- a/g/encoding/gjson/gjson_z_bench_test.go +++ b/encoding/gjson/gjson_z_bench_test.go @@ -7,8 +7,9 @@ package gjson_test import ( - "github.com/gogf/gf/g/encoding/gjson" "testing" + + "github.com/gogf/gf/encoding/gjson" ) func Benchmark_Set1(b *testing.B) { diff --git a/g/encoding/gjson/gjson_z_unit_basic_test.go b/encoding/gjson/gjson_z_unit_basic_test.go similarity index 99% rename from g/encoding/gjson/gjson_z_unit_basic_test.go rename to encoding/gjson/gjson_z_unit_basic_test.go index f9fe51b4a..071fbb3ae 100644 --- a/g/encoding/gjson/gjson_z_unit_basic_test.go +++ b/encoding/gjson/gjson_z_unit_basic_test.go @@ -9,9 +9,9 @@ package gjson_test import ( "testing" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/encoding/gjson" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/encoding/gjson" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/test/gtest" ) func Test_New(t *testing.T) { diff --git a/g/encoding/gjson/gjson_z_unit_load_test.go b/encoding/gjson/gjson_z_unit_load_test.go similarity index 97% rename from g/encoding/gjson/gjson_z_unit_load_test.go rename to encoding/gjson/gjson_z_unit_load_test.go index f411c4ae2..7271da4f2 100644 --- a/g/encoding/gjson/gjson_z_unit_load_test.go +++ b/encoding/gjson/gjson_z_unit_load_test.go @@ -9,10 +9,10 @@ package gjson_test import ( "testing" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/encoding/gjson" - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/encoding/gjson" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/test/gtest" ) func Test_Load_JSON(t *testing.T) { diff --git a/g/encoding/gjson/gjson_z_unit_set_test.go b/encoding/gjson/gjson_z_unit_set_test.go similarity index 99% rename from g/encoding/gjson/gjson_z_unit_set_test.go rename to encoding/gjson/gjson_z_unit_set_test.go index 86b75b42f..2ed5eae15 100644 --- a/g/encoding/gjson/gjson_z_unit_set_test.go +++ b/encoding/gjson/gjson_z_unit_set_test.go @@ -8,8 +8,9 @@ package gjson_test import ( "bytes" - "github.com/gogf/gf/g/encoding/gjson" "testing" + + "github.com/gogf/gf/encoding/gjson" ) func Test_Set1(t *testing.T) { diff --git a/g/encoding/gparser/gparser.go b/encoding/gparser/gparser.go similarity index 92% rename from g/encoding/gparser/gparser.go rename to encoding/gparser/gparser.go index 3a33e5860..ff7f2738b 100644 --- a/g/encoding/gparser/gparser.go +++ b/encoding/gparser/gparser.go @@ -8,7 +8,7 @@ package gparser import ( - "github.com/gogf/gf/g/encoding/gjson" + "github.com/gogf/gf/encoding/gjson" ) // Parser is actually alias of gjson.Json. diff --git a/g/encoding/gparser/gparser_api_encoding.go b/encoding/gparser/gparser_api_encoding.go similarity index 100% rename from g/encoding/gparser/gparser_api_encoding.go rename to encoding/gparser/gparser_api_encoding.go diff --git a/g/encoding/gparser/gparser_api_new_load.go b/encoding/gparser/gparser_api_new_load.go similarity index 97% rename from g/encoding/gparser/gparser_api_new_load.go rename to encoding/gparser/gparser_api_new_load.go index 1b78d679b..b582c2c8a 100644 --- a/g/encoding/gparser/gparser_api_new_load.go +++ b/encoding/gparser/gparser_api_new_load.go @@ -7,7 +7,7 @@ package gparser import ( - "github.com/gogf/gf/g/encoding/gjson" + "github.com/gogf/gf/encoding/gjson" ) // New creates a Parser object with any variable type of , diff --git a/g/encoding/gparser/gparser_unit_basic_test.go b/encoding/gparser/gparser_unit_basic_test.go similarity index 98% rename from g/encoding/gparser/gparser_unit_basic_test.go rename to encoding/gparser/gparser_unit_basic_test.go index e8384c1f0..8e57725e6 100644 --- a/g/encoding/gparser/gparser_unit_basic_test.go +++ b/encoding/gparser/gparser_unit_basic_test.go @@ -9,9 +9,9 @@ package gparser_test import ( "testing" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/encoding/gparser" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/encoding/gparser" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/test/gtest" ) func Test_New(t *testing.T) { diff --git a/g/encoding/gparser/gparser_unit_load_test.go b/encoding/gparser/gparser_unit_load_test.go similarity index 97% rename from g/encoding/gparser/gparser_unit_load_test.go rename to encoding/gparser/gparser_unit_load_test.go index 4f15e667a..649b4a80d 100644 --- a/g/encoding/gparser/gparser_unit_load_test.go +++ b/encoding/gparser/gparser_unit_load_test.go @@ -10,10 +10,10 @@ import ( "io/ioutil" "testing" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/encoding/gparser" - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/encoding/gparser" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/test/gtest" ) func Test_Load_JSON(t *testing.T) { diff --git a/g/encoding/gparser/gparser_unit_set_test.go b/encoding/gparser/gparser_unit_set_test.go similarity index 99% rename from g/encoding/gparser/gparser_unit_set_test.go rename to encoding/gparser/gparser_unit_set_test.go index b8af6fdd5..777b496c1 100644 --- a/g/encoding/gparser/gparser_unit_set_test.go +++ b/encoding/gparser/gparser_unit_set_test.go @@ -8,8 +8,9 @@ package gparser_test import ( "bytes" - "github.com/gogf/gf/g/encoding/gparser" "testing" + + "github.com/gogf/gf/encoding/gparser" ) func Test_Set1(t *testing.T) { diff --git a/g/encoding/gtoml/gtoml.go b/encoding/gtoml/gtoml.go similarity index 93% rename from g/encoding/gtoml/gtoml.go rename to encoding/gtoml/gtoml.go index 9598850c0..72e814882 100644 --- a/g/encoding/gtoml/gtoml.go +++ b/encoding/gtoml/gtoml.go @@ -10,7 +10,8 @@ package gtoml import ( "bytes" "encoding/json" - "github.com/gogf/gf/third/github.com/BurntSushi/toml" + + "github.com/gogf/gf/internal/thirdparty/github.com/BurntSushi/toml" ) func Encode(v interface{}) ([]byte, error) { diff --git a/g/encoding/gtoml/gtoml_test.go b/encoding/gtoml/gtoml_test.go similarity index 96% rename from g/encoding/gtoml/gtoml_test.go rename to encoding/gtoml/gtoml_test.go index 4399c78c0..345320c06 100644 --- a/g/encoding/gtoml/gtoml_test.go +++ b/encoding/gtoml/gtoml_test.go @@ -6,10 +6,11 @@ package gtoml_test import ( - "github.com/gogf/gf/g/encoding/gparser" - "github.com/gogf/gf/g/encoding/gtoml" - "github.com/gogf/gf/g/test/gtest" "testing" + + "github.com/gogf/gf/encoding/gparser" + "github.com/gogf/gf/encoding/gtoml" + "github.com/gogf/gf/test/gtest" ) var tomlStr string = ` diff --git a/g/encoding/gurl/url.go b/encoding/gurl/url.go similarity index 100% rename from g/encoding/gurl/url.go rename to encoding/gurl/url.go diff --git a/g/encoding/gurl/url_test.go b/encoding/gurl/url_test.go similarity index 96% rename from g/encoding/gurl/url_test.go rename to encoding/gurl/url_test.go index 65205e753..889fc3a40 100644 --- a/g/encoding/gurl/url_test.go +++ b/encoding/gurl/url_test.go @@ -6,10 +6,11 @@ package gurl_test import ( - "github.com/gogf/gf/g/encoding/gurl" - "github.com/gogf/gf/g/test/gtest" "net/url" "testing" + + "github.com/gogf/gf/encoding/gurl" + "github.com/gogf/gf/test/gtest" ) var urlStr string = `https://golang.org/x/crypto?go-get=1 +` diff --git a/g/encoding/gxml/gxml.go b/encoding/gxml/gxml.go similarity index 92% rename from g/encoding/gxml/gxml.go rename to encoding/gxml/gxml.go index b9fd1823f..eddce43ad 100644 --- a/g/encoding/gxml/gxml.go +++ b/encoding/gxml/gxml.go @@ -9,10 +9,11 @@ package gxml import ( "fmt" - "github.com/gogf/gf/g/encoding/gcharset" - "github.com/gogf/gf/g/text/gregex" - "github.com/gogf/gf/third/github.com/clbanning/mxj" "strings" + + "github.com/gogf/gf/encoding/gcharset" + "github.com/gogf/gf/internal/thirdparty/github.com/clbanning/mxj" + "github.com/gogf/gf/text/gregex" ) // 将XML内容解析为map变量 diff --git a/g/encoding/gxml/gxml_test.go b/encoding/gxml/gxml_test.go similarity index 96% rename from g/encoding/gxml/gxml_test.go rename to encoding/gxml/gxml_test.go index df4b668f4..5fb7a4ffc 100644 --- a/g/encoding/gxml/gxml_test.go +++ b/encoding/gxml/gxml_test.go @@ -8,12 +8,13 @@ package gxml_test import ( "bytes" - "github.com/gogf/gf/g/encoding/gcharset" - "github.com/gogf/gf/g/encoding/gparser" - "github.com/gogf/gf/g/encoding/gxml" - "github.com/gogf/gf/g/test/gtest" "strings" "testing" + + "github.com/gogf/gf/encoding/gcharset" + "github.com/gogf/gf/encoding/gparser" + "github.com/gogf/gf/encoding/gxml" + "github.com/gogf/gf/test/gtest" ) var testData = []struct { diff --git a/g/encoding/gyaml/gyaml.go b/encoding/gyaml/gyaml.go similarity index 91% rename from g/encoding/gyaml/gyaml.go rename to encoding/gyaml/gyaml.go index bc36c2cfc..4adbb4868 100644 --- a/g/encoding/gyaml/gyaml.go +++ b/encoding/gyaml/gyaml.go @@ -7,7 +7,7 @@ // Package gyaml provides accessing and converting for YAML content. package gyaml -import "github.com/gogf/gf/third/github.com/ghodss/yaml" +import "github.com/gogf/gf/internal/thirdparty/github.com/ghodss/yaml" func Encode(v interface{}) ([]byte, error) { return yaml.Marshal(v) diff --git a/g/encoding/gyaml/gyaml_test.go b/encoding/gyaml/gyaml_test.go similarity index 96% rename from g/encoding/gyaml/gyaml_test.go rename to encoding/gyaml/gyaml_test.go index f5750d56a..be999fb6f 100644 --- a/g/encoding/gyaml/gyaml_test.go +++ b/encoding/gyaml/gyaml_test.go @@ -6,10 +6,11 @@ package gyaml_test import ( - "github.com/gogf/gf/g/encoding/gparser" - "github.com/gogf/gf/g/encoding/gyaml" - "github.com/gogf/gf/g/test/gtest" "testing" + + "github.com/gogf/gf/encoding/gparser" + "github.com/gogf/gf/encoding/gyaml" + "github.com/gogf/gf/test/gtest" ) var yamlStr string = ` diff --git a/g/errors/gerror/gerror.go b/errors/gerror/gerror.go similarity index 98% rename from g/errors/gerror/gerror.go rename to errors/gerror/gerror.go index b667dab04..ebc241c3c 100644 --- a/g/errors/gerror/gerror.go +++ b/errors/gerror/gerror.go @@ -10,7 +10,7 @@ package gerror import ( "fmt" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/util/gconv" ) type ApiStack interface { diff --git a/g/errors/gerror/gerror_error.go b/errors/gerror/gerror_error.go similarity index 98% rename from g/errors/gerror/gerror_error.go rename to errors/gerror/gerror_error.go index 0eee12355..412df8d7f 100644 --- a/g/errors/gerror/gerror_error.go +++ b/errors/gerror/gerror_error.go @@ -22,7 +22,7 @@ type Error struct { } const ( - gFILTER_KEY = "/g/errors/gerror/gerror" + gFILTER_KEY = "/gf/errors/gerror/gerror" ) var ( diff --git a/g/errors/gerror/gerror_stack.go b/errors/gerror/gerror_stack.go similarity index 100% rename from g/errors/gerror/gerror_stack.go rename to errors/gerror/gerror_stack.go diff --git a/g/errors/gerror/gerror_test.go b/errors/gerror/gerror_test.go similarity index 97% rename from g/errors/gerror/gerror_test.go rename to errors/gerror/gerror_test.go index e1a040f33..4f8598f36 100644 --- a/g/errors/gerror/gerror_test.go +++ b/errors/gerror/gerror_test.go @@ -11,8 +11,8 @@ import ( "fmt" "testing" - "github.com/gogf/gf/g/errors/gerror" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/errors/gerror" + "github.com/gogf/gf/test/gtest" ) func interfaceNil() interface{} { diff --git a/geg/container/garray/array_unique.go b/example/container/garray/array_unique.go similarity index 100% rename from geg/container/garray/array_unique.go rename to example/container/garray/array_unique.go diff --git a/geg/container/garray/garray1.go b/example/container/garray/garray1.go similarity index 96% rename from geg/container/garray/garray1.go rename to example/container/garray/garray1.go index 03dca3879..86eaf6ba3 100644 --- a/geg/container/garray/garray1.go +++ b/example/container/garray/garray1.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g/container/garray" + + "github.com/gogf/gf/container/garray" ) func main() { diff --git a/geg/container/garray/garray2.go b/example/container/garray/garray2.go similarity index 94% rename from geg/container/garray/garray2.go rename to example/container/garray/garray2.go index 521f45c1f..a1792551b 100644 --- a/geg/container/garray/garray2.go +++ b/example/container/garray/garray2.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g/container/garray" + + "github.com/gogf/gf/container/garray" ) func main() { diff --git a/geg/container/garray/garray_slice_safe.go b/example/container/garray/garray_slice_safe.go similarity index 67% rename from geg/container/garray/garray_slice_safe.go rename to example/container/garray/garray_slice_safe.go index 65d21a266..f9783c331 100644 --- a/geg/container/garray/garray_slice_safe.go +++ b/example/container/garray/garray_slice_safe.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/container/garray" + "github.com/gogf/gf/container/garray" + "github.com/gogf/gf/frame/g" ) func main() { diff --git a/geg/container/garray/sorted_string_array1.go b/example/container/garray/sorted_string_array1.go similarity index 78% rename from geg/container/garray/sorted_string_array1.go rename to example/container/garray/sorted_string_array1.go index 7692c43cd..0320922a2 100644 --- a/geg/container/garray/sorted_string_array1.go +++ b/example/container/garray/sorted_string_array1.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/container/garray" + "github.com/gogf/gf/container/garray" + "github.com/gogf/gf/frame/g" ) func main() { diff --git a/geg/container/garray/sorted_string_array2.go b/example/container/garray/sorted_string_array2.go similarity index 88% rename from geg/container/garray/sorted_string_array2.go rename to example/container/garray/sorted_string_array2.go index 8981dab07..de1f0ab33 100644 --- a/geg/container/garray/sorted_string_array2.go +++ b/example/container/garray/sorted_string_array2.go @@ -2,9 +2,10 @@ package main import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/container/garray" "strings" + + "github.com/gogf/gf/container/garray" + "github.com/gogf/gf/frame/g" ) func main() { diff --git a/geg/container/gmap/gmap.go b/example/container/gmap/gmap.go similarity index 97% rename from geg/container/gmap/gmap.go rename to example/container/gmap/gmap.go index 1f86e5c5e..82492e49f 100644 --- a/geg/container/gmap/gmap.go +++ b/example/container/gmap/gmap.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g/container/gmap" + + "github.com/gogf/gf/container/gmap" ) func main() { diff --git a/geg/container/gmap/gmap_json.go b/example/container/gmap/gmap_json.go similarity index 89% rename from geg/container/gmap/gmap_json.go rename to example/container/gmap/gmap_json.go index 233e204aa..51d147a5a 100644 --- a/geg/container/gmap/gmap_json.go +++ b/example/container/gmap/gmap_json.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "github.com/gogf/gf/g/container/gmap" + "github.com/gogf/gf/container/gmap" ) func main() { diff --git a/geg/container/gmap/gmap_map_safe.go b/example/container/gmap/gmap_map_safe.go similarity index 67% rename from geg/container/gmap/gmap_map_safe.go rename to example/container/gmap/gmap_map_safe.go index 63b8f2bf7..735416a43 100644 --- a/geg/container/gmap/gmap_map_safe.go +++ b/example/container/gmap/gmap_map_safe.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/container/gmap" + "github.com/gogf/gf/container/gmap" + "github.com/gogf/gf/frame/g" ) func main() { diff --git a/geg/container/gmap/gmap_order.go b/example/container/gmap/gmap_order.go similarity index 86% rename from geg/container/gmap/gmap_order.go rename to example/container/gmap/gmap_order.go index a5ac6e2cb..a3bf7e958 100644 --- a/geg/container/gmap/gmap_order.go +++ b/example/container/gmap/gmap_order.go @@ -2,9 +2,10 @@ package main import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/container/gmap" - "github.com/gogf/gf/g/util/gutil" + + "github.com/gogf/gf/container/gmap" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/util/gutil" ) func main() { diff --git a/geg/container/gmap/gmap_treemap.go b/example/container/gmap/gmap_treemap.go similarity index 93% rename from geg/container/gmap/gmap_treemap.go rename to example/container/gmap/gmap_treemap.go index f66a8006d..262dd1219 100644 --- a/geg/container/gmap/gmap_treemap.go +++ b/example/container/gmap/gmap_treemap.go @@ -2,8 +2,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g/container/gmap" - "github.com/gogf/gf/g/util/gutil" + + "github.com/gogf/gf/container/gmap" + "github.com/gogf/gf/util/gutil" ) func main() { diff --git a/geg/container/gmap/safe_map_delete.go b/example/container/gmap/safe_map_delete.go similarity index 100% rename from geg/container/gmap/safe_map_delete.go rename to example/container/gmap/safe_map_delete.go diff --git a/geg/container/gpool/gpool.go b/example/container/gpool/gpool.go similarity index 91% rename from geg/container/gpool/gpool.go rename to example/container/gpool/gpool.go index d8e84ecf3..e0e215e8f 100644 --- a/geg/container/gpool/gpool.go +++ b/example/container/gpool/gpool.go @@ -2,8 +2,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g/container/gpool" "time" + + "github.com/gogf/gf/container/gpool" ) func main() { diff --git a/geg/container/gpool/gpool_expirefunc.go b/example/container/gpool/gpool_expirefunc.go similarity index 85% rename from geg/container/gpool/gpool_expirefunc.go rename to example/container/gpool/gpool_expirefunc.go index f64c1baf2..39ced098f 100644 --- a/geg/container/gpool/gpool_expirefunc.go +++ b/example/container/gpool/gpool_expirefunc.go @@ -2,10 +2,11 @@ package main import ( "fmt" - "github.com/gogf/gf/g/container/gpool" - "github.com/gogf/gf/g/net/gtcp" - "github.com/gogf/gf/g/os/glog" "time" + + "github.com/gogf/gf/container/gpool" + "github.com/gogf/gf/net/gtcp" + "github.com/gogf/gf/os/glog" ) func main() { diff --git a/geg/container/gqueue/gqueue.go b/example/container/gqueue/gqueue.go similarity index 81% rename from geg/container/gqueue/gqueue.go rename to example/container/gqueue/gqueue.go index fd0be169b..85985128c 100644 --- a/geg/container/gqueue/gqueue.go +++ b/example/container/gqueue/gqueue.go @@ -2,10 +2,11 @@ package main import ( "fmt" - "github.com/gogf/gf/g/container/gqueue" - "github.com/gogf/gf/g/os/gtime" - "github.com/gogf/gf/g/os/gtimer" "time" + + "github.com/gogf/gf/container/gqueue" + "github.com/gogf/gf/os/gtime" + "github.com/gogf/gf/os/gtimer" ) func main() { diff --git a/geg/container/gqueue/gqueue2.go b/example/container/gqueue/gqueue2.go similarity index 83% rename from geg/container/gqueue/gqueue2.go rename to example/container/gqueue/gqueue2.go index b8f5f80ea..ca8ec4fa2 100644 --- a/geg/container/gqueue/gqueue2.go +++ b/example/container/gqueue/gqueue2.go @@ -2,9 +2,10 @@ package main import ( "fmt" - "github.com/gogf/gf/g/container/gqueue" - "github.com/gogf/gf/g/os/gtimer" "time" + + "github.com/gogf/gf/container/gqueue" + "github.com/gogf/gf/os/gtimer" ) func main() { diff --git a/geg/container/gqueue/gqueue3.go b/example/container/gqueue/gqueue3.go similarity index 78% rename from geg/container/gqueue/gqueue3.go rename to example/container/gqueue/gqueue3.go index 87ac9468d..9c30d0888 100644 --- a/geg/container/gqueue/gqueue3.go +++ b/example/container/gqueue/gqueue3.go @@ -2,10 +2,11 @@ package main import ( "fmt" - "github.com/gogf/gf/g/container/gqueue" - "github.com/gogf/gf/g/os/gtime" - "github.com/gogf/gf/g/os/gtimer" "time" + + "github.com/gogf/gf/container/gqueue" + "github.com/gogf/gf/os/gtime" + "github.com/gogf/gf/os/gtimer" ) func main() { diff --git a/geg/container/gring/gring.go b/example/container/gring/gring.go similarity index 91% rename from geg/container/gring/gring.go rename to example/container/gring/gring.go index e8848a630..6a15f42d6 100644 --- a/geg/container/gring/gring.go +++ b/example/container/gring/gring.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g/container/gring" + + "github.com/gogf/gf/container/gring" ) func main() { diff --git a/geg/container/gring/gring_josephus.go b/example/container/gring/gring_josephus.go similarity index 96% rename from geg/container/gring/gring_josephus.go rename to example/container/gring/gring_josephus.go index bc7f05511..5aafd5b46 100644 --- a/geg/container/gring/gring_josephus.go +++ b/example/container/gring/gring_josephus.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g/container/gring" + + "github.com/gogf/gf/container/gring" ) type Player struct { diff --git a/geg/container/gset/gset1.go b/example/container/gset/gset1.go similarity index 95% rename from geg/container/gset/gset1.go rename to example/container/gset/gset1.go index ab03175ee..b4c18a341 100644 --- a/geg/container/gset/gset1.go +++ b/example/container/gset/gset1.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g/container/gset" + + "github.com/gogf/gf/container/gset" ) func main() { diff --git a/geg/container/gset/gset2.go b/example/container/gset/gset2.go similarity index 84% rename from geg/container/gset/gset2.go rename to example/container/gset/gset2.go index 10844f4fd..051c9204f 100644 --- a/geg/container/gset/gset2.go +++ b/example/container/gset/gset2.go @@ -2,8 +2,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/container/gset" + + "github.com/gogf/gf/container/gset" + "github.com/gogf/gf/frame/g" ) func main() { diff --git a/geg/container/gtree/gtree_avltree.go b/example/container/gtree/gtree_avltree.go similarity index 85% rename from geg/container/gtree/gtree_avltree.go rename to example/container/gtree/gtree_avltree.go index 02ed98a52..9f55d4395 100644 --- a/geg/container/gtree/gtree_avltree.go +++ b/example/container/gtree/gtree_avltree.go @@ -2,8 +2,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g/container/gtree" - "github.com/gogf/gf/g/util/gutil" + + "github.com/gogf/gf/container/gtree" + "github.com/gogf/gf/util/gutil" ) func main() { diff --git a/geg/container/gtree/gtree_btree.go b/example/container/gtree/gtree_btree.go similarity index 88% rename from geg/container/gtree/gtree_btree.go rename to example/container/gtree/gtree_btree.go index 7c19b05ee..268068435 100644 --- a/geg/container/gtree/gtree_btree.go +++ b/example/container/gtree/gtree_btree.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g/container/gtree" + + "github.com/gogf/gf/container/gtree" ) func main() { diff --git a/geg/container/gtree/gtree_redblackmap.go b/example/container/gtree/gtree_redblackmap.go similarity index 93% rename from geg/container/gtree/gtree_redblackmap.go rename to example/container/gtree/gtree_redblackmap.go index b95a16ec0..d1b7e8b2e 100644 --- a/geg/container/gtree/gtree_redblackmap.go +++ b/example/container/gtree/gtree_redblackmap.go @@ -2,8 +2,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g/container/gtree" - "github.com/gogf/gf/g/util/gutil" + + "github.com/gogf/gf/container/gtree" + "github.com/gogf/gf/util/gutil" ) func main() { diff --git a/geg/container/gtree/gtree_redblacktree.go b/example/container/gtree/gtree_redblacktree.go similarity index 84% rename from geg/container/gtree/gtree_redblacktree.go rename to example/container/gtree/gtree_redblacktree.go index 85a3e3fa7..557478663 100644 --- a/geg/container/gtree/gtree_redblacktree.go +++ b/example/container/gtree/gtree_redblacktree.go @@ -1,7 +1,7 @@ package main import ( - "github.com/gogf/gf/g/container/gtree" + "github.com/gogf/gf/container/gtree" ) func main() { diff --git a/geg/container/gtype/gtype_int.go b/example/container/gtype/gtype_int.go similarity index 87% rename from geg/container/gtype/gtype_int.go rename to example/container/gtype/gtype_int.go index dc2e2123e..e44949b02 100644 --- a/geg/container/gtype/gtype_int.go +++ b/example/container/gtype/gtype_int.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g/container/gtype" + + "github.com/gogf/gf/container/gtype" ) func main() { diff --git a/geg/container/gvar/g.var.go b/example/container/gvar/g.var.go similarity index 93% rename from geg/container/gvar/g.var.go rename to example/container/gvar/g.var.go index dc4172648..d9d40029b 100644 --- a/geg/container/gvar/g.var.go +++ b/example/container/gvar/g.var.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g" + + "github.com/gogf/gf/frame/g" ) func main() { diff --git a/geg/database/gdb/mssql/config.toml b/example/database/gdb/mssql/config.toml similarity index 100% rename from geg/database/gdb/mssql/config.toml rename to example/database/gdb/mssql/config.toml diff --git a/geg/database/gdb/mssql/gdb_all.go b/example/database/gdb/mssql/gdb_all.go similarity index 86% rename from geg/database/gdb/mssql/gdb_all.go rename to example/database/gdb/mssql/gdb_all.go index 71d37a7c7..8ae5b2b49 100644 --- a/geg/database/gdb/mssql/gdb_all.go +++ b/example/database/gdb/mssql/gdb_all.go @@ -4,7 +4,7 @@ import ( "fmt" _ "github.com/denisenkom/go-mssqldb" - "github.com/gogf/gf/g" + "github.com/gogf/gf/frame/g" ) func main() { diff --git a/geg/database/gdb/mssql/gdb_sqlserver.go b/example/database/gdb/mssql/gdb_sqlserver.go similarity index 99% rename from geg/database/gdb/mssql/gdb_sqlserver.go rename to example/database/gdb/mssql/gdb_sqlserver.go index 36e8a49f2..5f0a78340 100644 --- a/geg/database/gdb/mssql/gdb_sqlserver.go +++ b/example/database/gdb/mssql/gdb_sqlserver.go @@ -5,8 +5,8 @@ import ( "time" //_ "github.com/denisenkom/go-mssqldb" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/database/gdb" + "github.com/gogf/gf/database/gdb" + "github.com/gogf/gf/frame/g" ) // 本文件用于gf框架的mssql数据库操作示例，不作为单元测试使用 diff --git a/geg/database/gdb/mysql/config.toml b/example/database/gdb/mysql/config.toml similarity index 100% rename from geg/database/gdb/mysql/config.toml rename to example/database/gdb/mysql/config.toml diff --git a/geg/database/gdb/mysql/config2.toml b/example/database/gdb/mysql/config2.toml similarity index 100% rename from geg/database/gdb/mysql/config2.toml rename to example/database/gdb/mysql/config2.toml diff --git a/geg/database/gdb/mysql/config3.toml b/example/database/gdb/mysql/config3.toml similarity index 100% rename from geg/database/gdb/mysql/config3.toml rename to example/database/gdb/mysql/config3.toml diff --git a/geg/database/gdb/mysql/gdb.go b/example/database/gdb/mysql/gdb.go similarity index 99% rename from geg/database/gdb/mysql/gdb.go rename to example/database/gdb/mysql/gdb.go index e3aaf7e9f..e51b478d5 100644 --- a/geg/database/gdb/mysql/gdb.go +++ b/example/database/gdb/mysql/gdb.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/database/gdb" + "github.com/gogf/gf/database/gdb" + "github.com/gogf/gf/frame/g" ) // 本文件用于gf框架的mysql数据库操作示例，不作为单元测试使用 diff --git a/geg/database/gdb/mysql/gdb_all.go b/example/database/gdb/mysql/gdb_all.go similarity index 89% rename from geg/database/gdb/mysql/gdb_all.go rename to example/database/gdb/mysql/gdb_all.go index 83e69972d..681277607 100644 --- a/geg/database/gdb/mysql/gdb_all.go +++ b/example/database/gdb/mysql/gdb_all.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "github.com/gogf/gf/g" + "github.com/gogf/gf/frame/g" ) func main() { diff --git a/geg/database/gdb/mysql/gdb_args_slice.go b/example/database/gdb/mysql/gdb_args_slice.go similarity index 94% rename from geg/database/gdb/mysql/gdb_args_slice.go rename to example/database/gdb/mysql/gdb_args_slice.go index fbc009f91..ceebe23d1 100644 --- a/geg/database/gdb/mysql/gdb_args_slice.go +++ b/example/database/gdb/mysql/gdb_args_slice.go @@ -1,7 +1,7 @@ package main import ( - "github.com/gogf/gf/g" + "github.com/gogf/gf/frame/g" ) func main() { diff --git a/geg/database/gdb/mysql/gdb_binary.go b/example/database/gdb/mysql/gdb_binary.go similarity index 88% rename from geg/database/gdb/mysql/gdb_binary.go rename to example/database/gdb/mysql/gdb_binary.go index 040bcfec6..f3d234736 100644 --- a/geg/database/gdb/mysql/gdb_binary.go +++ b/example/database/gdb/mysql/gdb_binary.go @@ -2,9 +2,10 @@ package main import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/crypto/gaes" - "github.com/gogf/gf/g/database/gdb" + + "github.com/gogf/gf/crypto/gaes" + "github.com/gogf/gf/database/gdb" + "github.com/gogf/gf/frame/g" ) func main() { diff --git a/geg/database/gdb/mysql/gdb_bit.go b/example/database/gdb/mysql/gdb_bit.go similarity index 86% rename from geg/database/gdb/mysql/gdb_bit.go rename to example/database/gdb/mysql/gdb_bit.go index b456d521c..b7da01292 100644 --- a/geg/database/gdb/mysql/gdb_bit.go +++ b/example/database/gdb/mysql/gdb_bit.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "github.com/gogf/gf/g" + "github.com/gogf/gf/frame/g" ) func main() { diff --git a/geg/database/gdb/mysql/gdb_cache.go b/example/database/gdb/mysql/gdb_cache.go similarity index 92% rename from geg/database/gdb/mysql/gdb_cache.go rename to example/database/gdb/mysql/gdb_cache.go index 7d9d7461a..ff0848857 100644 --- a/geg/database/gdb/mysql/gdb_cache.go +++ b/example/database/gdb/mysql/gdb_cache.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g/database/gdb" - "github.com/gogf/gf/g/util/gutil" + "github.com/gogf/gf/database/gdb" + "github.com/gogf/gf/util/gutil" ) func main() { diff --git a/geg/database/gdb/mysql/gdb_config.go b/example/database/gdb/mysql/gdb_config.go similarity index 87% rename from geg/database/gdb/mysql/gdb_config.go rename to example/database/gdb/mysql/gdb_config.go index 5bab7abee..cb88e2d89 100644 --- a/geg/database/gdb/mysql/gdb_config.go +++ b/example/database/gdb/mysql/gdb_config.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g" + + "github.com/gogf/gf/frame/g" ) func main() { diff --git a/geg/database/gdb/mysql/gdb_config2.go b/example/database/gdb/mysql/gdb_config2.go similarity index 89% rename from geg/database/gdb/mysql/gdb_config2.go rename to example/database/gdb/mysql/gdb_config2.go index 330d78108..dfe80bc19 100644 --- a/geg/database/gdb/mysql/gdb_config2.go +++ b/example/database/gdb/mysql/gdb_config2.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g" + + "github.com/gogf/gf/frame/g" ) func main() { diff --git a/geg/database/gdb/mysql/gdb_config3.go b/example/database/gdb/mysql/gdb_config3.go similarity index 93% rename from geg/database/gdb/mysql/gdb_config3.go rename to example/database/gdb/mysql/gdb_config3.go index 37608057d..11a531d55 100644 --- a/geg/database/gdb/mysql/gdb_config3.go +++ b/example/database/gdb/mysql/gdb_config3.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g" + + "github.com/gogf/gf/frame/g" ) func main() { diff --git a/geg/database/gdb/mysql/gdb_datetime.go b/example/database/gdb/mysql/gdb_datetime.go similarity index 87% rename from geg/database/gdb/mysql/gdb_datetime.go rename to example/database/gdb/mysql/gdb_datetime.go index ad7987bbe..440e70f1f 100644 --- a/geg/database/gdb/mysql/gdb_datetime.go +++ b/example/database/gdb/mysql/gdb_datetime.go @@ -2,8 +2,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/os/gtime" + + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/os/gtime" ) func main() { diff --git a/geg/database/gdb/mysql/gdb_debug1.go b/example/database/gdb/mysql/gdb_debug1.go similarity index 87% rename from geg/database/gdb/mysql/gdb_debug1.go rename to example/database/gdb/mysql/gdb_debug1.go index 6452d5eed..fa517dc0c 100644 --- a/geg/database/gdb/mysql/gdb_debug1.go +++ b/example/database/gdb/mysql/gdb_debug1.go @@ -3,9 +3,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/database/gdb" - "github.com/gogf/gf/g/os/glog" + "github.com/gogf/gf/database/gdb" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/os/glog" ) func main() { diff --git a/geg/database/gdb/mysql/gdb_debug2.go b/example/database/gdb/mysql/gdb_debug2.go similarity index 91% rename from geg/database/gdb/mysql/gdb_debug2.go rename to example/database/gdb/mysql/gdb_debug2.go index 504e25e82..720e04a25 100644 --- a/geg/database/gdb/mysql/gdb_debug2.go +++ b/example/database/gdb/mysql/gdb_debug2.go @@ -1,7 +1,7 @@ package main import ( - "github.com/gogf/gf/g" + "github.com/gogf/gf/frame/g" ) func main() { diff --git a/geg/database/gdb/mysql/gdb_insert.go b/example/database/gdb/mysql/gdb_insert.go similarity index 92% rename from geg/database/gdb/mysql/gdb_insert.go rename to example/database/gdb/mysql/gdb_insert.go index ad07df2eb..3eb2f663e 100644 --- a/geg/database/gdb/mysql/gdb_insert.go +++ b/example/database/gdb/mysql/gdb_insert.go @@ -2,8 +2,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g" "time" + + "github.com/gogf/gf/frame/g" ) func main() { diff --git a/geg/database/gdb/mysql/gdb_json_xml.go b/example/database/gdb/mysql/gdb_json_xml.go similarity index 86% rename from geg/database/gdb/mysql/gdb_json_xml.go rename to example/database/gdb/mysql/gdb_json_xml.go index 5cefe0fe0..7a273b884 100644 --- a/geg/database/gdb/mysql/gdb_json_xml.go +++ b/example/database/gdb/mysql/gdb_json_xml.go @@ -2,9 +2,10 @@ package main import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/database/gdb" - "github.com/gogf/gf/g/encoding/gparser" + + "github.com/gogf/gf/database/gdb" + "github.com/gogf/gf/encoding/gparser" + "github.com/gogf/gf/frame/g" ) func main() { diff --git a/geg/database/gdb/mysql/gdb_pool.go b/example/database/gdb/mysql/gdb_pool.go similarity index 91% rename from geg/database/gdb/mysql/gdb_pool.go rename to example/database/gdb/mysql/gdb_pool.go index 27a1da02d..aadc56960 100644 --- a/geg/database/gdb/mysql/gdb_pool.go +++ b/example/database/gdb/mysql/gdb_pool.go @@ -1,8 +1,9 @@ package main import ( - "github.com/gogf/gf/g" "time" + + "github.com/gogf/gf/frame/g" ) func main() { diff --git a/geg/database/gdb/mysql/gdb_struct.go b/example/database/gdb/mysql/gdb_struct.go similarity index 91% rename from geg/database/gdb/mysql/gdb_struct.go rename to example/database/gdb/mysql/gdb_struct.go index 1a3cb26de..6aa5b8830 100644 --- a/geg/database/gdb/mysql/gdb_struct.go +++ b/example/database/gdb/mysql/gdb_struct.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "github.com/gogf/gf/g" + "github.com/gogf/gf/frame/g" ) func main() { diff --git a/geg/database/gdb/mysql/gdb_update_union.go b/example/database/gdb/mysql/gdb_update_union.go similarity index 90% rename from geg/database/gdb/mysql/gdb_update_union.go rename to example/database/gdb/mysql/gdb_update_union.go index 907c66b0d..a0e14b7c0 100644 --- a/geg/database/gdb/mysql/gdb_update_union.go +++ b/example/database/gdb/mysql/gdb_update_union.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g" + + "github.com/gogf/gf/frame/g" ) func main() { diff --git a/geg/database/gdb/mysql/gdb_value.go b/example/database/gdb/mysql/gdb_value.go similarity index 90% rename from geg/database/gdb/mysql/gdb_value.go rename to example/database/gdb/mysql/gdb_value.go index 5174fcef5..b076054b5 100644 --- a/geg/database/gdb/mysql/gdb_value.go +++ b/example/database/gdb/mysql/gdb_value.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "github.com/gogf/gf/g" + "github.com/gogf/gf/frame/g" ) func main() { diff --git a/geg/database/gdb/oracle/gdb.go b/example/database/gdb/oracle/gdb.go similarity index 99% rename from geg/database/gdb/oracle/gdb.go rename to example/database/gdb/oracle/gdb.go index 9fa8bb9f0..fbbef441b 100644 --- a/geg/database/gdb/oracle/gdb.go +++ b/example/database/gdb/oracle/gdb.go @@ -5,8 +5,8 @@ import ( "time" //_ "github.com/mattn/go-oci8" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/database/gdb" + "github.com/gogf/gf/database/gdb" + "github.com/gogf/gf/frame/g" ) // 本文件用于gf框架的mysql数据库操作示例，不作为单元测试使用 diff --git a/geg/database/gdb/sqlite/sqlite.go b/example/database/gdb/sqlite/sqlite.go similarity index 86% rename from geg/database/gdb/sqlite/sqlite.go rename to example/database/gdb/sqlite/sqlite.go index 1d0e651f8..244ec1cf8 100644 --- a/geg/database/gdb/sqlite/sqlite.go +++ b/example/database/gdb/sqlite/sqlite.go @@ -1,9 +1,9 @@ package main //import ( -// _ "github.com/gogf/gf/third/github.com/mattn/go-sqlite3" -// "github.com/gogf/gf/g/database/gdb" -// "github.com/gogf/gf/g" +// _ "github.com/gogf/gf/internal/thirdparty/github.com/mattn/go-sqlite3" +// "github.com/gogf/gf/database/gdb" +// "github.com/gogf/gf/frame/g" // "fmt" //) // diff --git a/geg/database/gredis/config.toml b/example/database/gredis/config.toml similarity index 100% rename from geg/database/gredis/config.toml rename to example/database/gredis/config.toml diff --git a/geg/database/gredis/gredis.go b/example/database/gredis/gredis.go similarity index 81% rename from geg/database/gredis/gredis.go rename to example/database/gredis/gredis.go index 913bb7916..0ba2a4b2c 100644 --- a/geg/database/gredis/gredis.go +++ b/example/database/gredis/gredis.go @@ -2,8 +2,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g/database/gredis" - "github.com/gogf/gf/g/util/gconv" + + "github.com/gogf/gf/database/gredis" + "github.com/gogf/gf/util/gconv" ) // 使用原生gredis.New操作redis，但是注意需要自己调用Close方法关闭redis链接池 diff --git a/geg/database/gredis/gredis2.go b/example/database/gredis/gredis2.go similarity index 80% rename from geg/database/gredis/gredis2.go rename to example/database/gredis/gredis2.go index 0788dcf43..d4ef9aaeb 100644 --- a/geg/database/gredis/gredis2.go +++ b/example/database/gredis/gredis2.go @@ -2,8 +2,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/util/gconv" + + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/util/gconv" ) // 使用框架封装的g.Redis()方法获得redis操作对象单例，不需要开发者显示调用Close方法 diff --git a/geg/database/gredis/gredis_conn_do.go b/example/database/gredis/gredis_conn_do.go similarity index 73% rename from geg/database/gredis/gredis_conn_do.go rename to example/database/gredis/gredis_conn_do.go index 5bd8ac46f..a87e993ba 100644 --- a/geg/database/gredis/gredis_conn_do.go +++ b/example/database/gredis/gredis_conn_do.go @@ -2,8 +2,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/util/gconv" + + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/util/gconv" ) func main() { diff --git a/geg/database/gredis/gredis_conn_do_var.go b/example/database/gredis/gredis_conn_do_var.go similarity index 87% rename from geg/database/gredis/gredis_conn_do_var.go rename to example/database/gredis/gredis_conn_do_var.go index a41d86c76..c19c29cbc 100644 --- a/geg/database/gredis/gredis_conn_do_var.go +++ b/example/database/gredis/gredis_conn_do_var.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g" + + "github.com/gogf/gf/frame/g" ) func main() { diff --git a/geg/database/gredis/gredis_conn_send.go b/example/database/gredis/gredis_conn_send.go similarity index 81% rename from geg/database/gredis/gredis_conn_send.go rename to example/database/gredis/gredis_conn_send.go index 3c79cc821..a6d6156ac 100644 --- a/geg/database/gredis/gredis_conn_send.go +++ b/example/database/gredis/gredis_conn_send.go @@ -2,8 +2,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/util/gconv" + + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/util/gconv" ) func main() { diff --git a/geg/database/gredis/gredis_conn_send_var.go b/example/database/gredis/gredis_conn_send_var.go similarity index 89% rename from geg/database/gredis/gredis_conn_send_var.go rename to example/database/gredis/gredis_conn_send_var.go index db44262f6..5ad22b84e 100644 --- a/geg/database/gredis/gredis_conn_send_var.go +++ b/example/database/gredis/gredis_conn_send_var.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g" + + "github.com/gogf/gf/frame/g" ) func main() { diff --git a/geg/database/gredis/gredis_conn_subscribe.go b/example/database/gredis/gredis_conn_subscribe.go similarity index 81% rename from geg/database/gredis/gredis_conn_subscribe.go rename to example/database/gredis/gredis_conn_subscribe.go index 6b9c861d6..40a2e6955 100644 --- a/geg/database/gredis/gredis_conn_subscribe.go +++ b/example/database/gredis/gredis_conn_subscribe.go @@ -2,8 +2,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/util/gconv" + + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/util/gconv" ) func main() { diff --git a/geg/database/gredis/gredis_conn_subscribe_var.go b/example/database/gredis/gredis_conn_subscribe_var.go similarity index 90% rename from geg/database/gredis/gredis_conn_subscribe_var.go rename to example/database/gredis/gredis_conn_subscribe_var.go index eef1e409e..bb8857cb7 100644 --- a/geg/database/gredis/gredis_conn_subscribe_var.go +++ b/example/database/gredis/gredis_conn_subscribe_var.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g" + + "github.com/gogf/gf/frame/g" ) func main() { diff --git a/geg/encoding/gbase64.go b/example/encoding/gbase64.go similarity index 79% rename from geg/encoding/gbase64.go rename to example/encoding/gbase64.go index 208eca96e..f9ae0c13c 100644 --- a/geg/encoding/gbase64.go +++ b/example/encoding/gbase64.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g/encoding/gbase64" + + "github.com/gogf/gf/encoding/gbase64" ) func main() { diff --git a/geg/encoding/gbinary/binary.go b/example/encoding/gbinary/binary.go similarity index 96% rename from geg/encoding/gbinary/binary.go rename to example/encoding/gbinary/binary.go index b62d675db..cb275d401 100644 --- a/geg/encoding/gbinary/binary.go +++ b/example/encoding/gbinary/binary.go @@ -2,8 +2,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g/encoding/gbinary" - "github.com/gogf/gf/g/os/glog" + + "github.com/gogf/gf/encoding/gbinary" + "github.com/gogf/gf/os/glog" ) func main() { diff --git a/geg/encoding/gbinary/bits1.go b/example/encoding/gbinary/bits1.go similarity index 94% rename from geg/encoding/gbinary/bits1.go rename to example/encoding/gbinary/bits1.go index 7e7efa086..973e589bb 100644 --- a/geg/encoding/gbinary/bits1.go +++ b/example/encoding/gbinary/bits1.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g/encoding/gbinary" + + "github.com/gogf/gf/encoding/gbinary" ) func main() { diff --git a/geg/encoding/gbinary/bits2.go b/example/encoding/gbinary/bits2.go similarity index 96% rename from geg/encoding/gbinary/bits2.go rename to example/encoding/gbinary/bits2.go index 03f412cd8..0332cf362 100644 --- a/geg/encoding/gbinary/bits2.go +++ b/example/encoding/gbinary/bits2.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g/encoding/gbinary" + + "github.com/gogf/gf/encoding/gbinary" ) func main() { diff --git a/geg/encoding/gcfg/config.toml b/example/encoding/gcfg/config.toml similarity index 100% rename from geg/encoding/gcfg/config.toml rename to example/encoding/gcfg/config.toml diff --git a/geg/encoding/gcfg/gcfg1.go b/example/encoding/gcfg/gcfg1.go similarity index 89% rename from geg/encoding/gcfg/gcfg1.go rename to example/encoding/gcfg/gcfg1.go index b6cdb4b11..bbd2e67a5 100644 --- a/geg/encoding/gcfg/gcfg1.go +++ b/example/encoding/gcfg/gcfg1.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g" + + "github.com/gogf/gf/frame/g" ) func main() { diff --git a/geg/encoding/gcharset/gcharset.go b/example/encoding/gcharset/gcharset.go similarity index 85% rename from geg/encoding/gcharset/gcharset.go rename to example/encoding/gcharset/gcharset.go index e91e4fc5c..06dcbedf8 100644 --- a/geg/encoding/gcharset/gcharset.go +++ b/example/encoding/gcharset/gcharset.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g/encoding/gcharset" + + "github.com/gogf/gf/encoding/gcharset" ) func main() { diff --git a/geg/encoding/gcompress/unzip.go b/example/encoding/gcompress/unzip.go similarity index 84% rename from geg/encoding/gcompress/unzip.go rename to example/encoding/gcompress/unzip.go index e88e7bebd..9f983fb3e 100644 --- a/geg/encoding/gcompress/unzip.go +++ b/example/encoding/gcompress/unzip.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g/encoding/gcompress" + + "github.com/gogf/gf/encoding/gcompress" ) func main() { diff --git a/geg/encoding/gcompress/unzip_content.go b/example/encoding/gcompress/unzip_content.go similarity index 77% rename from geg/encoding/gcompress/unzip_content.go rename to example/encoding/gcompress/unzip_content.go index 1fa05f146..5980cfc8f 100644 --- a/geg/encoding/gcompress/unzip_content.go +++ b/example/encoding/gcompress/unzip_content.go @@ -2,8 +2,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g/encoding/gcompress" - "github.com/gogf/gf/g/os/gfile" + + "github.com/gogf/gf/encoding/gcompress" + "github.com/gogf/gf/os/gfile" ) func main() { diff --git a/geg/encoding/gcompress/zip.go b/example/encoding/gcompress/zip.go similarity index 85% rename from geg/encoding/gcompress/zip.go rename to example/encoding/gcompress/zip.go index 48e35fec1..8ac750ff6 100644 --- a/geg/encoding/gcompress/zip.go +++ b/example/encoding/gcompress/zip.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g/encoding/gcompress" + + "github.com/gogf/gf/encoding/gcompress" ) func main() { diff --git a/geg/encoding/ghash.go b/example/encoding/ghash.go similarity index 88% rename from geg/encoding/ghash.go rename to example/encoding/ghash.go index dfabbaf9e..da613411c 100644 --- a/geg/encoding/ghash.go +++ b/example/encoding/ghash.go @@ -2,8 +2,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g/encoding/ghash" "strconv" + + "github.com/gogf/gf/encoding/ghash" ) func main() { diff --git a/geg/encoding/gjson.go b/example/encoding/gjson.go similarity index 96% rename from geg/encoding/gjson.go rename to example/encoding/gjson.go index d0ed6a104..bb77e3106 100644 --- a/geg/encoding/gjson.go +++ b/example/encoding/gjson.go @@ -2,9 +2,10 @@ package main import ( "fmt" - "github.com/gogf/gf/g/encoding/gjson" - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/os/gtime" + + "github.com/gogf/gf/encoding/gjson" + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/os/gtime" ) func getByPattern() { diff --git a/geg/encoding/gparser/gparser.go b/example/encoding/gparser/gparser.go similarity index 98% rename from geg/encoding/gparser/gparser.go rename to example/encoding/gparser/gparser.go index 43db8c237..f58039fd8 100644 --- a/geg/encoding/gparser/gparser.go +++ b/example/encoding/gparser/gparser.go @@ -2,8 +2,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g/encoding/gparser" - "github.com/gogf/gf/g/os/glog" + + "github.com/gogf/gf/encoding/gparser" + "github.com/gogf/gf/os/glog" ) func getWithPattern1() { diff --git a/geg/encoding/gparser/gparser_xml.go b/example/encoding/gparser/gparser_xml.go similarity index 88% rename from geg/encoding/gparser/gparser_xml.go rename to example/encoding/gparser/gparser_xml.go index 375600951..6d3ce48bb 100644 --- a/geg/encoding/gparser/gparser_xml.go +++ b/example/encoding/gparser/gparser_xml.go @@ -1,6 +1,6 @@ package main -import "github.com/gogf/gf/g/encoding/gparser" +import "github.com/gogf/gf/encoding/gparser" func main() { xml := ` diff --git a/geg/errors/gerror/gerror1.go b/example/errors/gerror/gerror1.go similarity index 91% rename from geg/errors/gerror/gerror1.go rename to example/errors/gerror/gerror1.go index 5926723f3..c644ae15d 100644 --- a/geg/errors/gerror/gerror1.go +++ b/example/errors/gerror/gerror1.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/gogf/gf/g/errors/gerror" + "github.com/gogf/gf/errors/gerror" ) func Error1() error { diff --git a/geg/errors/gerror/gerror2.go b/example/errors/gerror/gerror2.go similarity index 91% rename from geg/errors/gerror/gerror2.go rename to example/errors/gerror/gerror2.go index abb512302..4ae5e3b3a 100644 --- a/geg/errors/gerror/gerror2.go +++ b/example/errors/gerror/gerror2.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "github.com/gogf/gf/g/errors/gerror" + "github.com/gogf/gf/errors/gerror" ) func OpenFile() error { diff --git a/geg/errors/gerror/gerror3.go b/example/errors/gerror/gerror3.go similarity index 88% rename from geg/errors/gerror/gerror3.go rename to example/errors/gerror/gerror3.go index 27b5158a3..30b67533f 100644 --- a/geg/errors/gerror/gerror3.go +++ b/example/errors/gerror/gerror3.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/gogf/gf/g/errors/gerror" + "github.com/gogf/gf/errors/gerror" ) func Error1() error { diff --git a/geg/errors/gerror/gerror4.go b/example/errors/gerror/gerror4.go similarity index 90% rename from geg/errors/gerror/gerror4.go rename to example/errors/gerror/gerror4.go index 8d7a7f015..da2200080 100644 --- a/geg/errors/gerror/gerror4.go +++ b/example/errors/gerror/gerror4.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "github.com/gogf/gf/g/errors/gerror" + "github.com/gogf/gf/errors/gerror" ) func OpenFile() error { diff --git a/geg/errors/gerror/gerror5.go b/example/errors/gerror/gerror5.go similarity index 74% rename from geg/errors/gerror/gerror5.go rename to example/errors/gerror/gerror5.go index 735b1ae1f..709b719a0 100644 --- a/geg/errors/gerror/gerror5.go +++ b/example/errors/gerror/gerror5.go @@ -3,9 +3,9 @@ package main import ( "errors" - "github.com/gogf/gf/g/os/glog" + "github.com/gogf/gf/os/glog" - "github.com/gogf/gf/g/errors/gerror" + "github.com/gogf/gf/errors/gerror" ) func Error1() error { diff --git a/geg/frame/mvc/config.json b/example/frame/mvc/config.json similarity index 100% rename from geg/frame/mvc/config.json rename to example/frame/mvc/config.json diff --git a/geg/frame/mvc/config.toml b/example/frame/mvc/config.toml similarity index 100% rename from geg/frame/mvc/config.toml rename to example/frame/mvc/config.toml diff --git a/geg/frame/mvc/config.xml b/example/frame/mvc/config.xml similarity index 100% rename from geg/frame/mvc/config.xml rename to example/frame/mvc/config.xml diff --git a/geg/frame/mvc/config.yml b/example/frame/mvc/config.yml similarity index 100% rename from geg/frame/mvc/config.yml rename to example/frame/mvc/config.yml diff --git a/geg/frame/mvc/controller/demo/apple_pen.go b/example/frame/mvc/controller/demo/apple_pen.go similarity index 84% rename from geg/frame/mvc/controller/demo/apple_pen.go rename to example/frame/mvc/controller/demo/apple_pen.go index 2dea78826..04effa2f5 100644 --- a/geg/frame/mvc/controller/demo/apple_pen.go +++ b/example/frame/mvc/controller/demo/apple_pen.go @@ -1,8 +1,8 @@ package demo import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" ) func init() { diff --git a/geg/frame/mvc/controller/demo/buildin_vars.go b/example/frame/mvc/controller/demo/buildin_vars.go similarity index 75% rename from geg/frame/mvc/controller/demo/buildin_vars.go rename to example/frame/mvc/controller/demo/buildin_vars.go index 34da09336..b1ceb940a 100644 --- a/geg/frame/mvc/controller/demo/buildin_vars.go +++ b/example/frame/mvc/controller/demo/buildin_vars.go @@ -1,8 +1,8 @@ package demo import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" ) type Order struct{} diff --git a/geg/frame/mvc/controller/demo/config.go b/example/frame/mvc/controller/demo/config.go similarity index 72% rename from geg/frame/mvc/controller/demo/config.go rename to example/frame/mvc/controller/demo/config.go index 5d2d4bd7c..b83ba525c 100644 --- a/geg/frame/mvc/controller/demo/config.go +++ b/example/frame/mvc/controller/demo/config.go @@ -1,8 +1,8 @@ package demo import ( - "github.com/gogf/gf/g/frame/gins" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/gins" + "github.com/gogf/gf/net/ghttp" ) func init() { diff --git a/geg/frame/mvc/controller/demo/cookie.go b/example/frame/mvc/controller/demo/cookie.go similarity index 78% rename from geg/frame/mvc/controller/demo/cookie.go rename to example/frame/mvc/controller/demo/cookie.go index ad385b7a9..fcf478975 100644 --- a/geg/frame/mvc/controller/demo/cookie.go +++ b/example/frame/mvc/controller/demo/cookie.go @@ -1,8 +1,8 @@ package demo import ( - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/os/gtime" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/os/gtime" ) func init() { diff --git a/geg/frame/mvc/controller/demo/domain.go b/example/frame/mvc/controller/demo/domain.go similarity index 93% rename from geg/frame/mvc/controller/demo/domain.go rename to example/frame/mvc/controller/demo/domain.go index 7f7ceb30b..60bb282ab 100644 --- a/geg/frame/mvc/controller/demo/domain.go +++ b/example/frame/mvc/controller/demo/domain.go @@ -1,7 +1,7 @@ package demo import ( - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/net/ghttp" ) type ControllerDomain struct{} diff --git a/geg/frame/mvc/controller/demo/exit.go b/example/frame/mvc/controller/demo/exit.go similarity index 84% rename from geg/frame/mvc/controller/demo/exit.go rename to example/frame/mvc/controller/demo/exit.go index 8014e3feb..c2c27d455 100644 --- a/geg/frame/mvc/controller/demo/exit.go +++ b/example/frame/mvc/controller/demo/exit.go @@ -1,8 +1,8 @@ package demo import ( - "github.com/gogf/gf/g/frame/gmvc" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/gmvc" + "github.com/gogf/gf/net/ghttp" ) type ControllerExit struct { diff --git a/geg/frame/mvc/controller/demo/form.go b/example/frame/mvc/controller/demo/form.go similarity index 95% rename from geg/frame/mvc/controller/demo/form.go rename to example/frame/mvc/controller/demo/form.go index 452de168b..edd21f69c 100644 --- a/geg/frame/mvc/controller/demo/form.go +++ b/example/frame/mvc/controller/demo/form.go @@ -2,7 +2,8 @@ package demo import ( "fmt" - "github.com/gogf/gf/g/net/ghttp" + + "github.com/gogf/gf/net/ghttp" ) func Form(r *ghttp.Request) { diff --git a/geg/frame/mvc/controller/demo/hello.go b/example/frame/mvc/controller/demo/hello.go similarity index 76% rename from geg/frame/mvc/controller/demo/hello.go rename to example/frame/mvc/controller/demo/hello.go index d808984e1..036aac2ee 100644 --- a/geg/frame/mvc/controller/demo/hello.go +++ b/example/frame/mvc/controller/demo/hello.go @@ -1,6 +1,6 @@ package demo -import "github.com/gogf/gf/g/net/ghttp" +import "github.com/gogf/gf/net/ghttp" func init() { ghttp.GetServer().BindHandler("/", func(r *ghttp.Request) { diff --git a/geg/frame/mvc/controller/demo/method.go b/example/frame/mvc/controller/demo/method.go similarity index 91% rename from geg/frame/mvc/controller/demo/method.go rename to example/frame/mvc/controller/demo/method.go index c92434402..56da4e7b1 100644 --- a/geg/frame/mvc/controller/demo/method.go +++ b/example/frame/mvc/controller/demo/method.go @@ -1,8 +1,8 @@ package demo import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/frame/gmvc" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/frame/gmvc" ) type Method struct { diff --git a/geg/frame/mvc/controller/demo/object.go b/example/frame/mvc/controller/demo/object.go similarity index 81% rename from geg/frame/mvc/controller/demo/object.go rename to example/frame/mvc/controller/demo/object.go index e929f38cc..ccd01d093 100644 --- a/geg/frame/mvc/controller/demo/object.go +++ b/example/frame/mvc/controller/demo/object.go @@ -1,8 +1,8 @@ package demo import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" ) type Object struct{} diff --git a/geg/frame/mvc/controller/demo/object_method.go b/example/frame/mvc/controller/demo/object_method.go similarity index 90% rename from geg/frame/mvc/controller/demo/object_method.go rename to example/frame/mvc/controller/demo/object_method.go index 7126450a5..64284cc12 100644 --- a/geg/frame/mvc/controller/demo/object_method.go +++ b/example/frame/mvc/controller/demo/object_method.go @@ -1,8 +1,8 @@ package demo import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" ) type ObjectMethod struct{} diff --git a/geg/frame/mvc/controller/demo/object_rest.go b/example/frame/mvc/controller/demo/object_rest.go similarity index 93% rename from geg/frame/mvc/controller/demo/object_rest.go rename to example/frame/mvc/controller/demo/object_rest.go index 476f7b9b1..2f9969186 100644 --- a/geg/frame/mvc/controller/demo/object_rest.go +++ b/example/frame/mvc/controller/demo/object_rest.go @@ -1,6 +1,6 @@ package demo -import "github.com/gogf/gf/g/net/ghttp" +import "github.com/gogf/gf/net/ghttp" // 测试绑定对象 type ObjectRest struct{} diff --git a/geg/frame/mvc/controller/demo/product.go b/example/frame/mvc/controller/demo/product.go similarity index 86% rename from geg/frame/mvc/controller/demo/product.go rename to example/frame/mvc/controller/demo/product.go index d5243c0a5..99ed5305d 100644 --- a/geg/frame/mvc/controller/demo/product.go +++ b/example/frame/mvc/controller/demo/product.go @@ -1,8 +1,8 @@ package demo import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" ) type Product struct { diff --git a/geg/frame/mvc/controller/demo/rest.go b/example/frame/mvc/controller/demo/rest.go similarity index 89% rename from geg/frame/mvc/controller/demo/rest.go rename to example/frame/mvc/controller/demo/rest.go index 98ecdecb9..4a3a4112b 100644 --- a/geg/frame/mvc/controller/demo/rest.go +++ b/example/frame/mvc/controller/demo/rest.go @@ -1,8 +1,8 @@ package demo import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/frame/gmvc" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/frame/gmvc" ) type Rest struct { diff --git a/geg/frame/mvc/controller/demo/rule.go b/example/frame/mvc/controller/demo/rule.go similarity index 79% rename from geg/frame/mvc/controller/demo/rule.go rename to example/frame/mvc/controller/demo/rule.go index 3b58da485..0c63ccd1b 100644 --- a/geg/frame/mvc/controller/demo/rule.go +++ b/example/frame/mvc/controller/demo/rule.go @@ -1,8 +1,8 @@ package demo import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/frame/gmvc" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/frame/gmvc" ) type ControllerRule struct { diff --git a/geg/frame/mvc/controller/demo/session.go b/example/frame/mvc/controller/demo/session.go similarity index 87% rename from geg/frame/mvc/controller/demo/session.go rename to example/frame/mvc/controller/demo/session.go index 7e8e19a6e..64314a8b3 100644 --- a/geg/frame/mvc/controller/demo/session.go +++ b/example/frame/mvc/controller/demo/session.go @@ -1,8 +1,9 @@ package demo import ( - "github.com/gogf/gf/g/net/ghttp" "strconv" + + "github.com/gogf/gf/net/ghttp" ) func init() { diff --git a/geg/frame/mvc/controller/demo/template.go b/example/frame/mvc/controller/demo/template.go similarity index 83% rename from geg/frame/mvc/controller/demo/template.go rename to example/frame/mvc/controller/demo/template.go index 96311cbcb..b29ddefb6 100644 --- a/geg/frame/mvc/controller/demo/template.go +++ b/example/frame/mvc/controller/demo/template.go @@ -1,8 +1,8 @@ package demo import ( - "github.com/gogf/gf/g/frame/gmvc" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/gmvc" + "github.com/gogf/gf/net/ghttp" ) type ControllerTemplate struct { diff --git a/geg/frame/mvc/controller/demo/template2.go b/example/frame/mvc/controller/demo/template2.go similarity index 80% rename from geg/frame/mvc/controller/demo/template2.go rename to example/frame/mvc/controller/demo/template2.go index 49017c8a5..ae46960a6 100644 --- a/geg/frame/mvc/controller/demo/template2.go +++ b/example/frame/mvc/controller/demo/template2.go @@ -1,8 +1,8 @@ package demo import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" ) func init() { diff --git a/geg/frame/mvc/controller/demo/template3.go b/example/frame/mvc/controller/demo/template3.go similarity index 81% rename from geg/frame/mvc/controller/demo/template3.go rename to example/frame/mvc/controller/demo/template3.go index 4f2caf3d6..aac96b23b 100644 --- a/geg/frame/mvc/controller/demo/template3.go +++ b/example/frame/mvc/controller/demo/template3.go @@ -1,8 +1,8 @@ package demo import ( - "github.com/gogf/gf/g/frame/gins" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/gins" + "github.com/gogf/gf/net/ghttp" ) func init() { diff --git a/geg/frame/mvc/controller/demo/upload.go b/example/frame/mvc/controller/demo/upload.go similarity index 92% rename from geg/frame/mvc/controller/demo/upload.go rename to example/frame/mvc/controller/demo/upload.go index d708e7607..fde3f1793 100644 --- a/geg/frame/mvc/controller/demo/upload.go +++ b/example/frame/mvc/controller/demo/upload.go @@ -1,8 +1,8 @@ package demo import ( - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/os/gfile" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/os/gfile" ) func Upload(r *ghttp.Request) { diff --git a/geg/frame/mvc/controller/demo/user.go b/example/frame/mvc/controller/demo/user.go similarity index 88% rename from geg/frame/mvc/controller/demo/user.go rename to example/frame/mvc/controller/demo/user.go index 66cb54e0c..6505d8d22 100644 --- a/geg/frame/mvc/controller/demo/user.go +++ b/example/frame/mvc/controller/demo/user.go @@ -1,8 +1,8 @@ package demo import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/frame/gmvc" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/frame/gmvc" ) type User struct { diff --git a/geg/frame/mvc/controller/stats/stats.go b/example/frame/mvc/controller/stats/stats.go similarity index 75% rename from geg/frame/mvc/controller/stats/stats.go rename to example/frame/mvc/controller/stats/stats.go index c9616a517..763cf6c14 100644 --- a/geg/frame/mvc/controller/stats/stats.go +++ b/example/frame/mvc/controller/stats/stats.go @@ -1,8 +1,8 @@ package stats import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" ) var ( diff --git a/geg/frame/mvc/main.go b/example/frame/mvc/main.go similarity index 88% rename from geg/frame/mvc/main.go rename to example/frame/mvc/main.go index a1be6940a..c90b91743 100644 --- a/geg/frame/mvc/main.go +++ b/example/frame/mvc/main.go @@ -1,7 +1,7 @@ package main import ( - "github.com/gogf/gf/g" + "github.com/gogf/gf/frame/g" _ "github.com/gogf/gf/geg/frame/mvc/controller/demo" _ "github.com/gogf/gf/geg/frame/mvc/controller/stats" ) diff --git a/geg/frame/mvc/view/upload/upload.tpl b/example/frame/mvc/view/upload/upload.tpl similarity index 100% rename from geg/frame/mvc/view/upload/upload.tpl rename to example/frame/mvc/view/upload/upload.tpl diff --git a/geg/frame/mvc/view/user/footer.tpl b/example/frame/mvc/view/user/footer.tpl similarity index 100% rename from geg/frame/mvc/view/user/footer.tpl rename to example/frame/mvc/view/user/footer.tpl diff --git a/geg/frame/mvc/view/user/index.tpl b/example/frame/mvc/view/user/index.tpl similarity index 100% rename from geg/frame/mvc/view/user/index.tpl rename to example/frame/mvc/view/user/index.tpl diff --git a/geg/net/ghttp/client/cookie/client.go b/example/net/ghttp/client/cookie/client.go similarity index 78% rename from geg/net/ghttp/client/cookie/client.go rename to example/net/ghttp/client/cookie/client.go index 3f7684412..68d659488 100644 --- a/geg/net/ghttp/client/cookie/client.go +++ b/example/net/ghttp/client/cookie/client.go @@ -2,8 +2,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/os/glog" + + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/os/glog" ) func main() { diff --git a/geg/net/ghttp/client/cookie/server.go b/example/net/ghttp/client/cookie/server.go similarity index 73% rename from geg/net/ghttp/client/cookie/server.go rename to example/net/ghttp/client/cookie/server.go index cfea27eec..9b021a700 100644 --- a/geg/net/ghttp/client/cookie/server.go +++ b/example/net/ghttp/client/cookie/server.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" ) func main() { diff --git a/geg/net/ghttp/client/get.go b/example/net/ghttp/client/get.go similarity index 89% rename from geg/net/ghttp/client/get.go rename to example/net/ghttp/client/get.go index 3bcf73e1f..179447311 100644 --- a/geg/net/ghttp/client/get.go +++ b/example/net/ghttp/client/get.go @@ -3,8 +3,9 @@ package main import ( "crypto/tls" "fmt" - "github.com/gogf/gf/g/net/ghttp" "net/http" + + "github.com/gogf/gf/net/ghttp" ) func main() { diff --git a/geg/net/ghttp/client/upload/client.go b/example/net/ghttp/client/upload/client.go similarity index 82% rename from geg/net/ghttp/client/upload/client.go rename to example/net/ghttp/client/upload/client.go index a4d94defc..492c5e421 100644 --- a/geg/net/ghttp/client/upload/client.go +++ b/example/net/ghttp/client/upload/client.go @@ -2,8 +2,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/os/glog" + + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/os/glog" ) func main() { diff --git a/geg/net/ghttp/client/upload/server.go b/example/net/ghttp/client/upload/server.go similarity index 91% rename from geg/net/ghttp/client/upload/server.go rename to example/net/ghttp/client/upload/server.go index df6d3dc55..efc90c25f 100644 --- a/geg/net/ghttp/client/upload/server.go +++ b/example/net/ghttp/client/upload/server.go @@ -1,9 +1,9 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/os/gfile" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/os/gfile" ) // 执行文件上传处理，上传到系统临时目录 /tmp diff --git a/geg/net/ghttp/server/controller/user.go b/example/net/ghttp/server/controller/user.go similarity index 85% rename from geg/net/ghttp/server/controller/user.go rename to example/net/ghttp/server/controller/user.go index d33abd346..7b00b18b0 100644 --- a/geg/net/ghttp/server/controller/user.go +++ b/example/net/ghttp/server/controller/user.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/frame/gmvc" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/frame/gmvc" ) type User struct { diff --git a/geg/net/ghttp/server/cookie.go b/example/net/ghttp/server/cookie.go similarity index 74% rename from geg/net/ghttp/server/cookie.go rename to example/net/ghttp/server/cookie.go index de2e8771c..6b424b228 100644 --- a/geg/net/ghttp/server/cookie.go +++ b/example/net/ghttp/server/cookie.go @@ -1,9 +1,9 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/os/gtime" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/os/gtime" ) func main() { diff --git a/geg/net/ghttp/server/denyroutes/config.toml b/example/net/ghttp/server/denyroutes/config.toml similarity index 100% rename from geg/net/ghttp/server/denyroutes/config.toml rename to example/net/ghttp/server/denyroutes/config.toml diff --git a/geg/net/ghttp/server/denyroutes/denyroutes.go b/example/net/ghttp/server/denyroutes/denyroutes.go similarity index 76% rename from geg/net/ghttp/server/denyroutes/denyroutes.go rename to example/net/ghttp/server/denyroutes/denyroutes.go index 78553eb0e..9e001a584 100644 --- a/geg/net/ghttp/server/denyroutes/denyroutes.go +++ b/example/net/ghttp/server/denyroutes/denyroutes.go @@ -1,6 +1,6 @@ package main -import "github.com/gogf/gf/g" +import "github.com/gogf/gf/frame/g" func main() { s := g.Server() diff --git a/geg/net/ghttp/server/domain.go b/example/net/ghttp/server/domain.go similarity index 89% rename from geg/net/ghttp/server/domain.go rename to example/net/ghttp/server/domain.go index ea0a7dc7d..db7b66f00 100644 --- a/geg/net/ghttp/server/domain.go +++ b/example/net/ghttp/server/domain.go @@ -1,6 +1,6 @@ package main -import "github.com/gogf/gf/g/net/ghttp" +import "github.com/gogf/gf/net/ghttp" func Hello1(r *ghttp.Request) { r.Response.Write("127.0.0.1: Hello World1!") diff --git a/geg/net/ghttp/server/download/download.go b/example/net/ghttp/server/download/download.go similarity index 89% rename from geg/net/ghttp/server/download/download.go rename to example/net/ghttp/server/download/download.go index a70e8a9da..c1cfba7d8 100644 --- a/geg/net/ghttp/server/download/download.go +++ b/example/net/ghttp/server/download/download.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" ) func main() { diff --git a/geg/net/ghttp/server/download/text.txt b/example/net/ghttp/server/download/text.txt similarity index 100% rename from geg/net/ghttp/server/download/text.txt rename to example/net/ghttp/server/download/text.txt diff --git a/geg/net/ghttp/server/duplicate/duplicate1.go b/example/net/ghttp/server/duplicate/duplicate1.go similarity index 82% rename from geg/net/ghttp/server/duplicate/duplicate1.go rename to example/net/ghttp/server/duplicate/duplicate1.go index fa1e15d4d..6a16c77d4 100644 --- a/geg/net/ghttp/server/duplicate/duplicate1.go +++ b/example/net/ghttp/server/duplicate/duplicate1.go @@ -2,8 +2,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" ) func main() { diff --git a/geg/net/ghttp/server/duplicate/duplicate2.go b/example/net/ghttp/server/duplicate/duplicate2.go similarity index 90% rename from geg/net/ghttp/server/duplicate/duplicate2.go rename to example/net/ghttp/server/duplicate/duplicate2.go index 62d470d70..89cafaaca 100644 --- a/geg/net/ghttp/server/duplicate/duplicate2.go +++ b/example/net/ghttp/server/duplicate/duplicate2.go @@ -2,8 +2,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/frame/gmvc" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/frame/gmvc" ) type User struct { diff --git a/geg/net/ghttp/server/duplicate/duplicate3.go b/example/net/ghttp/server/duplicate/duplicate3.go similarity index 86% rename from geg/net/ghttp/server/duplicate/duplicate3.go rename to example/net/ghttp/server/duplicate/duplicate3.go index 12a81eb51..862c0601b 100644 --- a/geg/net/ghttp/server/duplicate/duplicate3.go +++ b/example/net/ghttp/server/duplicate/duplicate3.go @@ -2,8 +2,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" ) type Object struct{} diff --git a/geg/net/ghttp/server/exit.go b/example/net/ghttp/server/exit.go similarity index 84% rename from geg/net/ghttp/server/exit.go rename to example/net/ghttp/server/exit.go index dccff31c2..a2904fc8b 100644 --- a/geg/net/ghttp/server/exit.go +++ b/example/net/ghttp/server/exit.go @@ -1,9 +1,9 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/os/glog" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/os/glog" ) func main() { diff --git a/geg/net/ghttp/server/hello.go b/example/net/ghttp/server/hello.go similarity index 75% rename from geg/net/ghttp/server/hello.go rename to example/net/ghttp/server/hello.go index c23e92b92..18c06d182 100644 --- a/geg/net/ghttp/server/hello.go +++ b/example/net/ghttp/server/hello.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" ) func main() { diff --git a/geg/net/ghttp/server/hooks/cors1.go b/example/net/ghttp/server/hooks/cors1.go similarity index 81% rename from geg/net/ghttp/server/hooks/cors1.go rename to example/net/ghttp/server/hooks/cors1.go index 7b49785f6..ce0b06207 100644 --- a/geg/net/ghttp/server/hooks/cors1.go +++ b/example/net/ghttp/server/hooks/cors1.go @@ -1,9 +1,9 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/frame/gmvc" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/frame/gmvc" + "github.com/gogf/gf/net/ghttp" ) type Order struct { diff --git a/geg/net/ghttp/server/hooks/cors2.go b/example/net/ghttp/server/hooks/cors2.go similarity index 80% rename from geg/net/ghttp/server/hooks/cors2.go rename to example/net/ghttp/server/hooks/cors2.go index d7dae4325..a10809afd 100644 --- a/geg/net/ghttp/server/hooks/cors2.go +++ b/example/net/ghttp/server/hooks/cors2.go @@ -1,9 +1,9 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/frame/gmvc" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/frame/gmvc" + "github.com/gogf/gf/net/ghttp" ) type Order2 struct { diff --git a/geg/net/ghttp/server/hooks/hooks1.go b/example/net/ghttp/server/hooks/hooks1.go similarity index 89% rename from geg/net/ghttp/server/hooks/hooks1.go rename to example/net/ghttp/server/hooks/hooks1.go index ddef2873a..fc765ab81 100644 --- a/geg/net/ghttp/server/hooks/hooks1.go +++ b/example/net/ghttp/server/hooks/hooks1.go @@ -1,9 +1,9 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/os/glog" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/os/glog" ) func main() { diff --git a/geg/net/ghttp/server/hooks/hooks2.go b/example/net/ghttp/server/hooks/hooks2.go similarity index 93% rename from geg/net/ghttp/server/hooks/hooks2.go rename to example/net/ghttp/server/hooks/hooks2.go index 5c67761b1..16dddc770 100644 --- a/geg/net/ghttp/server/hooks/hooks2.go +++ b/example/net/ghttp/server/hooks/hooks2.go @@ -2,8 +2,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" + + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" ) func main() { diff --git a/geg/net/ghttp/server/hooks/hooks4.go b/example/net/ghttp/server/hooks/hooks4.go similarity index 87% rename from geg/net/ghttp/server/hooks/hooks4.go rename to example/net/ghttp/server/hooks/hooks4.go index ec5a9e284..0f817dca7 100644 --- a/geg/net/ghttp/server/hooks/hooks4.go +++ b/example/net/ghttp/server/hooks/hooks4.go @@ -1,9 +1,9 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/os/glog" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/os/glog" ) func main() { diff --git a/geg/net/ghttp/server/hooks/hooks5.go b/example/net/ghttp/server/hooks/hooks5.go similarity index 83% rename from geg/net/ghttp/server/hooks/hooks5.go rename to example/net/ghttp/server/hooks/hooks5.go index 271b66c8c..19a6caeb7 100644 --- a/geg/net/ghttp/server/hooks/hooks5.go +++ b/example/net/ghttp/server/hooks/hooks5.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" ) func main() { diff --git a/geg/net/ghttp/server/hooks/hooks_param.go b/example/net/ghttp/server/hooks/hooks_param.go similarity index 84% rename from geg/net/ghttp/server/hooks/hooks_param.go rename to example/net/ghttp/server/hooks/hooks_param.go index d0a123330..a0ed606e1 100644 --- a/geg/net/ghttp/server/hooks/hooks_param.go +++ b/example/net/ghttp/server/hooks/hooks_param.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" ) func main() { diff --git a/geg/net/ghttp/server/hooks/same_route_multi_hook.go b/example/net/ghttp/server/hooks/same_route_multi_hook.go similarity index 93% rename from geg/net/ghttp/server/hooks/same_route_multi_hook.go rename to example/net/ghttp/server/hooks/same_route_multi_hook.go index fff5b1473..29cca92c8 100644 --- a/geg/net/ghttp/server/hooks/same_route_multi_hook.go +++ b/example/net/ghttp/server/hooks/same_route_multi_hook.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" ) // 优先调用的HOOK diff --git a/geg/net/ghttp/server/https/https.go b/example/net/ghttp/server/https/https.go similarity index 89% rename from geg/net/ghttp/server/https/https.go rename to example/net/ghttp/server/https/https.go index 60fcddcb5..b3430c996 100644 --- a/geg/net/ghttp/server/https/https.go +++ b/example/net/ghttp/server/https/https.go @@ -1,7 +1,7 @@ package main import ( - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/net/ghttp" ) func main() { diff --git a/geg/net/ghttp/server/https/https_http.go b/example/net/ghttp/server/https/https_http.go similarity index 90% rename from geg/net/ghttp/server/https/https_http.go rename to example/net/ghttp/server/https/https_http.go index 5d5b17321..5bb96bb22 100644 --- a/geg/net/ghttp/server/https/https_http.go +++ b/example/net/ghttp/server/https/https_http.go @@ -1,7 +1,7 @@ package main import ( - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/net/ghttp" ) func main() { diff --git a/geg/net/ghttp/server/https/server.crt b/example/net/ghttp/server/https/server.crt similarity index 100% rename from geg/net/ghttp/server/https/server.crt rename to example/net/ghttp/server/https/server.crt diff --git a/geg/net/ghttp/server/https/server.key b/example/net/ghttp/server/https/server.key similarity index 100% rename from geg/net/ghttp/server/https/server.key rename to example/net/ghttp/server/https/server.key diff --git a/geg/net/ghttp/server/https/server.key.public b/example/net/ghttp/server/https/server.key.public similarity index 100% rename from geg/net/ghttp/server/https/server.key.public rename to example/net/ghttp/server/https/server.key.public diff --git a/geg/net/ghttp/server/log/log.go b/example/net/ghttp/server/log/log.go similarity index 94% rename from geg/net/ghttp/server/log/log.go rename to example/net/ghttp/server/log/log.go index 55ec3fb85..b7796547d 100644 --- a/geg/net/ghttp/server/log/log.go +++ b/example/net/ghttp/server/log/log.go @@ -1,8 +1,9 @@ package main import ( - "github.com/gogf/gf/g/net/ghttp" "net/http" + + "github.com/gogf/gf/net/ghttp" ) func main() { diff --git a/geg/net/ghttp/server/log/log_error.go b/example/net/ghttp/server/log/log_error.go similarity index 88% rename from geg/net/ghttp/server/log/log_error.go rename to example/net/ghttp/server/log/log_error.go index 02cc6cd11..b6445afa2 100644 --- a/geg/net/ghttp/server/log/log_error.go +++ b/example/net/ghttp/server/log/log_error.go @@ -1,7 +1,7 @@ package main import ( - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/net/ghttp" ) func main() { diff --git a/geg/net/ghttp/server/name.go b/example/net/ghttp/server/name.go similarity index 92% rename from geg/net/ghttp/server/name.go rename to example/net/ghttp/server/name.go index f09701aa6..90035cca3 100644 --- a/geg/net/ghttp/server/name.go +++ b/example/net/ghttp/server/name.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" ) type User struct{} diff --git a/geg/net/ghttp/server/nethttp_server.go b/example/net/ghttp/server/nethttp_server.go similarity index 100% rename from geg/net/ghttp/server/nethttp_server.go rename to example/net/ghttp/server/nethttp_server.go diff --git a/geg/net/ghttp/server/object/user.go b/example/net/ghttp/server/object/user.go similarity index 84% rename from geg/net/ghttp/server/object/user.go rename to example/net/ghttp/server/object/user.go index f79b643cc..8bb926d68 100644 --- a/geg/net/ghttp/server/object/user.go +++ b/example/net/ghttp/server/object/user.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" ) type User struct { diff --git a/geg/net/ghttp/server/ports.go b/example/net/ghttp/server/ports.go similarity index 84% rename from geg/net/ghttp/server/ports.go rename to example/net/ghttp/server/ports.go index 413f547c8..fa6b8c883 100644 --- a/geg/net/ghttp/server/ports.go +++ b/example/net/ghttp/server/ports.go @@ -1,7 +1,7 @@ package main import ( - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/net/ghttp" ) func main() { diff --git a/geg/net/ghttp/server/pprof.go b/example/net/ghttp/server/pprof.go similarity index 85% rename from geg/net/ghttp/server/pprof.go rename to example/net/ghttp/server/pprof.go index ff7fbe889..73d75e4dc 100644 --- a/geg/net/ghttp/server/pprof.go +++ b/example/net/ghttp/server/pprof.go @@ -1,7 +1,7 @@ package main import ( - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/net/ghttp" ) func main() { diff --git a/geg/net/ghttp/server/redirect/back.go b/example/net/ghttp/server/redirect/back.go similarity index 81% rename from geg/net/ghttp/server/redirect/back.go rename to example/net/ghttp/server/redirect/back.go index b0d91fbe2..ea26283e8 100644 --- a/geg/net/ghttp/server/redirect/back.go +++ b/example/net/ghttp/server/redirect/back.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" ) func main() { diff --git a/geg/net/ghttp/server/reload/admin.go b/example/net/ghttp/server/reload/admin.go similarity index 89% rename from geg/net/ghttp/server/reload/admin.go rename to example/net/ghttp/server/reload/admin.go index 9c5ba5a1a..1a965c02f 100644 --- a/geg/net/ghttp/server/reload/admin.go +++ b/example/net/ghttp/server/reload/admin.go @@ -1,7 +1,7 @@ package main import ( - "github.com/gogf/gf/g" + "github.com/gogf/gf/frame/g" ) func main() { diff --git a/geg/net/ghttp/server/reload/https.go b/example/net/ghttp/server/reload/https.go similarity index 80% rename from geg/net/ghttp/server/reload/https.go rename to example/net/ghttp/server/reload/https.go index bccd63905..fa0a50cfd 100644 --- a/geg/net/ghttp/server/reload/https.go +++ b/example/net/ghttp/server/reload/https.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" ) func main() { diff --git a/geg/net/ghttp/server/reload/https_http.go b/example/net/ghttp/server/reload/https_http.go similarity index 91% rename from geg/net/ghttp/server/reload/https_http.go rename to example/net/ghttp/server/reload/https_http.go index 8a9fb2493..155c53722 100644 --- a/geg/net/ghttp/server/reload/https_http.go +++ b/example/net/ghttp/server/reload/https_http.go @@ -1,7 +1,7 @@ package main import ( - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/net/ghttp" ) func main() { diff --git a/geg/net/ghttp/server/reload/multi_port_and_server.go b/example/net/ghttp/server/reload/multi_port_and_server.go similarity index 87% rename from geg/net/ghttp/server/reload/multi_port_and_server.go rename to example/net/ghttp/server/reload/multi_port_and_server.go index 7baa0932b..f599d0d4d 100644 --- a/geg/net/ghttp/server/reload/multi_port_and_server.go +++ b/example/net/ghttp/server/reload/multi_port_and_server.go @@ -1,7 +1,7 @@ package main import ( - "github.com/gogf/gf/g" + "github.com/gogf/gf/frame/g" ) func main() { diff --git a/geg/net/ghttp/server/reload/simple.go b/example/net/ghttp/server/reload/simple.go similarity index 82% rename from geg/net/ghttp/server/reload/simple.go rename to example/net/ghttp/server/reload/simple.go index df301c56e..056ddd2eb 100644 --- a/geg/net/ghttp/server/reload/simple.go +++ b/example/net/ghttp/server/reload/simple.go @@ -1,10 +1,11 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/os/gproc" "time" + + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/os/gproc" ) func main() { diff --git a/geg/net/ghttp/server/request/request_struct.go b/example/net/ghttp/server/request/request_struct.go similarity index 90% rename from geg/net/ghttp/server/request/request_struct.go rename to example/net/ghttp/server/request/request_struct.go index 3af9f9859..65ebcdf2e 100644 --- a/geg/net/ghttp/server/request/request_struct.go +++ b/example/net/ghttp/server/request/request_struct.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" ) type User struct { diff --git a/geg/net/ghttp/server/request/request_validation.go b/example/net/ghttp/server/request/request_validation.go similarity index 87% rename from geg/net/ghttp/server/request/request_validation.go rename to example/net/ghttp/server/request/request_validation.go index 9f28dd86e..850a63491 100644 --- a/geg/net/ghttp/server/request/request_validation.go +++ b/example/net/ghttp/server/request/request_validation.go @@ -1,9 +1,9 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/util/gvalid" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/util/gvalid" ) func main() { diff --git a/geg/net/ghttp/server/reuseport/reuseport.go b/example/net/ghttp/server/reuseport/reuseport.go similarity index 80% rename from geg/net/ghttp/server/reuseport/reuseport.go rename to example/net/ghttp/server/reuseport/reuseport.go index d8ae6f5a1..fe6522da6 100644 --- a/geg/net/ghttp/server/reuseport/reuseport.go +++ b/example/net/ghttp/server/reuseport/reuseport.go @@ -1,9 +1,9 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/os/glog" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/os/glog" ) func main() { diff --git a/geg/net/ghttp/server/router/group/group1.go b/example/net/ghttp/server/router/group/group1.go similarity index 94% rename from geg/net/ghttp/server/router/group/group1.go rename to example/net/ghttp/server/router/group/group1.go index 36af78de2..808bbe994 100644 --- a/geg/net/ghttp/server/router/group/group1.go +++ b/example/net/ghttp/server/router/group/group1.go @@ -1,9 +1,9 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/frame/gmvc" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/frame/gmvc" + "github.com/gogf/gf/net/ghttp" ) type Object struct{} diff --git a/geg/net/ghttp/server/router/router1.go b/example/net/ghttp/server/router/router1.go similarity index 90% rename from geg/net/ghttp/server/router/router1.go rename to example/net/ghttp/server/router/router1.go index 44ed65063..216e805cd 100644 --- a/geg/net/ghttp/server/router/router1.go +++ b/example/net/ghttp/server/router/router1.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" ) func main() { diff --git a/geg/net/ghttp/server/router/router2.go b/example/net/ghttp/server/router/router2.go similarity index 95% rename from geg/net/ghttp/server/router/router2.go rename to example/net/ghttp/server/router/router2.go index 695c41eb9..cb994e60b 100644 --- a/geg/net/ghttp/server/router/router2.go +++ b/example/net/ghttp/server/router/router2.go @@ -1,6 +1,6 @@ package main -import "github.com/gogf/gf/g/net/ghttp" +import "github.com/gogf/gf/net/ghttp" func main() { s := ghttp.GetServer() diff --git a/geg/net/ghttp/server/router/router3.go b/example/net/ghttp/server/router/router3.go similarity index 92% rename from geg/net/ghttp/server/router/router3.go rename to example/net/ghttp/server/router/router3.go index 01e10016a..649694de2 100644 --- a/geg/net/ghttp/server/router/router3.go +++ b/example/net/ghttp/server/router/router3.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" ) func main() { diff --git a/geg/net/ghttp/server/router/router4.go b/example/net/ghttp/server/router/router4.go similarity index 90% rename from geg/net/ghttp/server/router/router4.go rename to example/net/ghttp/server/router/router4.go index 99b626e89..daa4b9f73 100644 --- a/geg/net/ghttp/server/router/router4.go +++ b/example/net/ghttp/server/router/router4.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" ) func main() { diff --git a/geg/net/ghttp/server/router/router5.go b/example/net/ghttp/server/router/router5.go similarity index 89% rename from geg/net/ghttp/server/router/router5.go rename to example/net/ghttp/server/router/router5.go index 670a46911..aed4fc3ef 100644 --- a/geg/net/ghttp/server/router/router5.go +++ b/example/net/ghttp/server/router/router5.go @@ -2,8 +2,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" + + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" ) func main() { diff --git a/geg/net/ghttp/server/router/router6.go b/example/net/ghttp/server/router/router6.go similarity index 78% rename from geg/net/ghttp/server/router/router6.go rename to example/net/ghttp/server/router/router6.go index a6fd9bff6..d22002beb 100644 --- a/geg/net/ghttp/server/router/router6.go +++ b/example/net/ghttp/server/router/router6.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" ) // 试试模糊匹配规则不带名称会怎么样 diff --git a/geg/net/ghttp/server/server2.go b/example/net/ghttp/server/server2.go similarity index 90% rename from geg/net/ghttp/server/server2.go rename to example/net/ghttp/server/server2.go index 966165771..800dd71f8 100644 --- a/geg/net/ghttp/server/server2.go +++ b/example/net/ghttp/server/server2.go @@ -1,7 +1,7 @@ package main import ( - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/net/ghttp" ) func main() { diff --git a/geg/net/ghttp/server/session.go b/example/net/ghttp/server/session.go similarity index 72% rename from geg/net/ghttp/server/session.go rename to example/net/ghttp/server/session.go index 369e12750..fd553cff9 100644 --- a/geg/net/ghttp/server/session.go +++ b/example/net/ghttp/server/session.go @@ -1,9 +1,9 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/util/gconv" ) func main() { diff --git a/geg/net/ghttp/server/session/config.toml b/example/net/ghttp/server/session/config.toml similarity index 100% rename from geg/net/ghttp/server/session/config.toml rename to example/net/ghttp/server/session/config.toml diff --git a/geg/net/ghttp/server/session/session.go b/example/net/ghttp/server/session/session.go similarity index 90% rename from geg/net/ghttp/server/session/session.go rename to example/net/ghttp/server/session/session.go index 3d901fdd3..1186869b8 100644 --- a/geg/net/ghttp/server/session/session.go +++ b/example/net/ghttp/server/session/session.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/frame/gmvc" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/frame/gmvc" ) type Controller struct { diff --git a/geg/net/ghttp/server/session/session_redis.go b/example/net/ghttp/server/session/session_redis.go similarity index 95% rename from geg/net/ghttp/server/session/session_redis.go rename to example/net/ghttp/server/session/session_redis.go index b70f64edf..2debe6d50 100644 --- a/geg/net/ghttp/server/session/session_redis.go +++ b/example/net/ghttp/server/session/session_redis.go @@ -1,9 +1,9 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/os/gtime" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/os/gtime" ) // 测试，SESSION写入 diff --git a/geg/net/ghttp/server/static/static.go b/example/net/ghttp/server/static/static.go similarity index 85% rename from geg/net/ghttp/server/static/static.go rename to example/net/ghttp/server/static/static.go index caba9ed1a..980cd194a 100644 --- a/geg/net/ghttp/server/static/static.go +++ b/example/net/ghttp/server/static/static.go @@ -1,6 +1,6 @@ package main -import "github.com/gogf/gf/g" +import "github.com/gogf/gf/frame/g" // 静态文件服务器基本使用 func main() { diff --git a/geg/net/ghttp/server/static/static_path.go b/example/net/ghttp/server/static/static_path.go similarity index 88% rename from geg/net/ghttp/server/static/static_path.go rename to example/net/ghttp/server/static/static_path.go index 35f5cdbd5..222c6be87 100644 --- a/geg/net/ghttp/server/static/static_path.go +++ b/example/net/ghttp/server/static/static_path.go @@ -1,6 +1,6 @@ package main -import "github.com/gogf/gf/g" +import "github.com/gogf/gf/frame/g" // 静态文件服务器，支持自定义静态目录映射 func main() { diff --git a/geg/net/ghttp/server/static/static_path2.go b/example/net/ghttp/server/static/static_path2.go similarity index 90% rename from geg/net/ghttp/server/static/static_path2.go rename to example/net/ghttp/server/static/static_path2.go index 4d2faa45f..f626c99d5 100644 --- a/geg/net/ghttp/server/static/static_path2.go +++ b/example/net/ghttp/server/static/static_path2.go @@ -1,6 +1,6 @@ package main -import "github.com/gogf/gf/g" +import "github.com/gogf/gf/frame/g" // 静态文件服务器，支持自定义静态目录映射 func main() { diff --git a/geg/net/ghttp/server/status.go b/example/net/ghttp/server/status.go similarity index 81% rename from geg/net/ghttp/server/status.go rename to example/net/ghttp/server/status.go index 6f54770c3..34256f0c5 100644 --- a/geg/net/ghttp/server/status.go +++ b/example/net/ghttp/server/status.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" ) func main() { diff --git a/geg/net/ghttp/server/status_map.go b/example/net/ghttp/server/status_map.go similarity index 83% rename from geg/net/ghttp/server/status_map.go rename to example/net/ghttp/server/status_map.go index 6f54448ca..de0f8b1ca 100644 --- a/geg/net/ghttp/server/status_map.go +++ b/example/net/ghttp/server/status_map.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" ) func main() { diff --git a/geg/net/ghttp/server/status_redirect.go b/example/net/ghttp/server/status_redirect.go similarity index 83% rename from geg/net/ghttp/server/status_redirect.go rename to example/net/ghttp/server/status_redirect.go index 9f8138287..e525151a3 100644 --- a/geg/net/ghttp/server/status_redirect.go +++ b/example/net/ghttp/server/status_redirect.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" ) func main() { diff --git a/geg/net/ghttp/server/template/build-in/objects/objects.go b/example/net/ghttp/server/template/build-in/objects/objects.go similarity index 77% rename from geg/net/ghttp/server/template/build-in/objects/objects.go rename to example/net/ghttp/server/template/build-in/objects/objects.go index affc834c4..2559da767 100644 --- a/geg/net/ghttp/server/template/build-in/objects/objects.go +++ b/example/net/ghttp/server/template/build-in/objects/objects.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" ) func main() { diff --git a/geg/net/ghttp/server/template/build-in/vars/config.toml b/example/net/ghttp/server/template/build-in/vars/config.toml similarity index 100% rename from geg/net/ghttp/server/template/build-in/vars/config.toml rename to example/net/ghttp/server/template/build-in/vars/config.toml diff --git a/geg/net/ghttp/server/template/build-in/vars/vars.go b/example/net/ghttp/server/template/build-in/vars/vars.go similarity index 85% rename from geg/net/ghttp/server/template/build-in/vars/vars.go rename to example/net/ghttp/server/template/build-in/vars/vars.go index 5f725a42e..2e9b37027 100644 --- a/geg/net/ghttp/server/template/build-in/vars/vars.go +++ b/example/net/ghttp/server/template/build-in/vars/vars.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" ) func main() { diff --git a/geg/net/ghttp/server/template/layout/main.go b/example/net/ghttp/server/template/layout/main.go similarity index 86% rename from geg/net/ghttp/server/template/layout/main.go rename to example/net/ghttp/server/template/layout/main.go index f1187af19..439589e4b 100644 --- a/geg/net/ghttp/server/template/layout/main.go +++ b/example/net/ghttp/server/template/layout/main.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" ) func main() { diff --git a/geg/net/ghttp/server/template/layout/template/footer.html b/example/net/ghttp/server/template/layout/template/footer.html similarity index 100% rename from geg/net/ghttp/server/template/layout/template/footer.html rename to example/net/ghttp/server/template/layout/template/footer.html diff --git a/geg/net/ghttp/server/template/layout/template/header.html b/example/net/ghttp/server/template/layout/template/header.html similarity index 100% rename from geg/net/ghttp/server/template/layout/template/header.html rename to example/net/ghttp/server/template/layout/template/header.html diff --git a/geg/net/ghttp/server/template/layout/template/layout.html b/example/net/ghttp/server/template/layout/template/layout.html similarity index 100% rename from geg/net/ghttp/server/template/layout/template/layout.html rename to example/net/ghttp/server/template/layout/template/layout.html diff --git a/geg/net/ghttp/server/template/layout/template/main/main1.html b/example/net/ghttp/server/template/layout/template/main/main1.html similarity index 100% rename from geg/net/ghttp/server/template/layout/template/main/main1.html rename to example/net/ghttp/server/template/layout/template/main/main1.html diff --git a/geg/net/ghttp/server/template/layout/template/main/main2.html b/example/net/ghttp/server/template/layout/template/main/main2.html similarity index 100% rename from geg/net/ghttp/server/template/layout/template/main/main2.html rename to example/net/ghttp/server/template/layout/template/main/main2.html diff --git a/geg/net/ghttp/server/template/tpl1/index.html b/example/net/ghttp/server/template/tpl1/index.html similarity index 100% rename from geg/net/ghttp/server/template/tpl1/index.html rename to example/net/ghttp/server/template/tpl1/index.html diff --git a/geg/net/ghttp/server/template/tpl1/tpl1.go b/example/net/ghttp/server/template/tpl1/tpl1.go similarity index 79% rename from geg/net/ghttp/server/template/tpl1/tpl1.go rename to example/net/ghttp/server/template/tpl1/tpl1.go index 4580c70fa..e58c6cc40 100644 --- a/geg/net/ghttp/server/template/tpl1/tpl1.go +++ b/example/net/ghttp/server/template/tpl1/tpl1.go @@ -1,9 +1,9 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/frame/gmvc" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/frame/gmvc" + "github.com/gogf/gf/net/ghttp" ) type ControllerIndex struct { diff --git a/geg/net/ghttp/server/template/tpl2/main.go b/example/net/ghttp/server/template/tpl2/main.go similarity index 78% rename from geg/net/ghttp/server/template/tpl2/main.go rename to example/net/ghttp/server/template/tpl2/main.go index c480c9d78..c46d010ec 100644 --- a/geg/net/ghttp/server/template/tpl2/main.go +++ b/example/net/ghttp/server/template/tpl2/main.go @@ -1,9 +1,9 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/frame/gins" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/frame/gins" + "github.com/gogf/gf/net/ghttp" ) func main() { diff --git a/geg/net/ghttp/server/template/tpl2/public/test.html b/example/net/ghttp/server/template/tpl2/public/test.html similarity index 100% rename from geg/net/ghttp/server/template/tpl2/public/test.html rename to example/net/ghttp/server/template/tpl2/public/test.html diff --git a/geg/net/ghttp/server/template/tpl2/template/test.html b/example/net/ghttp/server/template/tpl2/template/test.html similarity index 100% rename from geg/net/ghttp/server/template/tpl2/template/test.html rename to example/net/ghttp/server/template/tpl2/template/test.html diff --git a/geg/net/ghttp/server/websocket/echo-wss/index.html b/example/net/ghttp/server/websocket/echo-wss/index.html similarity index 100% rename from geg/net/ghttp/server/websocket/echo-wss/index.html rename to example/net/ghttp/server/websocket/echo-wss/index.html diff --git a/geg/net/ghttp/server/websocket/echo-wss/main.go b/example/net/ghttp/server/websocket/echo-wss/main.go similarity index 79% rename from geg/net/ghttp/server/websocket/echo-wss/main.go rename to example/net/ghttp/server/websocket/echo-wss/main.go index c238e0e44..07d312d71 100644 --- a/geg/net/ghttp/server/websocket/echo-wss/main.go +++ b/example/net/ghttp/server/websocket/echo-wss/main.go @@ -1,10 +1,10 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/os/glog" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/os/glog" ) func main() { diff --git a/geg/net/ghttp/server/websocket/echo/index.html b/example/net/ghttp/server/websocket/echo/index.html similarity index 100% rename from geg/net/ghttp/server/websocket/echo/index.html rename to example/net/ghttp/server/websocket/echo/index.html diff --git a/geg/net/ghttp/server/websocket/echo/main-group.go b/example/net/ghttp/server/websocket/echo/main-group.go similarity index 78% rename from geg/net/ghttp/server/websocket/echo/main-group.go rename to example/net/ghttp/server/websocket/echo/main-group.go index 854b8bd69..98b2b96c6 100644 --- a/geg/net/ghttp/server/websocket/echo/main-group.go +++ b/example/net/ghttp/server/websocket/echo/main-group.go @@ -1,10 +1,10 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/os/glog" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/os/glog" ) func ws(r *ghttp.Request) { diff --git a/geg/net/ghttp/server/websocket/echo/main.go b/example/net/ghttp/server/websocket/echo/main.go similarity index 77% rename from geg/net/ghttp/server/websocket/echo/main.go rename to example/net/ghttp/server/websocket/echo/main.go index 391766f59..f222bdcc5 100644 --- a/geg/net/ghttp/server/websocket/echo/main.go +++ b/example/net/ghttp/server/websocket/echo/main.go @@ -1,10 +1,10 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/os/glog" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/os/glog" ) func main() { diff --git a/geg/net/gtcp/gtcp_conn.go b/example/net/gtcp/gtcp_conn.go similarity index 93% rename from geg/net/gtcp/gtcp_conn.go rename to example/net/gtcp/gtcp_conn.go index 0280e0e61..a312c4ead 100644 --- a/geg/net/gtcp/gtcp_conn.go +++ b/example/net/gtcp/gtcp_conn.go @@ -3,9 +3,10 @@ package main import ( "bytes" "fmt" - "github.com/gogf/gf/g/net/gtcp" - "github.com/gogf/gf/g/util/gconv" "os" + + "github.com/gogf/gf/net/gtcp" + "github.com/gogf/gf/util/gconv" ) func main() { diff --git a/geg/net/gtcp/gtcp_echo_server.go b/example/net/gtcp/gtcp_echo_server.go similarity index 91% rename from geg/net/gtcp/gtcp_echo_server.go rename to example/net/gtcp/gtcp_echo_server.go index ea99130e1..5f3d481e9 100644 --- a/geg/net/gtcp/gtcp_echo_server.go +++ b/example/net/gtcp/gtcp_echo_server.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g/net/gtcp" + + "github.com/gogf/gf/net/gtcp" ) func main() { diff --git a/geg/net/gtcp/gtcp_func.go b/example/net/gtcp/gtcp_func.go similarity index 88% rename from geg/net/gtcp/gtcp_func.go rename to example/net/gtcp/gtcp_func.go index 96e7563a7..7bc083718 100644 --- a/geg/net/gtcp/gtcp_func.go +++ b/example/net/gtcp/gtcp_func.go @@ -2,8 +2,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g/net/gtcp" "os" + + "github.com/gogf/gf/net/gtcp" ) func main() { diff --git a/geg/net/gtcp/gtcp_pool1.go b/example/net/gtcp/gtcp_pool1.go similarity index 88% rename from geg/net/gtcp/gtcp_pool1.go rename to example/net/gtcp/gtcp_pool1.go index 503f27fb9..69c2a491a 100644 --- a/geg/net/gtcp/gtcp_pool1.go +++ b/example/net/gtcp/gtcp_pool1.go @@ -2,10 +2,11 @@ package main import ( "fmt" - "github.com/gogf/gf/g/net/gtcp" - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/os/gtime" "time" + + "github.com/gogf/gf/net/gtcp" + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/os/gtime" ) func main() { diff --git a/geg/net/gtcp/gtcp_pool2.go b/example/net/gtcp/gtcp_pool2.go similarity index 88% rename from geg/net/gtcp/gtcp_pool2.go rename to example/net/gtcp/gtcp_pool2.go index d2c63286a..c30ad647d 100644 --- a/geg/net/gtcp/gtcp_pool2.go +++ b/example/net/gtcp/gtcp_pool2.go @@ -2,10 +2,11 @@ package main import ( "fmt" - "github.com/gogf/gf/g/net/gtcp" - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/os/gtime" "time" + + "github.com/gogf/gf/net/gtcp" + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/os/gtime" ) func main() { diff --git a/geg/net/gtcp/gtcp_server_client1.go b/example/net/gtcp/gtcp_server_client1.go similarity index 87% rename from geg/net/gtcp/gtcp_server_client1.go rename to example/net/gtcp/gtcp_server_client1.go index e953549cc..8f153aa31 100644 --- a/geg/net/gtcp/gtcp_server_client1.go +++ b/example/net/gtcp/gtcp_server_client1.go @@ -2,10 +2,11 @@ package main import ( "fmt" - "github.com/gogf/gf/g/net/gtcp" - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/util/gconv" "time" + + "github.com/gogf/gf/net/gtcp" + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/util/gconv" ) func main() { diff --git a/geg/net/gtcp/gtcp_server_client2.go b/example/net/gtcp/gtcp_server_client2.go similarity index 88% rename from geg/net/gtcp/gtcp_server_client2.go rename to example/net/gtcp/gtcp_server_client2.go index 6359c86b6..0c89832dc 100644 --- a/geg/net/gtcp/gtcp_server_client2.go +++ b/example/net/gtcp/gtcp_server_client2.go @@ -2,10 +2,11 @@ package main import ( "fmt" - "github.com/gogf/gf/g/net/gtcp" - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/os/gtime" "time" + + "github.com/gogf/gf/net/gtcp" + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/os/gtime" ) func main() { diff --git a/geg/net/gtcp/gtcp_timeout_client.go b/example/net/gtcp/gtcp_timeout_client.go similarity index 72% rename from geg/net/gtcp/gtcp_timeout_client.go rename to example/net/gtcp/gtcp_timeout_client.go index 0dd8d7f8c..e4a777282 100644 --- a/geg/net/gtcp/gtcp_timeout_client.go +++ b/example/net/gtcp/gtcp_timeout_client.go @@ -1,10 +1,11 @@ package main import ( - "github.com/gogf/gf/g/net/gtcp" - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/os/gtime" "time" + + "github.com/gogf/gf/net/gtcp" + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/os/gtime" ) func main() { diff --git a/geg/net/gtcp/gtcp_timeout_server.go b/example/net/gtcp/gtcp_timeout_server.go similarity index 91% rename from geg/net/gtcp/gtcp_timeout_server.go rename to example/net/gtcp/gtcp_timeout_server.go index 95b779f48..eee3a748c 100644 --- a/geg/net/gtcp/gtcp_timeout_server.go +++ b/example/net/gtcp/gtcp_timeout_server.go @@ -2,8 +2,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g/net/gtcp" "time" + + "github.com/gogf/gf/net/gtcp" ) func main() { diff --git a/geg/net/gtcp/pkg_operations/common/funcs/funcs.go b/example/net/gtcp/pkg_operations/common/funcs/funcs.go similarity index 95% rename from geg/net/gtcp/pkg_operations/common/funcs/funcs.go rename to example/net/gtcp/pkg_operations/common/funcs/funcs.go index 163fc9d2c..d8f90b448 100644 --- a/geg/net/gtcp/pkg_operations/common/funcs/funcs.go +++ b/example/net/gtcp/pkg_operations/common/funcs/funcs.go @@ -3,8 +3,9 @@ package funcs import ( "encoding/json" "fmt" - "github.com/gogf/gf/g/net/gtcp" + "github.com/gogf/gf/geg/net/gtcp/pkg_operations/common/types" + "github.com/gogf/gf/net/gtcp" ) // 自定义格式发送消息包 diff --git a/geg/net/gtcp/pkg_operations/common/gtcp_common_client.go b/example/net/gtcp/pkg_operations/common/gtcp_common_client.go similarity index 93% rename from geg/net/gtcp/pkg_operations/common/gtcp_common_client.go rename to example/net/gtcp/pkg_operations/common/gtcp_common_client.go index fb7528f1e..d4d8b4763 100644 --- a/geg/net/gtcp/pkg_operations/common/gtcp_common_client.go +++ b/example/net/gtcp/pkg_operations/common/gtcp_common_client.go @@ -1,12 +1,13 @@ package main import ( - "github.com/gogf/gf/g/net/gtcp" - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/os/gtimer" + "time" + "github.com/gogf/gf/geg/net/gtcp/pkg_operations/common/funcs" "github.com/gogf/gf/geg/net/gtcp/pkg_operations/common/types" - "time" + "github.com/gogf/gf/net/gtcp" + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/os/gtimer" ) func main() { diff --git a/geg/net/gtcp/pkg_operations/common/gtcp_common_server.go b/example/net/gtcp/pkg_operations/common/gtcp_common_server.go similarity index 91% rename from geg/net/gtcp/pkg_operations/common/gtcp_common_server.go rename to example/net/gtcp/pkg_operations/common/gtcp_common_server.go index 60ddd204f..32f39ca54 100644 --- a/geg/net/gtcp/pkg_operations/common/gtcp_common_server.go +++ b/example/net/gtcp/pkg_operations/common/gtcp_common_server.go @@ -1,12 +1,13 @@ package main import ( - "github.com/gogf/gf/g/net/gtcp" - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/os/gtimer" + "time" + "github.com/gogf/gf/geg/net/gtcp/pkg_operations/common/funcs" "github.com/gogf/gf/geg/net/gtcp/pkg_operations/common/types" - "time" + "github.com/gogf/gf/net/gtcp" + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/os/gtimer" ) func main() { diff --git a/geg/net/gtcp/pkg_operations/common/types/types.go b/example/net/gtcp/pkg_operations/common/types/types.go similarity index 100% rename from geg/net/gtcp/pkg_operations/common/types/types.go rename to example/net/gtcp/pkg_operations/common/types/types.go diff --git a/geg/net/gtcp/pkg_operations/gtcp_basic.go b/example/net/gtcp/pkg_operations/gtcp_basic.go similarity index 85% rename from geg/net/gtcp/pkg_operations/gtcp_basic.go rename to example/net/gtcp/pkg_operations/gtcp_basic.go index 16716d3e4..8927f0586 100644 --- a/geg/net/gtcp/pkg_operations/gtcp_basic.go +++ b/example/net/gtcp/pkg_operations/gtcp_basic.go @@ -2,10 +2,11 @@ package main import ( "fmt" - "github.com/gogf/gf/g/net/gtcp" - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/util/gconv" "time" + + "github.com/gogf/gf/net/gtcp" + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/util/gconv" ) func main() { diff --git a/geg/net/gtcp/pkg_operations/gtcp_empty_data.go b/example/net/gtcp/pkg_operations/gtcp_empty_data.go similarity index 89% rename from geg/net/gtcp/pkg_operations/gtcp_empty_data.go rename to example/net/gtcp/pkg_operations/gtcp_empty_data.go index 32bfaad46..d525ae23a 100644 --- a/geg/net/gtcp/pkg_operations/gtcp_empty_data.go +++ b/example/net/gtcp/pkg_operations/gtcp_empty_data.go @@ -2,9 +2,10 @@ package main import ( "fmt" - "github.com/gogf/gf/g/net/gtcp" - "github.com/gogf/gf/g/os/glog" "time" + + "github.com/gogf/gf/net/gtcp" + "github.com/gogf/gf/os/glog" ) func main() { diff --git a/geg/net/gtcp/pkg_operations/gtcp_pkg_option.go b/example/net/gtcp/pkg_operations/gtcp_pkg_option.go similarity index 85% rename from geg/net/gtcp/pkg_operations/gtcp_pkg_option.go rename to example/net/gtcp/pkg_operations/gtcp_pkg_option.go index c77b461d8..2a2d7dccf 100644 --- a/geg/net/gtcp/pkg_operations/gtcp_pkg_option.go +++ b/example/net/gtcp/pkg_operations/gtcp_pkg_option.go @@ -2,10 +2,11 @@ package main import ( "fmt" - "github.com/gogf/gf/g/net/gtcp" - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/util/gconv" "time" + + "github.com/gogf/gf/net/gtcp" + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/util/gconv" ) func main() { diff --git a/geg/net/gtcp/pkg_operations/monitor/gtcp_monitor_client.go b/example/net/gtcp/pkg_operations/monitor/gtcp_monitor_client.go similarity index 86% rename from geg/net/gtcp/pkg_operations/monitor/gtcp_monitor_client.go rename to example/net/gtcp/pkg_operations/monitor/gtcp_monitor_client.go index 3078dead0..366f505e0 100644 --- a/geg/net/gtcp/pkg_operations/monitor/gtcp_monitor_client.go +++ b/example/net/gtcp/pkg_operations/monitor/gtcp_monitor_client.go @@ -2,11 +2,12 @@ package main import ( "encoding/json" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/gtcp" - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/os/gtime" + + "github.com/gogf/gf/frame/g" "github.com/gogf/gf/geg/net/gtcp/pkg_operations/monitor/types" + "github.com/gogf/gf/net/gtcp" + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/os/gtime" ) func main() { diff --git a/geg/net/gtcp/pkg_operations/monitor/gtcp_monitor_server.go b/example/net/gtcp/pkg_operations/monitor/gtcp_monitor_server.go similarity index 90% rename from geg/net/gtcp/pkg_operations/monitor/gtcp_monitor_server.go rename to example/net/gtcp/pkg_operations/monitor/gtcp_monitor_server.go index d8b2e2979..ef4b9c49f 100644 --- a/geg/net/gtcp/pkg_operations/monitor/gtcp_monitor_server.go +++ b/example/net/gtcp/pkg_operations/monitor/gtcp_monitor_server.go @@ -2,9 +2,10 @@ package main import ( "encoding/json" - "github.com/gogf/gf/g/net/gtcp" - "github.com/gogf/gf/g/os/glog" + "github.com/gogf/gf/geg/net/gtcp/pkg_operations/monitor/types" + "github.com/gogf/gf/net/gtcp" + "github.com/gogf/gf/os/glog" ) func main() { diff --git a/geg/net/gtcp/pkg_operations/monitor/types/types.go b/example/net/gtcp/pkg_operations/monitor/types/types.go similarity index 88% rename from geg/net/gtcp/pkg_operations/monitor/types/types.go rename to example/net/gtcp/pkg_operations/monitor/types/types.go index cbff61467..d0c43ed09 100644 --- a/geg/net/gtcp/pkg_operations/monitor/types/types.go +++ b/example/net/gtcp/pkg_operations/monitor/types/types.go @@ -1,6 +1,6 @@ package types -import "github.com/gogf/gf/g" +import "github.com/gogf/gf/frame/g" type NodeInfo struct { Cpu float32 // CPU百分比(%) diff --git a/geg/net/gtcp/server_client/gtcp_client.go b/example/net/gtcp/server_client/gtcp_client.go similarity index 74% rename from geg/net/gtcp/server_client/gtcp_client.go rename to example/net/gtcp/server_client/gtcp_client.go index 02a35fd4d..a991cad7a 100644 --- a/geg/net/gtcp/server_client/gtcp_client.go +++ b/example/net/gtcp/server_client/gtcp_client.go @@ -1,10 +1,11 @@ package main import ( - "github.com/gogf/gf/g/net/gtcp" - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/util/gconv" "time" + + "github.com/gogf/gf/net/gtcp" + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/util/gconv" ) func main() { diff --git a/geg/net/gtcp/server_client/gtcp_server.go b/example/net/gtcp/server_client/gtcp_server.go similarity index 91% rename from geg/net/gtcp/server_client/gtcp_server.go rename to example/net/gtcp/server_client/gtcp_server.go index b9487eca1..e814f31e8 100644 --- a/geg/net/gtcp/server_client/gtcp_server.go +++ b/example/net/gtcp/server_client/gtcp_server.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g/net/gtcp" + + "github.com/gogf/gf/net/gtcp" ) func main() { diff --git a/geg/net/gtcp/tcp_server_client.go b/example/net/gtcp/tcp_server_client.go similarity index 100% rename from geg/net/gtcp/tcp_server_client.go rename to example/net/gtcp/tcp_server_client.go diff --git a/geg/net/gtcp/tls/gtcp_server_client.go b/example/net/gtcp/tls/gtcp_server_client.go similarity index 90% rename from geg/net/gtcp/tls/gtcp_server_client.go rename to example/net/gtcp/tls/gtcp_server_client.go index cfac328ca..e478620cc 100644 --- a/geg/net/gtcp/tls/gtcp_server_client.go +++ b/example/net/gtcp/tls/gtcp_server_client.go @@ -2,10 +2,11 @@ package main import ( "fmt" - "github.com/gogf/gf/g/net/gtcp" - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/util/gconv" "time" + + "github.com/gogf/gf/net/gtcp" + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/util/gconv" ) func main() { diff --git a/geg/net/gtcp/tls/server.crt b/example/net/gtcp/tls/server.crt similarity index 100% rename from geg/net/gtcp/tls/server.crt rename to example/net/gtcp/tls/server.crt diff --git a/geg/net/gtcp/tls/server.key b/example/net/gtcp/tls/server.key similarity index 100% rename from geg/net/gtcp/tls/server.key rename to example/net/gtcp/tls/server.key diff --git a/geg/net/gtcp/tls/server.key.public b/example/net/gtcp/tls/server.key.public similarity index 100% rename from geg/net/gtcp/tls/server.key.public rename to example/net/gtcp/tls/server.key.public diff --git a/geg/net/gudp/gudp_server.go b/example/net/gudp/gudp_server.go similarity index 86% rename from geg/net/gudp/gudp_server.go rename to example/net/gudp/gudp_server.go index 3facc3397..b3d739798 100644 --- a/geg/net/gudp/gudp_server.go +++ b/example/net/gudp/gudp_server.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g/net/gudp" + + "github.com/gogf/gf/net/gudp" ) func main() { diff --git a/geg/net/gudp/gudp_server_client.go b/example/net/gudp/gudp_server_client.go similarity index 88% rename from geg/net/gudp/gudp_server_client.go rename to example/net/gudp/gudp_server_client.go index d8c5ec844..720e1052e 100644 --- a/geg/net/gudp/gudp_server_client.go +++ b/example/net/gudp/gudp_server_client.go @@ -2,10 +2,11 @@ package main import ( "fmt" - "github.com/gogf/gf/g/net/gudp" - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/os/gtime" "time" + + "github.com/gogf/gf/net/gudp" + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/os/gtime" ) func main() { diff --git a/geg/net/gudp/udp_client.go b/example/net/gudp/udp_client.go similarity index 100% rename from geg/net/gudp/udp_client.go rename to example/net/gudp/udp_client.go diff --git a/geg/net/gudp/udp_server.go b/example/net/gudp/udp_server.go similarity index 100% rename from geg/net/gudp/udp_server.go rename to example/net/gudp/udp_server.go diff --git a/geg/os/console.go b/example/os/console.go similarity index 87% rename from geg/os/console.go rename to example/os/console.go index 534675a80..c3d7f80a7 100644 --- a/geg/os/console.go +++ b/example/os/console.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g/os/gcmd" + + "github.com/gogf/gf/os/gcmd" ) func doEcho() { diff --git a/geg/os/gcache/usage_basic.go b/example/os/gcache/usage_basic.go similarity index 93% rename from geg/os/gcache/usage_basic.go rename to example/os/gcache/usage_basic.go index 88738819b..a60450689 100644 --- a/geg/os/gcache/usage_basic.go +++ b/example/os/gcache/usage_basic.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g/os/gcache" + + "github.com/gogf/gf/os/gcache" ) func main() { diff --git a/geg/os/gcache/usage_lru.go b/example/os/gcache/usage_lru.go similarity index 93% rename from geg/os/gcache/usage_lru.go rename to example/os/gcache/usage_lru.go index 5fe53f044..7671c311d 100644 --- a/geg/os/gcache/usage_lru.go +++ b/example/os/gcache/usage_lru.go @@ -2,8 +2,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g/os/gcache" "time" + + "github.com/gogf/gf/os/gcache" ) func main() { diff --git a/geg/os/gcache/usage_senior.go b/example/os/gcache/usage_senior.go similarity index 94% rename from geg/os/gcache/usage_senior.go rename to example/os/gcache/usage_senior.go index 65b7aa945..b82a48344 100644 --- a/geg/os/gcache/usage_senior.go +++ b/example/os/gcache/usage_senior.go @@ -2,8 +2,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g/os/gcache" "time" + + "github.com/gogf/gf/os/gcache" ) func main() { diff --git a/geg/os/gcfg/config.json b/example/os/gcfg/config.json similarity index 100% rename from geg/os/gcfg/config.json rename to example/os/gcfg/config.json diff --git a/geg/os/gcfg/config.toml b/example/os/gcfg/config.toml similarity index 100% rename from geg/os/gcfg/config.toml rename to example/os/gcfg/config.toml diff --git a/geg/os/gcfg/gcfg1.go b/example/os/gcfg/gcfg1.go similarity index 89% rename from geg/os/gcfg/gcfg1.go rename to example/os/gcfg/gcfg1.go index 1f5f16c58..722793aba 100644 --- a/geg/os/gcfg/gcfg1.go +++ b/example/os/gcfg/gcfg1.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g" + + "github.com/gogf/gf/frame/g" ) // 使用第二个参数指定读取的配置文件 diff --git a/geg/os/gcfg/gcfg2.go b/example/os/gcfg/gcfg2.go similarity index 83% rename from geg/os/gcfg/gcfg2.go rename to example/os/gcfg/gcfg2.go index 97dc0180e..464deaee7 100644 --- a/geg/os/gcfg/gcfg2.go +++ b/example/os/gcfg/gcfg2.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g" + + "github.com/gogf/gf/frame/g" ) // 使用默认的config.toml配置文件读取配置 diff --git a/geg/os/gcfg/gcfg3.go b/example/os/gcfg/gcfg3.go similarity index 81% rename from geg/os/gcfg/gcfg3.go rename to example/os/gcfg/gcfg3.go index a272af47a..ebc6c994e 100644 --- a/geg/os/gcfg/gcfg3.go +++ b/example/os/gcfg/gcfg3.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g" + + "github.com/gogf/gf/frame/g" ) // 使用GetVar获取动态变量 diff --git a/geg/os/gcfg/gcfg4.go b/example/os/gcfg/gcfg4.go similarity index 85% rename from geg/os/gcfg/gcfg4.go rename to example/os/gcfg/gcfg4.go index be32a83ae..b81b398c1 100644 --- a/geg/os/gcfg/gcfg4.go +++ b/example/os/gcfg/gcfg4.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g" + + "github.com/gogf/gf/frame/g" ) // 使用g.Config方法获取配置管理对象，并指定默认的配置文件名称 diff --git a/geg/os/gcfg/gcfg_auto_update.go b/example/os/gcfg/gcfg_auto_update.go similarity index 84% rename from geg/os/gcfg/gcfg_auto_update.go rename to example/os/gcfg/gcfg_auto_update.go index c010a1296..5b01af63f 100644 --- a/geg/os/gcfg/gcfg_auto_update.go +++ b/example/os/gcfg/gcfg_auto_update.go @@ -2,9 +2,10 @@ package main import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/os/gtime" "time" + + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/os/gtime" ) // 配置文件热更新示例 diff --git a/geg/os/gcfg/gcfg_error.go b/example/os/gcfg/gcfg_error.go similarity index 83% rename from geg/os/gcfg/gcfg_error.go rename to example/os/gcfg/gcfg_error.go index 268850876..9a4852c3c 100644 --- a/geg/os/gcfg/gcfg_error.go +++ b/example/os/gcfg/gcfg_error.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g" + + "github.com/gogf/gf/frame/g" ) // 演示在找不到配置文件时的错误提示 diff --git a/geg/os/gcfg/memcache.yml b/example/os/gcfg/memcache.yml similarity index 100% rename from geg/os/gcfg/memcache.yml rename to example/os/gcfg/memcache.yml diff --git a/geg/os/gcfg/redis.toml b/example/os/gcfg/redis.toml similarity index 100% rename from geg/os/gcfg/redis.toml rename to example/os/gcfg/redis.toml diff --git a/geg/os/gcmd/gcmd1.go b/example/os/gcmd/gcmd1.go similarity index 87% rename from geg/os/gcmd/gcmd1.go rename to example/os/gcmd/gcmd1.go index 686c3189f..562024415 100644 --- a/geg/os/gcmd/gcmd1.go +++ b/example/os/gcmd/gcmd1.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g/os/gcmd" + + "github.com/gogf/gf/os/gcmd" ) func help() { diff --git a/geg/os/gcron/gcron-log.go b/example/os/gcron/gcron-log.go similarity index 73% rename from geg/os/gcron/gcron-log.go rename to example/os/gcron/gcron-log.go index 7424d8924..3a87ec5b9 100644 --- a/geg/os/gcron/gcron-log.go +++ b/example/os/gcron/gcron-log.go @@ -1,9 +1,10 @@ package main import ( - "github.com/gogf/gf/g/os/gcron" - "github.com/gogf/gf/g/os/glog" "time" + + "github.com/gogf/gf/os/gcron" + "github.com/gogf/gf/os/glog" ) func main() { diff --git a/geg/os/gcron/gcron1.go b/example/os/gcron/gcron1.go similarity index 91% rename from geg/os/gcron/gcron1.go rename to example/os/gcron/gcron1.go index d42057fa4..4e14cca8f 100644 --- a/geg/os/gcron/gcron1.go +++ b/example/os/gcron/gcron1.go @@ -1,9 +1,10 @@ package main import ( - "github.com/gogf/gf/g/os/gcron" - "github.com/gogf/gf/g/os/glog" "time" + + "github.com/gogf/gf/os/gcron" + "github.com/gogf/gf/os/glog" ) func main() { diff --git a/geg/os/gcron/gcron2.go b/example/os/gcron/gcron2.go similarity index 74% rename from geg/os/gcron/gcron2.go rename to example/os/gcron/gcron2.go index 931317e40..e5ea85ec9 100644 --- a/geg/os/gcron/gcron2.go +++ b/example/os/gcron/gcron2.go @@ -1,9 +1,10 @@ package main import ( - "github.com/gogf/gf/g/os/gcron" - "github.com/gogf/gf/g/os/glog" "time" + + "github.com/gogf/gf/os/gcron" + "github.com/gogf/gf/os/glog" ) func test() { diff --git a/geg/os/gfcache/gfcache.go b/example/os/gfcache/gfcache.go similarity index 86% rename from geg/os/gfcache/gfcache.go rename to example/os/gfcache/gfcache.go index 9515012f4..d66d345ca 100644 --- a/geg/os/gfcache/gfcache.go +++ b/example/os/gfcache/gfcache.go @@ -2,9 +2,10 @@ package main import ( "fmt" - "github.com/gogf/gf/g/os/gfcache" - "github.com/gogf/gf/g/os/gfile" "time" + + "github.com/gogf/gf/os/gfcache" + "github.com/gogf/gf/os/gfile" ) func main() { diff --git a/geg/os/gfile/gfile.go b/example/os/gfile/gfile.go similarity index 91% rename from geg/os/gfile/gfile.go rename to example/os/gfile/gfile.go index b2d1835c0..e40b747f2 100644 --- a/geg/os/gfile/gfile.go +++ b/example/os/gfile/gfile.go @@ -2,8 +2,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/util/gutil" + + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/util/gutil" ) var dirpath1 = "/home/john/Workspace/temp/" diff --git a/geg/os/gfile/gfile_contents.go b/example/os/gfile/gfile_contents.go similarity index 92% rename from geg/os/gfile/gfile_contents.go rename to example/os/gfile/gfile_contents.go index 96e45ee7f..ed093c3c0 100644 --- a/geg/os/gfile/gfile_contents.go +++ b/example/os/gfile/gfile_contents.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g/os/gfile" + + "github.com/gogf/gf/os/gfile" ) func main() { diff --git a/geg/os/gfile/gfile_scan.go b/example/os/gfile/gfile_scan.go similarity index 71% rename from geg/os/gfile/gfile_scan.go rename to example/os/gfile/gfile_scan.go index 31c25b29e..08120909a 100644 --- a/geg/os/gfile/gfile_scan.go +++ b/example/os/gfile/gfile_scan.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/util/gutil" + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/util/gutil" ) func main() { diff --git a/geg/os/gflock/flock.go b/example/os/gflock/flock.go similarity index 72% rename from geg/os/gflock/flock.go rename to example/os/gflock/flock.go index 5d9271383..f84b61adb 100644 --- a/geg/os/gflock/flock.go +++ b/example/os/gflock/flock.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/gogf/gf/third/github.com/theckman/go-flock" + "github.com/gogf/gf/internal/thirdparty/github.com/theckman/go-flock" ) func main() { diff --git a/geg/os/gflock/gflock.go b/example/os/gflock/gflock.go similarity index 69% rename from geg/os/gflock/gflock.go rename to example/os/gflock/gflock.go index 07b3b8033..518a59f3b 100644 --- a/geg/os/gflock/gflock.go +++ b/example/os/gflock/gflock.go @@ -3,9 +3,9 @@ package main import ( "time" - "github.com/gogf/gf/g/os/gflock" - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/os/gproc" + "github.com/gogf/gf/os/gflock" + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/os/gproc" ) func main() { diff --git a/geg/os/gfpool/gfpool.go b/example/os/gfpool/gfpool.go similarity index 88% rename from geg/os/gfpool/gfpool.go rename to example/os/gfpool/gfpool.go index 888d67c4a..c7f1570f8 100644 --- a/geg/os/gfpool/gfpool.go +++ b/example/os/gfpool/gfpool.go @@ -2,9 +2,10 @@ package main import ( "fmt" - "github.com/gogf/gf/g/os/gfpool" "os" "time" + + "github.com/gogf/gf/os/gfpool" ) func main() { diff --git a/geg/os/gfsnotify/fsnotify.go b/example/os/gfsnotify/fsnotify.go similarity index 87% rename from geg/os/gfsnotify/fsnotify.go rename to example/os/gfsnotify/fsnotify.go index 54417492f..c9ca14eac 100644 --- a/geg/os/gfsnotify/fsnotify.go +++ b/example/os/gfsnotify/fsnotify.go @@ -1,9 +1,10 @@ package main import ( - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/third/github.com/fsnotify/fsnotify" "log" + + "github.com/gogf/gf/internal/thirdparty/github.com/fsnotify/fsnotify" + "github.com/gogf/gf/os/glog" ) func main() { diff --git a/geg/os/gfsnotify/gfsnotify.go b/example/os/gfsnotify/gfsnotify.go similarity index 77% rename from geg/os/gfsnotify/gfsnotify.go rename to example/os/gfsnotify/gfsnotify.go index f93992764..cb5c87dc1 100644 --- a/geg/os/gfsnotify/gfsnotify.go +++ b/example/os/gfsnotify/gfsnotify.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g/os/gfsnotify" - "github.com/gogf/gf/g/os/glog" + "github.com/gogf/gf/os/gfsnotify" + "github.com/gogf/gf/os/glog" ) func main() { diff --git a/geg/os/gfsnotify/gfsnotify_callback.go b/example/os/gfsnotify/gfsnotify_callback.go similarity index 87% rename from geg/os/gfsnotify/gfsnotify_callback.go rename to example/os/gfsnotify/gfsnotify_callback.go index a246ad2f2..897aedda1 100644 --- a/geg/os/gfsnotify/gfsnotify_callback.go +++ b/example/os/gfsnotify/gfsnotify_callback.go @@ -1,10 +1,11 @@ package main import ( - "github.com/gogf/gf/g/os/gfsnotify" - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/os/gtimer" "time" + + "github.com/gogf/gf/os/gfsnotify" + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/os/gtimer" ) func main() { diff --git a/geg/os/gfsnotify/gfsnotify_callback_folder.go b/example/os/gfsnotify/gfsnotify_callback_folder.go similarity index 82% rename from geg/os/gfsnotify/gfsnotify_callback_folder.go rename to example/os/gfsnotify/gfsnotify_callback_folder.go index 1c9a83b1d..d94514790 100644 --- a/geg/os/gfsnotify/gfsnotify_callback_folder.go +++ b/example/os/gfsnotify/gfsnotify_callback_folder.go @@ -1,10 +1,11 @@ package main import ( - "github.com/gogf/gf/g/os/gfsnotify" - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/os/gtimer" "time" + + "github.com/gogf/gf/os/gfsnotify" + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/os/gtimer" ) func main() { diff --git a/geg/os/gfsnotify/gfsnotify_limit.go b/example/os/gfsnotify/gfsnotify_limit.go similarity index 81% rename from geg/os/gfsnotify/gfsnotify_limit.go rename to example/os/gfsnotify/gfsnotify_limit.go index 96776169e..600541bf9 100644 --- a/geg/os/gfsnotify/gfsnotify_limit.go +++ b/example/os/gfsnotify/gfsnotify_limit.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g/os/gfsnotify" - "github.com/gogf/gf/g/os/glog" + "github.com/gogf/gf/os/gfsnotify" + "github.com/gogf/gf/os/glog" ) // 对同一个文件多次Add是否超过系统inotify限制 diff --git a/geg/os/glog/glog_async1.go b/example/os/glog/glog_async1.go similarity index 81% rename from geg/os/glog/glog_async1.go rename to example/os/glog/glog_async1.go index 0825f2f39..1f17d1c25 100644 --- a/geg/os/glog/glog_async1.go +++ b/example/os/glog/glog_async1.go @@ -1,8 +1,9 @@ package main import ( - "github.com/gogf/gf/g/os/glog" "time" + + "github.com/gogf/gf/os/glog" ) func main() { diff --git a/geg/os/glog/glog_async2.go b/example/os/glog/glog_async2.go similarity index 83% rename from geg/os/glog/glog_async2.go rename to example/os/glog/glog_async2.go index 3170d0f23..63d6f4278 100644 --- a/geg/os/glog/glog_async2.go +++ b/example/os/glog/glog_async2.go @@ -1,8 +1,9 @@ package main import ( - "github.com/gogf/gf/g/os/glog" "time" + + "github.com/gogf/gf/os/glog" ) func main() { diff --git a/geg/os/glog/glog_category.go b/example/os/glog/glog_category.go similarity index 70% rename from geg/os/glog/glog_category.go rename to example/os/glog/glog_category.go index 3df48a275..47c56ccf4 100644 --- a/geg/os/glog/glog_category.go +++ b/example/os/glog/glog_category.go @@ -1,9 +1,9 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/os/glog" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/os/glog" ) func main() { diff --git a/geg/os/glog/glog_debug.go b/example/os/glog/glog_debug.go similarity index 65% rename from geg/os/glog/glog_debug.go rename to example/os/glog/glog_debug.go index faa4f1c9e..64ec9c277 100644 --- a/geg/os/glog/glog_debug.go +++ b/example/os/glog/glog_debug.go @@ -1,10 +1,11 @@ package main import ( - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/os/gtime" - "github.com/gogf/gf/g/os/gtimer" "time" + + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/os/gtime" + "github.com/gogf/gf/os/gtimer" ) func main() { diff --git a/geg/os/glog/glog_error.go b/example/os/glog/glog_error.go similarity index 69% rename from geg/os/glog/glog_error.go rename to example/os/glog/glog_error.go index 1a145d768..3eca662b7 100644 --- a/geg/os/glog/glog_error.go +++ b/example/os/glog/glog_error.go @@ -1,6 +1,6 @@ package main -import "github.com/gogf/gf/g/os/glog" +import "github.com/gogf/gf/os/glog" func Test() { glog.Error("This is error!") diff --git a/geg/os/glog/glog_file.go b/example/os/glog/glog_file.go similarity index 88% rename from geg/os/glog/glog_file.go rename to example/os/glog/glog_file.go index 29797dff0..6a0843dac 100644 --- a/geg/os/glog/glog_file.go +++ b/example/os/glog/glog_file.go @@ -1,9 +1,9 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/os/glog" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/os/glog" ) // 设置日志等级 diff --git a/geg/os/glog/glog_flags.go b/example/os/glog/glog_flags.go similarity index 91% rename from geg/os/glog/glog_flags.go rename to example/os/glog/glog_flags.go index 70dbc5233..ebb3894c3 100644 --- a/geg/os/glog/glog_flags.go +++ b/example/os/glog/glog_flags.go @@ -1,7 +1,7 @@ package main import ( - "github.com/gogf/gf/g/os/glog" + "github.com/gogf/gf/os/glog" ) func main() { diff --git a/geg/os/glog/glog_gerror.go b/example/os/glog/glog_gerror.go similarity index 82% rename from geg/os/glog/glog_gerror.go rename to example/os/glog/glog_gerror.go index f5837c871..cbcf405c0 100644 --- a/geg/os/glog/glog_gerror.go +++ b/example/os/glog/glog_gerror.go @@ -2,8 +2,9 @@ package main import ( "errors" - "github.com/gogf/gf/g/errors/gerror" - "github.com/gogf/gf/g/os/glog" + + "github.com/gogf/gf/errors/gerror" + "github.com/gogf/gf/os/glog" ) func MakeError() error { diff --git a/geg/os/glog/glog_json.go b/example/os/glog/glog_json.go similarity index 76% rename from geg/os/glog/glog_json.go rename to example/os/glog/glog_json.go index b3e51a742..f1e28944e 100644 --- a/geg/os/glog/glog_json.go +++ b/example/os/glog/glog_json.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/os/glog" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/os/glog" ) func main() { diff --git a/geg/os/glog/glog_level.go b/example/os/glog/glog_level.go similarity index 85% rename from geg/os/glog/glog_level.go rename to example/os/glog/glog_level.go index 9dba31144..c1e07f736 100644 --- a/geg/os/glog/glog_level.go +++ b/example/os/glog/glog_level.go @@ -1,7 +1,7 @@ package main import ( - "github.com/gogf/gf/g/os/glog" + "github.com/gogf/gf/os/glog" ) // 设置日志等级，过滤掉Info日志信息 diff --git a/geg/os/glog/glog_line.go b/example/os/glog/glog_line.go similarity index 84% rename from geg/os/glog/glog_line.go rename to example/os/glog/glog_line.go index ab28cb622..4ee2ad1a1 100644 --- a/geg/os/glog/glog_line.go +++ b/example/os/glog/glog_line.go @@ -1,7 +1,7 @@ package main import ( - "github.com/gogf/gf/g/os/glog" + "github.com/gogf/gf/os/glog" ) func main() { diff --git a/geg/os/glog/glog_line2.go b/example/os/glog/glog_line2.go similarity index 87% rename from geg/os/glog/glog_line2.go rename to example/os/glog/glog_line2.go index 2da381896..b694f7b92 100644 --- a/geg/os/glog/glog_line2.go +++ b/example/os/glog/glog_line2.go @@ -1,7 +1,7 @@ package main import ( - "github.com/gogf/gf/g/os/glog" + "github.com/gogf/gf/os/glog" ) func PrintLog(content string) { diff --git a/geg/os/glog/glog_path.go b/example/os/glog/glog_path.go similarity index 69% rename from geg/os/glog/glog_path.go rename to example/os/glog/glog_path.go index 300ca6ccc..913a037ab 100644 --- a/geg/os/glog/glog_path.go +++ b/example/os/glog/glog_path.go @@ -1,9 +1,9 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/os/glog" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/os/glog" ) // 设置日志输出路径 diff --git a/geg/os/glog/glog_pool.go b/example/os/glog/glog_pool.go similarity index 78% rename from geg/os/glog/glog_pool.go rename to example/os/glog/glog_pool.go index bf1428468..383b74367 100644 --- a/geg/os/glog/glog_pool.go +++ b/example/os/glog/glog_pool.go @@ -1,9 +1,10 @@ package main import ( - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/os/gtime" "time" + + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/os/gtime" ) // 测试删除日志文件是否会重建日志文件 diff --git a/geg/os/glog/glog_prefix.go b/example/os/glog/glog_prefix.go similarity index 80% rename from geg/os/glog/glog_prefix.go rename to example/os/glog/glog_prefix.go index 7ce5a3d61..502467128 100644 --- a/geg/os/glog/glog_prefix.go +++ b/example/os/glog/glog_prefix.go @@ -1,7 +1,7 @@ package main import ( - "github.com/gogf/gf/g/os/glog" + "github.com/gogf/gf/os/glog" ) func main() { diff --git a/geg/os/glog/glog_stack.go b/example/os/glog/glog_stack.go similarity index 83% rename from geg/os/glog/glog_stack.go rename to example/os/glog/glog_stack.go index 26e69ad26..1232c2bec 100644 --- a/geg/os/glog/glog_stack.go +++ b/example/os/glog/glog_stack.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "github.com/gogf/gf/g/os/glog" + "github.com/gogf/gf/os/glog" ) func main() { diff --git a/geg/os/glog/glog_stdout.go b/example/os/glog/glog_stdout.go similarity index 89% rename from geg/os/glog/glog_stdout.go rename to example/os/glog/glog_stdout.go index d823105fb..4d2200028 100644 --- a/geg/os/glog/glog_stdout.go +++ b/example/os/glog/glog_stdout.go @@ -1,8 +1,9 @@ package main import ( - "github.com/gogf/gf/g/os/glog" "sync" + + "github.com/gogf/gf/os/glog" ) func main() { diff --git a/geg/os/glog/glog_writer_greylog.go b/example/os/glog/glog_writer_greylog.go similarity index 94% rename from geg/os/glog/glog_writer_greylog.go rename to example/os/glog/glog_writer_greylog.go index 7d154fa62..fddf60daf 100644 --- a/geg/os/glog/glog_writer_greylog.go +++ b/example/os/glog/glog_writer_greylog.go @@ -1,7 +1,7 @@ package main //import ( -// "github.com/gogf/gf/g/os/glog" +// "github.com/gogf/gf/os/glog" // "github.com/robertkowalski/graylog-golang" //) // diff --git a/geg/os/glog/glog_writer_hook.go b/example/os/glog/glog_writer_hook.go similarity index 82% rename from geg/os/glog/glog_writer_hook.go rename to example/os/glog/glog_writer_hook.go index ccb649b66..67e8863ca 100644 --- a/geg/os/glog/glog_writer_hook.go +++ b/example/os/glog/glog_writer_hook.go @@ -2,9 +2,10 @@ package main import ( "fmt" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/text/gregex" + + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/text/gregex" ) type MyWriter struct { diff --git a/geg/os/gmlock/locker1.go b/example/os/gmlock/locker1.go similarity index 82% rename from geg/os/gmlock/locker1.go rename to example/os/gmlock/locker1.go index 9061702b2..946ae72b4 100644 --- a/geg/os/gmlock/locker1.go +++ b/example/os/gmlock/locker1.go @@ -1,10 +1,11 @@ package main import ( - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/os/gmlock" "sync" "time" + + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/os/gmlock" ) // 内存锁基本使用 diff --git a/geg/os/gmlock/locker2.go b/example/os/gmlock/locker2.go similarity index 79% rename from geg/os/gmlock/locker2.go rename to example/os/gmlock/locker2.go index 0f4b05c66..f340a25c9 100644 --- a/geg/os/gmlock/locker2.go +++ b/example/os/gmlock/locker2.go @@ -1,9 +1,10 @@ package main import ( - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/os/gmlock" "sync" + + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/os/gmlock" ) // 内存锁 - 给定过期时间 diff --git a/geg/os/gmlock/locker3.go b/example/os/gmlock/locker3.go similarity index 84% rename from geg/os/gmlock/locker3.go rename to example/os/gmlock/locker3.go index e0ea80a83..6eca22f82 100644 --- a/geg/os/gmlock/locker3.go +++ b/example/os/gmlock/locker3.go @@ -1,10 +1,11 @@ package main import ( - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/os/gmlock" "sync" "time" + + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/os/gmlock" ) // 内存锁 - TryLock diff --git a/geg/os/gmlock/locker4.go b/example/os/gmlock/locker4.go similarity index 91% rename from geg/os/gmlock/locker4.go rename to example/os/gmlock/locker4.go index 530d91bf7..a7d8df5f4 100644 --- a/geg/os/gmlock/locker4.go +++ b/example/os/gmlock/locker4.go @@ -2,9 +2,10 @@ package main import ( "fmt" - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/os/gmlock" "time" + + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/os/gmlock" ) // 内存锁 - 手动Unlock与计时Unlock冲突校验 diff --git a/geg/os/gmlock/test_locker.go b/example/os/gmlock/test_locker.go similarity index 97% rename from geg/os/gmlock/test_locker.go rename to example/os/gmlock/test_locker.go index 44977ea5d..3600e36b6 100644 --- a/geg/os/gmlock/test_locker.go +++ b/example/os/gmlock/test_locker.go @@ -2,10 +2,11 @@ package main import ( "fmt" - "github.com/gogf/gf/g/os/gmlock" "math/rand" "sync" "time" + + "github.com/gogf/gf/os/gmlock" ) // 测试Locker是否会产生死锁 diff --git a/geg/os/gmlock/test_mutex.go b/example/os/gmlock/test_mutex.go similarity index 97% rename from geg/os/gmlock/test_mutex.go rename to example/os/gmlock/test_mutex.go index 92a9a1b11..c03874e70 100644 --- a/geg/os/gmlock/test_mutex.go +++ b/example/os/gmlock/test_mutex.go @@ -2,10 +2,11 @@ package main import ( "fmt" - "github.com/gogf/gf/g/os/gmlock" "math/rand" "sync" "time" + + "github.com/gogf/gf/os/gmlock" ) // 测试是否会产生死锁 diff --git a/geg/os/gmutex/gmutex_basic.go b/example/os/gmutex/gmutex_basic.go similarity index 85% rename from geg/os/gmutex/gmutex_basic.go rename to example/os/gmutex/gmutex_basic.go index 4970db04a..e89bbcd3d 100644 --- a/geg/os/gmutex/gmutex_basic.go +++ b/example/os/gmutex/gmutex_basic.go @@ -3,8 +3,8 @@ package main import ( "time" - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/os/gmutex" + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/os/gmutex" ) func main() { diff --git a/geg/os/gmutex/gmutex_func.go b/example/os/gmutex/gmutex_func.go similarity index 80% rename from geg/os/gmutex/gmutex_func.go rename to example/os/gmutex/gmutex_func.go index b0ed83c52..b26308736 100644 --- a/geg/os/gmutex/gmutex_func.go +++ b/example/os/gmutex/gmutex_func.go @@ -3,9 +3,9 @@ package main import ( "time" - "github.com/gogf/gf/g/os/glog" + "github.com/gogf/gf/os/glog" - "github.com/gogf/gf/g/os/gmutex" + "github.com/gogf/gf/os/gmutex" ) func main() { diff --git a/geg/os/gproc/gproc.go b/example/os/gproc/gproc.go similarity index 89% rename from geg/os/gproc/gproc.go rename to example/os/gproc/gproc.go index f0599d4bd..f3629e82c 100644 --- a/geg/os/gproc/gproc.go +++ b/example/os/gproc/gproc.go @@ -1,10 +1,11 @@ package main import ( - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/os/gproc" "os" "time" + + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/os/gproc" ) // 父子进程基本演示 diff --git a/geg/os/gproc/gproc2.go b/example/os/gproc/gproc2.go similarity index 88% rename from geg/os/gproc/gproc2.go rename to example/os/gproc/gproc2.go index b49690874..5d7ae092f 100644 --- a/geg/os/gproc/gproc2.go +++ b/example/os/gproc/gproc2.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g/os/gproc" + + "github.com/gogf/gf/os/gproc" ) // 使用gproc kill指定其他进程(清确保运行该程序的用户有足够权限) diff --git a/geg/os/gproc/gproc3.go b/example/os/gproc/gproc3.go similarity index 93% rename from geg/os/gproc/gproc3.go rename to example/os/gproc/gproc3.go index a44fefe7e..0d1202227 100644 --- a/geg/os/gproc/gproc3.go +++ b/example/os/gproc/gproc3.go @@ -1,10 +1,11 @@ package main import ( - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/os/gproc" "os" "time" + + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/os/gproc" ) // 父进程销毁后，使用进程管理器查看存活的子进程。 diff --git a/geg/os/gproc/gproc4.go b/example/os/gproc/gproc4.go similarity index 71% rename from geg/os/gproc/gproc4.go rename to example/os/gproc/gproc4.go index cdc24ddcf..2b7caeb75 100644 --- a/geg/os/gproc/gproc4.go +++ b/example/os/gproc/gproc4.go @@ -1,11 +1,12 @@ package main import ( - "github.com/gogf/gf/g/os/genv" - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/os/gproc" "os" "time" + + "github.com/gogf/gf/os/genv" + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/os/gproc" ) // 查看父子进程的环境变量 diff --git a/geg/os/gproc/gproc_comm.go b/example/os/gproc/gproc_comm.go similarity index 84% rename from geg/os/gproc/gproc_comm.go rename to example/os/gproc/gproc_comm.go index 1a2d912ef..88afde9fe 100644 --- a/geg/os/gproc/gproc_comm.go +++ b/example/os/gproc/gproc_comm.go @@ -5,12 +5,13 @@ package main import ( "fmt" - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/os/gproc" - "github.com/gogf/gf/g/os/gtime" - "github.com/gogf/gf/g/os/gtimer" "os" "time" + + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/os/gproc" + "github.com/gogf/gf/os/gtime" + "github.com/gogf/gf/os/gtimer" ) func main() { diff --git a/geg/os/gproc/gproc_comm_group.go b/example/os/gproc/gproc_comm_group.go similarity index 95% rename from geg/os/gproc/gproc_comm_group.go rename to example/os/gproc/gproc_comm_group.go index ea516000c..13191ed74 100644 --- a/geg/os/gproc/gproc_comm_group.go +++ b/example/os/gproc/gproc_comm_group.go @@ -3,10 +3,11 @@ package main import ( "fmt" - "github.com/gogf/gf/g/os/gproc" - "github.com/gogf/gf/g/os/gtime" "os" "time" + + "github.com/gogf/gf/os/gproc" + "github.com/gogf/gf/os/gtime" ) func main() { diff --git a/geg/os/gproc/gproc_comm_send.go b/example/os/gproc/gproc_comm_send.go similarity index 81% rename from geg/os/gproc/gproc_comm_send.go rename to example/os/gproc/gproc_comm_send.go index ebf2ae4fd..c29b2cf35 100644 --- a/geg/os/gproc/gproc_comm_send.go +++ b/example/os/gproc/gproc_comm_send.go @@ -3,7 +3,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g/os/gproc" + + "github.com/gogf/gf/os/gproc" ) func main() { diff --git a/geg/os/gproc/gproc_shellexec.go b/example/os/gproc/gproc_shellexec.go similarity index 83% rename from geg/os/gproc/gproc_shellexec.go rename to example/os/gproc/gproc_shellexec.go index 0f78fae3c..7ba255193 100644 --- a/geg/os/gproc/gproc_shellexec.go +++ b/example/os/gproc/gproc_shellexec.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g/os/gproc" + + "github.com/gogf/gf/os/gproc" ) // 执行shell指令 diff --git a/geg/os/grpool/goroutine.go b/example/os/grpool/goroutine.go similarity index 89% rename from geg/os/grpool/goroutine.go rename to example/os/grpool/goroutine.go index 76e94163b..f31af0a9d 100644 --- a/geg/os/grpool/goroutine.go +++ b/example/os/grpool/goroutine.go @@ -2,9 +2,10 @@ package main import ( "fmt" - "github.com/gogf/gf/g/os/gtime" "sync" "time" + + "github.com/gogf/gf/os/gtime" ) func main() { diff --git a/geg/os/grpool/grpool.go b/example/os/grpool/grpool.go similarity index 82% rename from geg/os/grpool/grpool.go rename to example/os/grpool/grpool.go index 7cecfa067..e02776fb8 100644 --- a/geg/os/grpool/grpool.go +++ b/example/os/grpool/grpool.go @@ -2,10 +2,11 @@ package main import ( "fmt" - "github.com/gogf/gf/g/os/grpool" - "github.com/gogf/gf/g/os/gtime" "sync" "time" + + "github.com/gogf/gf/os/grpool" + "github.com/gogf/gf/os/gtime" ) func main() { diff --git a/geg/os/grpool/grpool1.go b/example/os/grpool/grpool1.go similarity index 85% rename from geg/os/grpool/grpool1.go rename to example/os/grpool/grpool1.go index 4aec3d922..311e6a0de 100644 --- a/geg/os/grpool/grpool1.go +++ b/example/os/grpool/grpool1.go @@ -2,9 +2,10 @@ package main import ( "fmt" - "github.com/gogf/gf/g/os/grpool" - "github.com/gogf/gf/g/os/gtimer" "time" + + "github.com/gogf/gf/os/grpool" + "github.com/gogf/gf/os/gtimer" ) func job() { diff --git a/geg/os/grpool/grpool2.go b/example/os/grpool/grpool2.go similarity index 85% rename from geg/os/grpool/grpool2.go rename to example/os/grpool/grpool2.go index 72bfbb0b5..1494763f5 100644 --- a/geg/os/grpool/grpool2.go +++ b/example/os/grpool/grpool2.go @@ -2,8 +2,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g/os/grpool" "sync" + + "github.com/gogf/gf/os/grpool" ) func main() { diff --git a/geg/os/grpool/grpool3.go b/example/os/grpool/grpool3.go similarity index 86% rename from geg/os/grpool/grpool3.go rename to example/os/grpool/grpool3.go index 24b70f33e..c7738000a 100644 --- a/geg/os/grpool/grpool3.go +++ b/example/os/grpool/grpool3.go @@ -2,8 +2,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g/os/grpool" "sync" + + "github.com/gogf/gf/os/grpool" ) func main() { diff --git a/geg/os/grpool/grpool4.go b/example/os/grpool/grpool4.go similarity index 100% rename from geg/os/grpool/grpool4.go rename to example/os/grpool/grpool4.go diff --git a/geg/os/grpool/grpool5.go b/example/os/grpool/grpool5.go similarity index 86% rename from geg/os/grpool/grpool5.go rename to example/os/grpool/grpool5.go index d006df6ef..7f6b7e2d6 100644 --- a/geg/os/grpool/grpool5.go +++ b/example/os/grpool/grpool5.go @@ -2,8 +2,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g/os/grpool" "time" + + "github.com/gogf/gf/os/grpool" ) func main() { diff --git a/geg/os/gspath/gspath.go b/example/os/gspath/gspath.go similarity index 75% rename from geg/os/gspath/gspath.go rename to example/os/gspath/gspath.go index 91d9bd701..494ae5893 100644 --- a/geg/os/gspath/gspath.go +++ b/example/os/gspath/gspath.go @@ -2,10 +2,11 @@ package main import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/os/gspath" - "github.com/gogf/gf/g/os/gtime" "time" + + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/os/gspath" + "github.com/gogf/gf/os/gtime" ) func main() { diff --git a/geg/os/gtime/gtime_format.go b/example/os/gtime/gtime_format.go similarity index 89% rename from geg/os/gtime/gtime_format.go rename to example/os/gtime/gtime_format.go index 10f15f0e7..636fd682e 100644 --- a/geg/os/gtime/gtime_format.go +++ b/example/os/gtime/gtime_format.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g/os/gtime" + + "github.com/gogf/gf/os/gtime" ) func main() { diff --git a/geg/os/gtime/gtime_func.go b/example/os/gtime/gtime_func.go similarity index 90% rename from geg/os/gtime/gtime_func.go rename to example/os/gtime/gtime_func.go index 77441077a..668e78a69 100644 --- a/geg/os/gtime/gtime_func.go +++ b/example/os/gtime/gtime_func.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g/os/gtime" + + "github.com/gogf/gf/os/gtime" ) func main() { diff --git a/geg/os/gtime/gtime_json.go b/example/os/gtime/gtime_json.go similarity index 82% rename from geg/os/gtime/gtime_json.go rename to example/os/gtime/gtime_json.go index 6c7e37906..08770df9e 100644 --- a/geg/os/gtime/gtime_json.go +++ b/example/os/gtime/gtime_json.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "github.com/gogf/gf/g/os/gtime" + "github.com/gogf/gf/os/gtime" ) func main() { diff --git a/geg/os/gtime/gtime_layout.go b/example/os/gtime/gtime_layout.go similarity index 89% rename from geg/os/gtime/gtime_layout.go rename to example/os/gtime/gtime_layout.go index 9b517b7ce..adada9892 100644 --- a/geg/os/gtime/gtime_layout.go +++ b/example/os/gtime/gtime_layout.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g/os/gtime" + + "github.com/gogf/gf/os/gtime" ) func main() { diff --git a/geg/os/gtime/gtime_linkop.go b/example/os/gtime/gtime_linkop.go similarity index 93% rename from geg/os/gtime/gtime_linkop.go rename to example/os/gtime/gtime_linkop.go index 7fd748b0f..33323cfdf 100644 --- a/geg/os/gtime/gtime_linkop.go +++ b/example/os/gtime/gtime_linkop.go @@ -2,8 +2,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g/os/gtime" "time" + + "github.com/gogf/gf/os/gtime" ) func main() { diff --git a/geg/os/gtime/gtime_parsertime.go b/example/os/gtime/gtime_parsertime.go similarity index 95% rename from geg/os/gtime/gtime_parsertime.go rename to example/os/gtime/gtime_parsertime.go index a5d47138e..6f928f34c 100644 --- a/geg/os/gtime/gtime_parsertime.go +++ b/example/os/gtime/gtime_parsertime.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g/os/gtime" + + "github.com/gogf/gf/os/gtime" ) func main() { diff --git a/geg/os/gtime/gtime_regex1.go b/example/os/gtime/gtime_regex1.go similarity index 95% rename from geg/os/gtime/gtime_regex1.go rename to example/os/gtime/gtime_regex1.go index de731e1c9..0f7bfe48f 100644 --- a/geg/os/gtime/gtime_regex1.go +++ b/example/os/gtime/gtime_regex1.go @@ -2,8 +2,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g/os/gtime" "regexp" + + "github.com/gogf/gf/os/gtime" ) func main() { diff --git a/geg/os/gtime/gtime_regex2.go b/example/os/gtime/gtime_regex2.go similarity index 94% rename from geg/os/gtime/gtime_regex2.go rename to example/os/gtime/gtime_regex2.go index 5c34b576f..434aaa306 100644 --- a/geg/os/gtime/gtime_regex2.go +++ b/example/os/gtime/gtime_regex2.go @@ -2,8 +2,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g/os/gtime" "regexp" + + "github.com/gogf/gf/os/gtime" ) func main() { diff --git a/geg/os/gtime/gtime_strtotime.go b/example/os/gtime/gtime_strtotime.go similarity index 93% rename from geg/os/gtime/gtime_strtotime.go rename to example/os/gtime/gtime_strtotime.go index 26fbdc198..3f73a4159 100644 --- a/geg/os/gtime/gtime_strtotime.go +++ b/example/os/gtime/gtime_strtotime.go @@ -2,9 +2,10 @@ package main import ( "fmt" - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/os/gtime" "time" + + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/os/gtime" ) func main() { diff --git a/geg/os/gtime/gtime_strtotime2.go b/example/os/gtime/gtime_strtotime2.go similarity index 85% rename from geg/os/gtime/gtime_strtotime2.go rename to example/os/gtime/gtime_strtotime2.go index 56d722d54..df05d10fb 100644 --- a/geg/os/gtime/gtime_strtotime2.go +++ b/example/os/gtime/gtime_strtotime2.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g/os/gtime" + + "github.com/gogf/gf/os/gtime" ) func main() { diff --git a/geg/os/gtime/gtime_zone.go b/example/os/gtime/gtime_zone.go similarity index 92% rename from geg/os/gtime/gtime_zone.go rename to example/os/gtime/gtime_zone.go index eac2eb267..11fe03f99 100644 --- a/geg/os/gtime/gtime_zone.go +++ b/example/os/gtime/gtime_zone.go @@ -2,8 +2,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g/os/gtime" "time" + + "github.com/gogf/gf/os/gtime" ) func main() { diff --git a/geg/os/gtimer/gtimer-batch.go b/example/os/gtimer/gtimer-batch.go similarity index 84% rename from geg/os/gtimer/gtimer-batch.go rename to example/os/gtimer/gtimer-batch.go index 0ebde0534..4152ba7f8 100644 --- a/geg/os/gtimer/gtimer-batch.go +++ b/example/os/gtimer/gtimer-batch.go @@ -2,8 +2,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g/os/gtimer" "time" + + "github.com/gogf/gf/os/gtimer" ) func main() { diff --git a/geg/os/gtimer/gtimer1.go b/example/os/gtimer/gtimer1.go similarity index 89% rename from geg/os/gtimer/gtimer1.go rename to example/os/gtimer/gtimer1.go index 8a3bc73e4..9a4a63e3b 100644 --- a/geg/os/gtimer/gtimer1.go +++ b/example/os/gtimer/gtimer1.go @@ -2,8 +2,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g/os/gtimer" "time" + + "github.com/gogf/gf/os/gtimer" ) func main() { diff --git a/geg/os/gtimer/gtimer2.go b/example/os/gtimer/gtimer2.go similarity index 86% rename from geg/os/gtimer/gtimer2.go rename to example/os/gtimer/gtimer2.go index 14d644da4..62f474c3d 100644 --- a/geg/os/gtimer/gtimer2.go +++ b/example/os/gtimer/gtimer2.go @@ -2,9 +2,10 @@ package main import ( "fmt" - "github.com/gogf/gf/g/container/gtype" - "github.com/gogf/gf/g/os/gtimer" "time" + + "github.com/gogf/gf/container/gtype" + "github.com/gogf/gf/os/gtimer" ) func main() { diff --git a/geg/os/gtimer/gtimer3.go b/example/os/gtimer/gtimer3.go similarity index 73% rename from geg/os/gtimer/gtimer3.go rename to example/os/gtimer/gtimer3.go index 6c113390e..6cf16e3d0 100644 --- a/geg/os/gtimer/gtimer3.go +++ b/example/os/gtimer/gtimer3.go @@ -1,9 +1,10 @@ package main import ( - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/os/gtimer" "time" + + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/os/gtimer" ) func main() { diff --git a/geg/os/gtimer/gtimer4.go b/example/os/gtimer/gtimer4.go similarity index 77% rename from geg/os/gtimer/gtimer4.go rename to example/os/gtimer/gtimer4.go index e12f03f7c..8d9cc6491 100644 --- a/geg/os/gtimer/gtimer4.go +++ b/example/os/gtimer/gtimer4.go @@ -1,9 +1,10 @@ package main import ( - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/os/gtimer" "time" + + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/os/gtimer" ) func main() { diff --git a/geg/os/gtimer/sleep1.go b/example/os/gtimer/sleep1.go similarity index 100% rename from geg/os/gtimer/sleep1.go rename to example/os/gtimer/sleep1.go diff --git a/geg/os/gtimer/sleep2.go b/example/os/gtimer/sleep2.go similarity index 100% rename from geg/os/gtimer/sleep2.go rename to example/os/gtimer/sleep2.go diff --git a/geg/os/gtimer/ticker1.go b/example/os/gtimer/ticker1.go similarity index 100% rename from geg/os/gtimer/ticker1.go rename to example/os/gtimer/ticker1.go diff --git a/geg/os/gtimer/ticker2.go b/example/os/gtimer/ticker2.go similarity index 100% rename from geg/os/gtimer/ticker2.go rename to example/os/gtimer/ticker2.go diff --git a/geg/os/gview/assign/assign.go b/example/os/gview/assign/assign.go similarity index 77% rename from geg/os/gview/assign/assign.go rename to example/os/gview/assign/assign.go index 2c6a5dde9..1f64a5b6c 100644 --- a/geg/os/gview/assign/assign.go +++ b/example/os/gview/assign/assign.go @@ -2,8 +2,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/os/gview" + + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/os/gview" ) func main() { diff --git a/geg/os/gview/basic/gview.go b/example/os/gview/basic/gview.go similarity index 86% rename from geg/os/gview/basic/gview.go rename to example/os/gview/basic/gview.go index 96621414d..d4e15ea40 100644 --- a/geg/os/gview/basic/gview.go +++ b/example/os/gview/basic/gview.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g" + + "github.com/gogf/gf/frame/g" ) func main() { diff --git a/geg/os/gview/basic/gview.tpl b/example/os/gview/basic/gview.tpl similarity index 100% rename from geg/os/gview/basic/gview.tpl rename to example/os/gview/basic/gview.tpl diff --git a/geg/os/gview/bind_func/gview_func1.go b/example/os/gview/bind_func/gview_func1.go similarity index 86% rename from geg/os/gview/bind_func/gview_func1.go rename to example/os/gview/bind_func/gview_func1.go index b8bfb330d..fa6f3c873 100644 --- a/geg/os/gview/bind_func/gview_func1.go +++ b/example/os/gview/bind_func/gview_func1.go @@ -2,8 +2,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/os/gview" + + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/os/gview" ) // 用于测试的内置函数 diff --git a/geg/os/gview/bind_func/gview_func2.go b/example/os/gview/bind_func/gview_func2.go similarity index 94% rename from geg/os/gview/bind_func/gview_func2.go rename to example/os/gview/bind_func/gview_func2.go index 7c55676a4..3ecda6c20 100644 --- a/geg/os/gview/bind_func/gview_func2.go +++ b/example/os/gview/bind_func/gview_func2.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g" + + "github.com/gogf/gf/frame/g" ) // 用于测试的带参数的内置函数 diff --git a/geg/os/gview/bind_func/index.html b/example/os/gview/bind_func/index.html similarity index 100% rename from geg/os/gview/bind_func/index.html rename to example/os/gview/bind_func/index.html diff --git a/geg/os/gview/build_in_funcs/build_in_funcs1.go b/example/os/gview/build_in_funcs/build_in_funcs1.go similarity index 96% rename from geg/os/gview/build_in_funcs/build_in_funcs1.go rename to example/os/gview/build_in_funcs/build_in_funcs1.go index 90687eb3e..7fdb59f5c 100644 --- a/geg/os/gview/build_in_funcs/build_in_funcs1.go +++ b/example/os/gview/build_in_funcs/build_in_funcs1.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g" + + "github.com/gogf/gf/frame/g" ) func main() { diff --git a/geg/os/gview/build_in_funcs/build_in_funcs2.go b/example/os/gview/build_in_funcs/build_in_funcs2.go similarity index 95% rename from geg/os/gview/build_in_funcs/build_in_funcs2.go rename to example/os/gview/build_in_funcs/build_in_funcs2.go index eab5463df..ec1a213bc 100644 --- a/geg/os/gview/build_in_funcs/build_in_funcs2.go +++ b/example/os/gview/build_in_funcs/build_in_funcs2.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g" + + "github.com/gogf/gf/frame/g" ) func main() { diff --git a/geg/os/gview/define/main.go b/example/os/gview/define/main.go similarity index 80% rename from geg/os/gview/define/main.go rename to example/os/gview/define/main.go index 1e4f043fa..233da7347 100644 --- a/geg/os/gview/define/main.go +++ b/example/os/gview/define/main.go @@ -2,8 +2,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/os/gfile" + + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/os/gfile" ) func main() { diff --git a/geg/os/gview/define/template/index.html b/example/os/gview/define/template/index.html similarity index 100% rename from geg/os/gview/define/template/index.html rename to example/os/gview/define/template/index.html diff --git a/geg/os/gview/define/template/subs/sub.html b/example/os/gview/define/template/subs/sub.html similarity index 100% rename from geg/os/gview/define/template/subs/sub.html rename to example/os/gview/define/template/subs/sub.html diff --git a/geg/os/gview/delimiters/gview_delimiters.go b/example/os/gview/delimiters/gview_delimiters.go similarity index 87% rename from geg/os/gview/delimiters/gview_delimiters.go rename to example/os/gview/delimiters/gview_delimiters.go index 39585cc90..deec2c873 100644 --- a/geg/os/gview/delimiters/gview_delimiters.go +++ b/example/os/gview/delimiters/gview_delimiters.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g" + + "github.com/gogf/gf/frame/g" ) func main() { diff --git a/geg/os/gview/delimiters/gview_delimiters.tpl b/example/os/gview/delimiters/gview_delimiters.tpl similarity index 100% rename from geg/os/gview/delimiters/gview_delimiters.tpl rename to example/os/gview/delimiters/gview_delimiters.tpl diff --git a/geg/os/gview/func_html/func_html.go b/example/os/gview/func_html/func_html.go similarity index 90% rename from geg/os/gview/func_html/func_html.go rename to example/os/gview/func_html/func_html.go index fcda6f9ac..0e41ec1e8 100644 --- a/geg/os/gview/func_html/func_html.go +++ b/example/os/gview/func_html/func_html.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/os/gview" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/os/gview" ) func main() { diff --git a/geg/os/gview/func_text/func_text.go b/example/os/gview/func_text/func_text.go similarity index 69% rename from geg/os/gview/func_text/func_text.go rename to example/os/gview/func_text/func_text.go index ffc235a7a..fae721814 100644 --- a/geg/os/gview/func_text/func_text.go +++ b/example/os/gview/func_text/func_text.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g/os/gview" - "github.com/gogf/gf/g/util/gutil" + "github.com/gogf/gf/os/gview" + "github.com/gogf/gf/util/gutil" ) func main() { diff --git a/geg/os/gview/hot_update/controller_hot_update.go b/example/os/gview/hot_update/controller_hot_update.go similarity index 86% rename from geg/os/gview/hot_update/controller_hot_update.go rename to example/os/gview/hot_update/controller_hot_update.go index 83490b561..9475efe0e 100644 --- a/geg/os/gview/hot_update/controller_hot_update.go +++ b/example/os/gview/hot_update/controller_hot_update.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/frame/gmvc" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/frame/gmvc" ) func init() { diff --git a/geg/os/gview/hot_update/gview_hot_update.go b/example/os/gview/hot_update/gview_hot_update.go similarity index 81% rename from geg/os/gview/hot_update/gview_hot_update.go rename to example/os/gview/hot_update/gview_hot_update.go index 749942294..1982d2805 100644 --- a/geg/os/gview/hot_update/gview_hot_update.go +++ b/example/os/gview/hot_update/gview_hot_update.go @@ -2,9 +2,10 @@ package main import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/os/gtime" "time" + + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/os/gtime" ) func main() { diff --git a/geg/os/gview/hot_update/web_hot_update.go b/example/os/gview/hot_update/web_hot_update.go similarity index 80% rename from geg/os/gview/hot_update/web_hot_update.go rename to example/os/gview/hot_update/web_hot_update.go index 884a9587f..caa57ca1e 100644 --- a/geg/os/gview/hot_update/web_hot_update.go +++ b/example/os/gview/hot_update/web_hot_update.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" ) func main() { diff --git a/geg/os/gview/include/main.go b/example/os/gview/include/main.go similarity index 84% rename from geg/os/gview/include/main.go rename to example/os/gview/include/main.go index a7cbe3017..425d23326 100644 --- a/geg/os/gview/include/main.go +++ b/example/os/gview/include/main.go @@ -2,8 +2,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/os/gfile" + + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/os/gfile" ) func main() { diff --git a/geg/os/gview/include/template/index.html b/example/os/gview/include/template/index.html similarity index 100% rename from geg/os/gview/include/template/index.html rename to example/os/gview/include/template/index.html diff --git a/geg/os/gview/include/template/subs/sub.html b/example/os/gview/include/template/subs/sub.html similarity index 100% rename from geg/os/gview/include/template/subs/sub.html rename to example/os/gview/include/template/subs/sub.html diff --git a/geg/os/gview/layout/layout1/main.go b/example/os/gview/layout/layout1/main.go similarity index 79% rename from geg/os/gview/layout/layout1/main.go rename to example/os/gview/layout/layout1/main.go index 947f910dc..660cca012 100644 --- a/geg/os/gview/layout/layout1/main.go +++ b/example/os/gview/layout/layout1/main.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/frame/gmvc" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/frame/gmvc" ) type Controller struct { diff --git a/geg/os/gview/layout/layout1/template/container.html b/example/os/gview/layout/layout1/template/container.html similarity index 100% rename from geg/os/gview/layout/layout1/template/container.html rename to example/os/gview/layout/layout1/template/container.html diff --git a/geg/os/gview/layout/layout1/template/footer.html b/example/os/gview/layout/layout1/template/footer.html similarity index 100% rename from geg/os/gview/layout/layout1/template/footer.html rename to example/os/gview/layout/layout1/template/footer.html diff --git a/geg/os/gview/layout/layout1/template/header.html b/example/os/gview/layout/layout1/template/header.html similarity index 100% rename from geg/os/gview/layout/layout1/template/header.html rename to example/os/gview/layout/layout1/template/header.html diff --git a/geg/os/gview/layout/layout1/template/layout.html b/example/os/gview/layout/layout1/template/layout.html similarity index 100% rename from geg/os/gview/layout/layout1/template/layout.html rename to example/os/gview/layout/layout1/template/layout.html diff --git a/geg/os/gview/layout/layout2/main.go b/example/os/gview/layout/layout2/main.go similarity index 85% rename from geg/os/gview/layout/layout2/main.go rename to example/os/gview/layout/layout2/main.go index c77b877f8..f0abb36ec 100644 --- a/geg/os/gview/layout/layout2/main.go +++ b/example/os/gview/layout/layout2/main.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" ) func main() { diff --git a/geg/os/gview/layout/layout2/template/footer.html b/example/os/gview/layout/layout2/template/footer.html similarity index 100% rename from geg/os/gview/layout/layout2/template/footer.html rename to example/os/gview/layout/layout2/template/footer.html diff --git a/geg/os/gview/layout/layout2/template/header.html b/example/os/gview/layout/layout2/template/header.html similarity index 100% rename from geg/os/gview/layout/layout2/template/header.html rename to example/os/gview/layout/layout2/template/header.html diff --git a/geg/os/gview/layout/layout2/template/layout.html b/example/os/gview/layout/layout2/template/layout.html similarity index 100% rename from geg/os/gview/layout/layout2/template/layout.html rename to example/os/gview/layout/layout2/template/layout.html diff --git a/geg/os/gview/layout/layout2/template/main/main1.html b/example/os/gview/layout/layout2/template/main/main1.html similarity index 100% rename from geg/os/gview/layout/layout2/template/main/main1.html rename to example/os/gview/layout/layout2/template/main/main1.html diff --git a/geg/os/gview/layout/layout2/template/main/main2.html b/example/os/gview/layout/layout2/template/main/main2.html similarity index 100% rename from geg/os/gview/layout/layout2/template/main/main2.html rename to example/os/gview/layout/layout2/template/main/main2.html diff --git a/geg/os/gview/object/object.go b/example/os/gview/object/object.go similarity index 93% rename from geg/os/gview/object/object.go rename to example/os/gview/object/object.go index 3f6679b90..b71f6f8f8 100644 --- a/geg/os/gview/object/object.go +++ b/example/os/gview/object/object.go @@ -1,7 +1,7 @@ package main import ( - "github.com/gogf/gf/g" + "github.com/gogf/gf/frame/g" ) type T struct { diff --git a/geg/other/config.toml b/example/other/config.toml similarity index 100% rename from geg/other/config.toml rename to example/other/config.toml diff --git a/geg/other/terminal-color.go b/example/other/terminal-color.go similarity index 100% rename from geg/other/terminal-color.go rename to example/other/terminal-color.go diff --git a/geg/other/test.go b/example/other/test.go similarity index 63% rename from geg/other/test.go rename to example/other/test.go index 46df4199c..30eca2f5a 100644 --- a/geg/other/test.go +++ b/example/other/test.go @@ -3,9 +3,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/encoding/gjson" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/encoding/gjson" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/util/gconv" ) type Item struct { @@ -16,10 +16,6 @@ type Item struct { } func main() { -<<<<<<< HEAD - latestVersion := g.NewVar(nil, true) - fmt.Println(latestVersion.IsNil()) -======= j, err := gjson.Load("config.toml") if err != nil { panic(err) @@ -31,5 +27,5 @@ func main() { err = gconv.MapStructs(m, &newm) fmt.Println(err) g.Dump(newm) ->>>>>>> master + } diff --git a/geg/other/test2.go b/example/other/test2.go similarity index 66% rename from geg/other/test2.go rename to example/other/test2.go index 76168a175..798ec99a1 100644 --- a/geg/other/test2.go +++ b/example/other/test2.go @@ -1,6 +1,6 @@ package main -import "github.com/gogf/gf/g/os/glog" +import "github.com/gogf/gf/os/glog" func Test() { diff --git a/geg/other/try-catch.go b/example/other/try-catch.go similarity index 83% rename from geg/other/try-catch.go rename to example/other/try-catch.go index a0bb032c7..9cf4169e0 100644 --- a/geg/other/try-catch.go +++ b/example/other/try-catch.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/os/glog" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/os/glog" ) func main() { diff --git a/geg/util/gconv/gconv.go b/example/util/gconv/gconv.go similarity index 96% rename from geg/util/gconv/gconv.go rename to example/util/gconv/gconv.go index 054ecb95c..20811c713 100644 --- a/geg/util/gconv/gconv.go +++ b/example/util/gconv/gconv.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g/util/gconv" + + "github.com/gogf/gf/util/gconv" ) func main() { diff --git a/geg/util/gconv/gconv_map1.go b/example/util/gconv/gconv_map1.go similarity index 91% rename from geg/util/gconv/gconv_map1.go rename to example/util/gconv/gconv_map1.go index 2e8ba0d36..17a1b2d3f 100644 --- a/geg/util/gconv/gconv_map1.go +++ b/example/util/gconv/gconv_map1.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g/util/gconv" + + "github.com/gogf/gf/util/gconv" ) func main() { diff --git a/geg/util/gconv/gconv_map2.go b/example/util/gconv/gconv_map2.go similarity index 90% rename from geg/util/gconv/gconv_map2.go rename to example/util/gconv/gconv_map2.go index 231ef6e9d..55b8c7048 100644 --- a/geg/util/gconv/gconv_map2.go +++ b/example/util/gconv/gconv_map2.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g/util/gconv" + + "github.com/gogf/gf/util/gconv" ) func main() { diff --git a/geg/util/gconv/gconv_map_deep.go b/example/util/gconv/gconv_map_deep.go similarity index 88% rename from geg/util/gconv/gconv_map_deep.go rename to example/util/gconv/gconv_map_deep.go index e83cf4d4c..024869723 100644 --- a/geg/util/gconv/gconv_map_deep.go +++ b/example/util/gconv/gconv_map_deep.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/util/gconv" ) func main() { diff --git a/geg/util/gconv/gconv_map_tag.go b/example/util/gconv/gconv_map_tag.go similarity index 77% rename from geg/util/gconv/gconv_map_tag.go rename to example/util/gconv/gconv_map_tag.go index b7f653e44..c11de8cec 100644 --- a/geg/util/gconv/gconv_map_tag.go +++ b/example/util/gconv/gconv_map_tag.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/util/gconv" ) func main() { diff --git a/geg/util/gconv/gconv_slice.go b/example/util/gconv/gconv_slice.go similarity index 88% rename from geg/util/gconv/gconv_slice.go rename to example/util/gconv/gconv_slice.go index 5af67d4c8..b6409ec52 100644 --- a/geg/util/gconv/gconv_slice.go +++ b/example/util/gconv/gconv_slice.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g/util/gconv" + + "github.com/gogf/gf/util/gconv" ) // struct转slice diff --git a/geg/util/gconv/gconv_struct1.go b/example/util/gconv/gconv_struct1.go similarity index 93% rename from geg/util/gconv/gconv_struct1.go rename to example/util/gconv/gconv_struct1.go index 9df6bab51..35d888230 100644 --- a/geg/util/gconv/gconv_struct1.go +++ b/example/util/gconv/gconv_struct1.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/util/gconv" ) type User struct { diff --git a/geg/util/gconv/gconv_struct2.go b/example/util/gconv/gconv_struct2.go similarity index 87% rename from geg/util/gconv/gconv_struct2.go rename to example/util/gconv/gconv_struct2.go index 1d7238fbc..ed6d182a7 100644 --- a/geg/util/gconv/gconv_struct2.go +++ b/example/util/gconv/gconv_struct2.go @@ -2,8 +2,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/util/gconv" + + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/util/gconv" ) // 使用默认映射规则绑定属性值到对象 diff --git a/geg/util/gconv/gconv_struct3.go b/example/util/gconv/gconv_struct3.go similarity index 88% rename from geg/util/gconv/gconv_struct3.go rename to example/util/gconv/gconv_struct3.go index 3703a916a..8e2680554 100644 --- a/geg/util/gconv/gconv_struct3.go +++ b/example/util/gconv/gconv_struct3.go @@ -2,8 +2,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/util/gconv" + + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/util/gconv" ) // 演示slice类型属性的赋值 diff --git a/geg/util/gconv/gconv_struct4.go b/example/util/gconv/gconv_struct4.go similarity index 89% rename from geg/util/gconv/gconv_struct4.go rename to example/util/gconv/gconv_struct4.go index b383e901d..108baf7b0 100644 --- a/geg/util/gconv/gconv_struct4.go +++ b/example/util/gconv/gconv_struct4.go @@ -2,8 +2,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/util/gconv" + + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/util/gconv" ) func main() { diff --git a/geg/util/gconv/gconv_struct5.go b/example/util/gconv/gconv_struct5.go similarity index 87% rename from geg/util/gconv/gconv_struct5.go rename to example/util/gconv/gconv_struct5.go index fbe68c0d1..2bd0d2c8c 100644 --- a/geg/util/gconv/gconv_struct5.go +++ b/example/util/gconv/gconv_struct5.go @@ -2,8 +2,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/util/gconv" + + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/util/gconv" ) func main() { diff --git a/geg/util/gconv/gconv_struct6.go b/example/util/gconv/gconv_struct6.go similarity index 89% rename from geg/util/gconv/gconv_struct6.go rename to example/util/gconv/gconv_struct6.go index 89401179c..17e6bd518 100644 --- a/geg/util/gconv/gconv_struct6.go +++ b/example/util/gconv/gconv_struct6.go @@ -2,8 +2,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/util/gconv" + + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/util/gconv" ) func main() { diff --git a/geg/util/gconv/gconv_struct_create.go b/example/util/gconv/gconv_struct_create.go similarity index 79% rename from geg/util/gconv/gconv_struct_create.go rename to example/util/gconv/gconv_struct_create.go index 54d22e54d..7c6352c2e 100644 --- a/geg/util/gconv/gconv_struct_create.go +++ b/example/util/gconv/gconv_struct_create.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/util/gconv" ) func main() { diff --git a/geg/util/gconv/gconv_struct_deep.go b/example/util/gconv/gconv_struct_deep.go similarity index 89% rename from geg/util/gconv/gconv_struct_deep.go rename to example/util/gconv/gconv_struct_deep.go index 82b2f86f4..15b47c60f 100644 --- a/geg/util/gconv/gconv_struct_deep.go +++ b/example/util/gconv/gconv_struct_deep.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/util/gconv" ) func main() { diff --git a/geg/util/gconv/strings.go b/example/util/gconv/strings.go similarity index 72% rename from geg/util/gconv/strings.go rename to example/util/gconv/strings.go index eda9b9144..bd8b95933 100644 --- a/geg/util/gconv/strings.go +++ b/example/util/gconv/strings.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g/util/gconv" + + "github.com/gogf/gf/util/gconv" ) func main() { diff --git a/geg/util/gconv/time1.go b/example/util/gconv/time1.go similarity index 85% rename from geg/util/gconv/time1.go rename to example/util/gconv/time1.go index 43f497664..b9aab0c82 100644 --- a/geg/util/gconv/time1.go +++ b/example/util/gconv/time1.go @@ -2,8 +2,9 @@ package main import ( "fmt" - "github.com/gogf/gf/g/util/gconv" "time" + + "github.com/gogf/gf/util/gconv" ) func main() { diff --git a/geg/util/gconv/time2.go b/example/util/gconv/time2.go similarity index 86% rename from geg/util/gconv/time2.go rename to example/util/gconv/time2.go index 39cd708a2..f3e054b57 100644 --- a/geg/util/gconv/time2.go +++ b/example/util/gconv/time2.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g/util/gconv" + + "github.com/gogf/gf/util/gconv" ) func main() { diff --git a/geg/util/gpage/gpage.go b/example/util/gpage/gpage.go similarity index 86% rename from geg/util/gpage/gpage.go rename to example/util/gpage/gpage.go index 8d9e6100d..ab75e32dc 100644 --- a/geg/util/gpage/gpage.go +++ b/example/util/gpage/gpage.go @@ -1,10 +1,10 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/os/gview" - "github.com/gogf/gf/g/util/gpage" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/os/gview" + "github.com/gogf/gf/util/gpage" ) func main() { diff --git a/geg/util/gpage/gpage_ajax.go b/example/util/gpage/gpage_ajax.go similarity index 88% rename from geg/util/gpage/gpage_ajax.go rename to example/util/gpage/gpage_ajax.go index 9c63c21d6..299715ceb 100644 --- a/geg/util/gpage/gpage_ajax.go +++ b/example/util/gpage/gpage_ajax.go @@ -1,10 +1,10 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/os/gview" - "github.com/gogf/gf/g/util/gpage" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/os/gview" + "github.com/gogf/gf/util/gpage" ) func main() { diff --git a/geg/util/gpage/gpage_custom1.go b/example/util/gpage/gpage_custom1.go similarity index 85% rename from geg/util/gpage/gpage_custom1.go rename to example/util/gpage/gpage_custom1.go index a4053c6a1..57cebaff1 100644 --- a/geg/util/gpage/gpage_custom1.go +++ b/example/util/gpage/gpage_custom1.go @@ -1,11 +1,11 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/os/gview" - "github.com/gogf/gf/g/text/gstr" - "github.com/gogf/gf/g/util/gpage" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/os/gview" + "github.com/gogf/gf/text/gstr" + "github.com/gogf/gf/util/gpage" ) // 分页标签使用li标签包裹 diff --git a/geg/util/gpage/gpage_custom2.go b/example/util/gpage/gpage_custom2.go similarity index 88% rename from geg/util/gpage/gpage_custom2.go rename to example/util/gpage/gpage_custom2.go index fbe0f7f93..f50428075 100644 --- a/geg/util/gpage/gpage_custom2.go +++ b/example/util/gpage/gpage_custom2.go @@ -1,10 +1,10 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/os/gview" - "github.com/gogf/gf/g/util/gpage" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/os/gview" + "github.com/gogf/gf/util/gpage" ) // 自定义分页名称 diff --git a/geg/util/gpage/gpage_static1.go b/example/util/gpage/gpage_static1.go similarity index 87% rename from geg/util/gpage/gpage_static1.go rename to example/util/gpage/gpage_static1.go index c63faafe5..1d1bbf798 100644 --- a/geg/util/gpage/gpage_static1.go +++ b/example/util/gpage/gpage_static1.go @@ -1,10 +1,10 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/os/gview" - "github.com/gogf/gf/g/util/gpage" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/os/gview" + "github.com/gogf/gf/util/gpage" ) func main() { diff --git a/geg/util/gpage/gpage_static2.go b/example/util/gpage/gpage_static2.go similarity index 87% rename from geg/util/gpage/gpage_static2.go rename to example/util/gpage/gpage_static2.go index fccbe20de..d0056fbd0 100644 --- a/geg/util/gpage/gpage_static2.go +++ b/example/util/gpage/gpage_static2.go @@ -1,10 +1,10 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/os/gview" - "github.com/gogf/gf/g/util/gpage" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/os/gview" + "github.com/gogf/gf/util/gpage" ) func main() { diff --git a/geg/util/gpage/gpage_template.go b/example/util/gpage/gpage_template.go similarity index 87% rename from geg/util/gpage/gpage_template.go rename to example/util/gpage/gpage_template.go index d8e5d27f8..c4e25e3d9 100644 --- a/geg/util/gpage/gpage_template.go +++ b/example/util/gpage/gpage_template.go @@ -1,10 +1,10 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/os/gview" - "github.com/gogf/gf/g/util/gpage" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/os/gview" + "github.com/gogf/gf/util/gpage" ) func main() { diff --git a/geg/util/grand/grand.go b/example/util/grand/grand.go similarity index 76% rename from geg/util/grand/grand.go rename to example/util/grand/grand.go index 7cacb100e..9b2ffc736 100644 --- a/geg/util/grand/grand.go +++ b/example/util/grand/grand.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g/util/grand" + + "github.com/gogf/gf/util/grand" ) func main() { diff --git a/geg/util/grand/rand.go b/example/util/grand/rand.go similarity index 97% rename from geg/util/grand/rand.go rename to example/util/grand/rand.go index 4f4133270..4efddfd2f 100644 --- a/geg/util/grand/rand.go +++ b/example/util/grand/rand.go @@ -4,10 +4,11 @@ import ( crand "crypto/rand" "encoding/binary" "fmt" - "github.com/gogf/gf/g/os/gtime" mrand "math/rand" "os" "time" + + "github.com/gogf/gf/os/gtime" ) // int 随机 diff --git a/geg/util/gregex/gregex.go b/example/util/gregex/gregex.go similarity index 84% rename from geg/util/gregex/gregex.go rename to example/util/gregex/gregex.go index d088441c5..496588af1 100644 --- a/geg/util/gregex/gregex.go +++ b/example/util/gregex/gregex.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g/text/gregex" + + "github.com/gogf/gf/text/gregex" ) func main() { diff --git a/geg/util/gstr/gstr_hidestr.go b/example/util/gstr/gstr_hidestr.go similarity index 83% rename from geg/util/gstr/gstr_hidestr.go rename to example/util/gstr/gstr_hidestr.go index 08b9740d7..ca3808afb 100644 --- a/geg/util/gstr/gstr_hidestr.go +++ b/example/util/gstr/gstr_hidestr.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g/text/gstr" + + "github.com/gogf/gf/text/gstr" ) func main() { diff --git a/geg/util/gstr/gstr_substr.go b/example/util/gstr/gstr_substr.go similarity index 81% rename from geg/util/gstr/gstr_substr.go rename to example/util/gstr/gstr_substr.go index 539e89c80..c78d46700 100644 --- a/geg/util/gstr/gstr_substr.go +++ b/example/util/gstr/gstr_substr.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g/text/gstr" + + "github.com/gogf/gf/text/gstr" ) func main() { diff --git a/geg/util/gutil/dump.go b/example/util/gutil/dump.go similarity index 74% rename from geg/util/gutil/dump.go rename to example/util/gutil/dump.go index 1472bed7c..14ce4bd4e 100644 --- a/geg/util/gutil/dump.go +++ b/example/util/gutil/dump.go @@ -1,7 +1,7 @@ package main import ( - "github.com/gogf/gf/g/util/gutil" + "github.com/gogf/gf/util/gutil" ) func main() { diff --git a/geg/util/gutil/stack.go b/example/util/gutil/stack.go similarity index 78% rename from geg/util/gutil/stack.go rename to example/util/gutil/stack.go index d790d8d07..38a63524a 100644 --- a/geg/util/gutil/stack.go +++ b/example/util/gutil/stack.go @@ -1,7 +1,7 @@ package main import ( - "github.com/gogf/gf/g/util/gutil" + "github.com/gogf/gf/util/gutil" ) func Test(s *interface{}) { diff --git a/geg/util/gutil/try_catch.go b/example/util/gutil/try_catch.go similarity index 83% rename from geg/util/gutil/try_catch.go rename to example/util/gutil/try_catch.go index 46ea832a2..6ae1afea4 100644 --- a/geg/util/gutil/try_catch.go +++ b/example/util/gutil/try_catch.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g/util/gutil" + + "github.com/gogf/gf/util/gutil" ) func main() { diff --git a/geg/util/gvalid/gvalid.go b/example/util/gvalid/gvalid.go similarity index 96% rename from geg/util/gvalid/gvalid.go rename to example/util/gvalid/gvalid.go index 0ecb87306..9975bd443 100644 --- a/geg/util/gvalid/gvalid.go +++ b/example/util/gvalid/gvalid.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/util/gvalid" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/util/gvalid" ) func main() { diff --git a/geg/util/gvalid/gvalid_error.go b/example/util/gvalid/gvalid_error.go similarity index 88% rename from geg/util/gvalid/gvalid_error.go rename to example/util/gvalid/gvalid_error.go index 96bf3c4a1..fe5c0a2f2 100644 --- a/geg/util/gvalid/gvalid_error.go +++ b/example/util/gvalid/gvalid_error.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/util/gvalid" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/util/gvalid" ) // 返回结果方法示例 diff --git a/geg/util/gvalid/gvalid_result.go b/example/util/gvalid/gvalid_result.go similarity index 88% rename from geg/util/gvalid/gvalid_result.go rename to example/util/gvalid/gvalid_result.go index b9b1e8cf6..0190f0df4 100644 --- a/geg/util/gvalid/gvalid_result.go +++ b/example/util/gvalid/gvalid_result.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/util/gvalid" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/util/gvalid" ) func main() { diff --git a/geg/util/gvalid/gvalid_sequence.go b/example/util/gvalid/gvalid_sequence.go similarity index 95% rename from geg/util/gvalid/gvalid_sequence.go rename to example/util/gvalid/gvalid_sequence.go index cb683f08d..8274cd1c9 100644 --- a/geg/util/gvalid/gvalid_sequence.go +++ b/example/util/gvalid/gvalid_sequence.go @@ -2,7 +2,8 @@ package main import ( "fmt" - "github.com/gogf/gf/g/util/gvalid" + + "github.com/gogf/gf/util/gvalid" ) func main() { diff --git a/geg/util/gvalid/gvalid_struct1.go b/example/util/gvalid/gvalid_struct1.go similarity index 93% rename from geg/util/gvalid/gvalid_struct1.go rename to example/util/gvalid/gvalid_struct1.go index 890734ed6..d992860ee 100644 --- a/geg/util/gvalid/gvalid_struct1.go +++ b/example/util/gvalid/gvalid_struct1.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/util/gvalid" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/util/gvalid" ) type User struct { diff --git a/geg/util/gvalid/gvalid_struct2.go b/example/util/gvalid/gvalid_struct2.go similarity index 74% rename from geg/util/gvalid/gvalid_struct2.go rename to example/util/gvalid/gvalid_struct2.go index b9b2f393a..a4c9442fb 100644 --- a/geg/util/gvalid/gvalid_struct2.go +++ b/example/util/gvalid/gvalid_struct2.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/util/gvalid" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/util/gvalid" ) // string默认值校验 diff --git a/geg/util/gvalid/gvalid_struct3.go b/example/util/gvalid/gvalid_struct3.go similarity index 79% rename from geg/util/gvalid/gvalid_struct3.go rename to example/util/gvalid/gvalid_struct3.go index 7b0b9e356..de9980ca3 100644 --- a/geg/util/gvalid/gvalid_struct3.go +++ b/example/util/gvalid/gvalid_struct3.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/util/gvalid" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/util/gvalid" ) // same校验 diff --git a/g/g.go b/frame/g/g.go similarity index 96% rename from g/g.go rename to frame/g/g.go index 8a1350e59..8e84169cf 100644 --- a/g/g.go +++ b/frame/g/g.go @@ -6,7 +6,7 @@ package g -import "github.com/gogf/gf/g/container/gvar" +import "github.com/gogf/gf/container/gvar" // Universal variable type, like generics. type Var = gvar.Var diff --git a/g/g_func.go b/frame/g/g_func.go similarity index 89% rename from g/g_func.go rename to frame/g/g_func.go index fad571235..98698f6aa 100644 --- a/g/g_func.go +++ b/frame/g/g_func.go @@ -7,10 +7,10 @@ package g import ( - "github.com/gogf/gf/g/container/gvar" - "github.com/gogf/gf/g/internal/empty" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/util/gutil" + "github.com/gogf/gf/container/gvar" + "github.com/gogf/gf/internal/empty" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/util/gutil" ) // NewVar returns a *gvar.Var. diff --git a/g/g_logger.go b/frame/g/g_logger.go similarity index 95% rename from g/g_logger.go rename to frame/g/g_logger.go index 41b2556dd..cc2e11598 100644 --- a/g/g_logger.go +++ b/frame/g/g_logger.go @@ -7,7 +7,7 @@ package g import ( - "github.com/gogf/gf/g/os/glog" + "github.com/gogf/gf/os/glog" ) // SetDebug disables/enables debug level for logging component globally. diff --git a/g/g_object.go b/frame/g/g_object.go similarity index 84% rename from g/g_object.go rename to frame/g/g_object.go index 9d3f7f64d..704742d71 100644 --- a/g/g_object.go +++ b/frame/g/g_object.go @@ -7,14 +7,14 @@ package g import ( - "github.com/gogf/gf/g/database/gdb" - "github.com/gogf/gf/g/database/gredis" - "github.com/gogf/gf/g/frame/gins" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/net/gtcp" - "github.com/gogf/gf/g/net/gudp" - "github.com/gogf/gf/g/os/gcfg" - "github.com/gogf/gf/g/os/gview" + "github.com/gogf/gf/database/gdb" + "github.com/gogf/gf/database/gredis" + "github.com/gogf/gf/frame/gins" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/net/gtcp" + "github.com/gogf/gf/net/gudp" + "github.com/gogf/gf/os/gcfg" + "github.com/gogf/gf/os/gview" ) // Server returns an instance of http server with specified name. diff --git a/g/g_setting.go b/frame/g/g_setting.go similarity index 92% rename from g/g_setting.go rename to frame/g/g_setting.go index a19187859..64104f8d9 100644 --- a/g/g_setting.go +++ b/frame/g/g_setting.go @@ -6,7 +6,7 @@ package g -import "github.com/gogf/gf/g/net/ghttp" +import "github.com/gogf/gf/net/ghttp" // SetServerGraceful enables/disables graceful reload feature of http Web Server. // This feature is disabled in default. diff --git a/g/frame/gins/gins.go b/frame/gins/gins.go similarity index 95% rename from g/frame/gins/gins.go rename to frame/gins/gins.go index 7d252ff77..25151b11a 100644 --- a/g/frame/gins/gins.go +++ b/frame/gins/gins.go @@ -11,16 +11,16 @@ import ( "fmt" "time" - "github.com/gogf/gf/g/container/gmap" - "github.com/gogf/gf/g/database/gdb" - "github.com/gogf/gf/g/database/gredis" - "github.com/gogf/gf/g/os/gcfg" - "github.com/gogf/gf/g/os/gfsnotify" - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/os/gview" - "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/container/gmap" + "github.com/gogf/gf/database/gdb" + "github.com/gogf/gf/database/gredis" + "github.com/gogf/gf/os/gcfg" + "github.com/gogf/gf/os/gfsnotify" + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/os/gview" + "github.com/gogf/gf/text/gregex" + "github.com/gogf/gf/text/gstr" + "github.com/gogf/gf/util/gconv" ) const ( diff --git a/g/frame/gins/gins_basic_test.go b/frame/gins/gins_basic_test.go similarity index 94% rename from g/frame/gins/gins_basic_test.go rename to frame/gins/gins_basic_test.go index da5b748f2..38ab63909 100644 --- a/g/frame/gins/gins_basic_test.go +++ b/frame/gins/gins_basic_test.go @@ -7,9 +7,10 @@ package gins_test import ( - "github.com/gogf/gf/g/frame/gins" - "github.com/gogf/gf/g/test/gtest" "testing" + + "github.com/gogf/gf/frame/gins" + "github.com/gogf/gf/test/gtest" ) func Test_SetGet(t *testing.T) { diff --git a/g/frame/gins/gins_config_test.go b/frame/gins/gins_config_test.go similarity index 97% rename from g/frame/gins/gins_config_test.go rename to frame/gins/gins_config_test.go index 21f36f18d..82c727fb8 100644 --- a/g/frame/gins/gins_config_test.go +++ b/frame/gins/gins_config_test.go @@ -8,14 +8,15 @@ package gins_test import ( "fmt" - "github.com/gogf/gf/g/os/gcfg" "testing" "time" - "github.com/gogf/gf/g/frame/gins" - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/os/gtime" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/os/gcfg" + + "github.com/gogf/gf/frame/gins" + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/os/gtime" + "github.com/gogf/gf/test/gtest" ) func Test_Config(t *testing.T) { diff --git a/g/frame/gins/gins_database_test.go b/frame/gins/gins_database_test.go similarity index 94% rename from g/frame/gins/gins_database_test.go rename to frame/gins/gins_database_test.go index 32f2fd512..5cfcdf98f 100644 --- a/g/frame/gins/gins_database_test.go +++ b/frame/gins/gins_database_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "github.com/gogf/gf/g/frame/gins" - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/frame/gins" + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/test/gtest" ) func Test_Database(t *testing.T) { diff --git a/g/frame/gins/gins_redis_test.go b/frame/gins/gins_redis_test.go similarity index 95% rename from g/frame/gins/gins_redis_test.go rename to frame/gins/gins_redis_test.go index 89a981202..0eb25eb86 100644 --- a/g/frame/gins/gins_redis_test.go +++ b/frame/gins/gins_redis_test.go @@ -7,11 +7,12 @@ package gins_test import ( - "github.com/gogf/gf/g/frame/gins" - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/test/gtest" "testing" "time" + + "github.com/gogf/gf/frame/gins" + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/test/gtest" ) func Test_Redis(t *testing.T) { diff --git a/g/frame/gins/gins_view_test.go b/frame/gins/gins_view_test.go similarity index 90% rename from g/frame/gins/gins_view_test.go rename to frame/gins/gins_view_test.go index 249b052f5..c233e418d 100644 --- a/g/frame/gins/gins_view_test.go +++ b/frame/gins/gins_view_test.go @@ -10,10 +10,10 @@ import ( "fmt" "testing" - "github.com/gogf/gf/g/frame/gins" - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/os/gtime" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/frame/gins" + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/os/gtime" + "github.com/gogf/gf/test/gtest" ) func Test_View(t *testing.T) { diff --git a/g/frame/gmvc/controller.go b/frame/gmvc/controller.go similarity index 96% rename from g/frame/gmvc/controller.go rename to frame/gmvc/controller.go index 9fdf763f8..48cc47d92 100644 --- a/g/frame/gmvc/controller.go +++ b/frame/gmvc/controller.go @@ -8,7 +8,7 @@ package gmvc import ( - "github.com/gogf/gf/g/net/ghttp" + "github.com/gogf/gf/net/ghttp" ) // 控制器基类 diff --git a/g/frame/gmvc/model.go b/frame/gmvc/model.go similarity index 100% rename from g/frame/gmvc/model.go rename to frame/gmvc/model.go diff --git a/g/frame/gmvc/view.go b/frame/gmvc/view.go similarity index 96% rename from g/frame/gmvc/view.go rename to frame/gmvc/view.go index 46d741eda..f37ec9e9d 100644 --- a/g/frame/gmvc/view.go +++ b/frame/gmvc/view.go @@ -7,10 +7,11 @@ package gmvc import ( - "github.com/gogf/gf/g/frame/gins" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/os/gview" "sync" + + "github.com/gogf/gf/frame/gins" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/os/gview" ) // 基于控制器注册的MVC视图基类(一个请求一个视图对象，用完即销毁) diff --git a/g/internal/cmdenv/cmdenv.go b/internal/cmdenv/cmdenv.go similarity index 97% rename from g/internal/cmdenv/cmdenv.go rename to internal/cmdenv/cmdenv.go index 242eaa654..5879917da 100644 --- a/g/internal/cmdenv/cmdenv.go +++ b/internal/cmdenv/cmdenv.go @@ -8,10 +8,11 @@ package cmdenv import ( - "github.com/gogf/gf/g/container/gvar" "os" "regexp" "strings" + + "github.com/gogf/gf/container/gvar" ) var ( diff --git a/g/internal/cmdenv/cmdenv_test.go b/internal/cmdenv/cmdenv_test.go similarity index 95% rename from g/internal/cmdenv/cmdenv_test.go rename to internal/cmdenv/cmdenv_test.go index 90702733c..b2c19d38f 100644 --- a/g/internal/cmdenv/cmdenv_test.go +++ b/internal/cmdenv/cmdenv_test.go @@ -12,7 +12,7 @@ import ( "os" "testing" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/test/gtest" ) func Test_Get(t *testing.T) { diff --git a/g/internal/debug/debug.go b/internal/debug/debug.go similarity index 98% rename from g/internal/debug/debug.go rename to internal/debug/debug.go index d564e5b28..53921498c 100644 --- a/g/internal/debug/debug.go +++ b/internal/debug/debug.go @@ -17,7 +17,7 @@ import ( const ( gMAX_DEPTH = 1000 - gFILTER_KEY = "/g/internal/debug/debug.go" + gFILTER_KEY = "/gf/internal/debug/debug.go" ) var ( diff --git a/g/internal/empty/empty.go b/internal/empty/empty.go similarity index 100% rename from g/internal/empty/empty.go rename to internal/empty/empty.go diff --git a/g/internal/empty/empty_test.go b/internal/empty/empty_test.go similarity index 95% rename from g/internal/empty/empty_test.go rename to internal/empty/empty_test.go index 0241a8b2c..df0425777 100644 --- a/g/internal/empty/empty_test.go +++ b/internal/empty/empty_test.go @@ -7,11 +7,12 @@ package empty_test import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/internal/empty" - "github.com/gogf/gf/g/test/gtest" - "github.com/gogf/gf/g/util/gconv" "testing" + + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/internal/empty" + "github.com/gogf/gf/test/gtest" + "github.com/gogf/gf/util/gconv" ) type TestPerson interface { diff --git a/g/internal/mutex/mutex.go b/internal/mutex/mutex.go similarity index 100% rename from g/internal/mutex/mutex.go rename to internal/mutex/mutex.go diff --git a/g/internal/mutex/mutex_z_bench_test.go b/internal/mutex/mutex_z_bench_test.go similarity index 94% rename from g/internal/mutex/mutex_z_bench_test.go rename to internal/mutex/mutex_z_bench_test.go index 4ee0f8ab1..f67f1d3d9 100644 --- a/g/internal/mutex/mutex_z_bench_test.go +++ b/internal/mutex/mutex_z_bench_test.go @@ -7,8 +7,9 @@ package mutex_test import ( - "github.com/gogf/gf/g/internal/mutex" "testing" + + "github.com/gogf/gf/internal/mutex" ) var ( diff --git a/g/internal/mutex/mutex_z_unit_test.go b/internal/mutex/mutex_z_unit_test.go similarity index 95% rename from g/internal/mutex/mutex_z_unit_test.go rename to internal/mutex/mutex_z_unit_test.go index fd8a465be..9b02b0842 100644 --- a/g/internal/mutex/mutex_z_unit_test.go +++ b/internal/mutex/mutex_z_unit_test.go @@ -7,11 +7,12 @@ package mutex_test import ( - "github.com/gogf/gf/g/container/garray" - "github.com/gogf/gf/g/internal/mutex" - "github.com/gogf/gf/g/test/gtest" "testing" "time" + + "github.com/gogf/gf/container/garray" + "github.com/gogf/gf/internal/mutex" + "github.com/gogf/gf/test/gtest" ) func TestMutexIsSafe(t *testing.T) { diff --git a/g/internal/rwmutex/rwmutex.go b/internal/rwmutex/rwmutex.go similarity index 100% rename from g/internal/rwmutex/rwmutex.go rename to internal/rwmutex/rwmutex.go diff --git a/g/internal/rwmutex/rwmutex_z_bench_test.go b/internal/rwmutex/rwmutex_z_bench_test.go similarity index 95% rename from g/internal/rwmutex/rwmutex_z_bench_test.go rename to internal/rwmutex/rwmutex_z_bench_test.go index 4e0db78a2..7fd4cb3e3 100644 --- a/g/internal/rwmutex/rwmutex_z_bench_test.go +++ b/internal/rwmutex/rwmutex_z_bench_test.go @@ -7,8 +7,9 @@ package rwmutex_test import ( - "github.com/gogf/gf/g/internal/rwmutex" "testing" + + "github.com/gogf/gf/internal/rwmutex" ) var ( diff --git a/g/internal/rwmutex/rwmutex_z_unit_test.go b/internal/rwmutex/rwmutex_z_unit_test.go similarity index 96% rename from g/internal/rwmutex/rwmutex_z_unit_test.go rename to internal/rwmutex/rwmutex_z_unit_test.go index 1e145da89..3a8793a94 100644 --- a/g/internal/rwmutex/rwmutex_z_unit_test.go +++ b/internal/rwmutex/rwmutex_z_unit_test.go @@ -7,11 +7,12 @@ package rwmutex_test import ( - "github.com/gogf/gf/g/container/garray" - "github.com/gogf/gf/g/internal/rwmutex" - "github.com/gogf/gf/g/test/gtest" "testing" "time" + + "github.com/gogf/gf/container/garray" + "github.com/gogf/gf/internal/rwmutex" + "github.com/gogf/gf/test/gtest" ) func TestRwmutexIsSafe(t *testing.T) { diff --git a/g/internal/structs/structs.go b/internal/structs/structs.go similarity index 86% rename from g/internal/structs/structs.go rename to internal/structs/structs.go index b3c2afdf8..a2d73b25e 100644 --- a/g/internal/structs/structs.go +++ b/internal/structs/structs.go @@ -8,7 +8,7 @@ package structs import ( - "github.com/gogf/gf/third/github.com/fatih/structs" + "github.com/gogf/gf/internal/thirdparty/github.com/fatih/structs" ) // Field is alias of structs.Field. diff --git a/g/internal/structs/structs_map.go b/internal/structs/structs_map.go similarity index 95% rename from g/internal/structs/structs_map.go rename to internal/structs/structs_map.go index fd720051a..693345094 100644 --- a/g/internal/structs/structs_map.go +++ b/internal/structs/structs_map.go @@ -9,7 +9,7 @@ package structs import ( "reflect" - "github.com/gogf/gf/third/github.com/fatih/structs" + "github.com/gogf/gf/internal/thirdparty/github.com/fatih/structs" ) // MapField retrieves struct field as map[name/tag]*Field from , and returns it. diff --git a/g/internal/structs/structs_tag.go b/internal/structs/structs_tag.go similarity index 97% rename from g/internal/structs/structs_tag.go rename to internal/structs/structs_tag.go index 52167b3cf..478b62dc1 100644 --- a/g/internal/structs/structs_tag.go +++ b/internal/structs/structs_tag.go @@ -9,7 +9,7 @@ package structs import ( "reflect" - "github.com/gogf/gf/third/github.com/fatih/structs" + "github.com/gogf/gf/internal/thirdparty/github.com/fatih/structs" ) // TagMapName retrieves struct tags as map[tag]attribute from , and returns it. diff --git a/g/internal/structs/structs_test.go b/internal/structs/structs_test.go similarity index 95% rename from g/internal/structs/structs_test.go rename to internal/structs/structs_test.go index 54d63be74..efedeb9e5 100644 --- a/g/internal/structs/structs_test.go +++ b/internal/structs/structs_test.go @@ -9,11 +9,11 @@ package structs_test import ( "testing" - "github.com/gogf/gf/g/internal/structs" + "github.com/gogf/gf/internal/structs" - "github.com/gogf/gf/g" + "github.com/gogf/gf/frame/g" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/test/gtest" ) func Test_Basic(t *testing.T) { diff --git a/g/internal/strutils/strutils.go b/internal/strutils/strutils.go similarity index 100% rename from g/internal/strutils/strutils.go rename to internal/strutils/strutils.go diff --git a/third/github.com/BurntSushi/toml/.gitignore b/internal/thirdparty/github.com/BurntSushi/toml/.gitignore similarity index 100% rename from third/github.com/BurntSushi/toml/.gitignore rename to internal/thirdparty/github.com/BurntSushi/toml/.gitignore diff --git a/third/github.com/BurntSushi/toml/.travis.yml b/internal/thirdparty/github.com/BurntSushi/toml/.travis.yml similarity index 100% rename from third/github.com/BurntSushi/toml/.travis.yml rename to internal/thirdparty/github.com/BurntSushi/toml/.travis.yml diff --git a/third/github.com/BurntSushi/toml/COMPATIBLE b/internal/thirdparty/github.com/BurntSushi/toml/COMPATIBLE similarity index 100% rename from third/github.com/BurntSushi/toml/COMPATIBLE rename to internal/thirdparty/github.com/BurntSushi/toml/COMPATIBLE diff --git a/third/github.com/BurntSushi/toml/COPYING b/internal/thirdparty/github.com/BurntSushi/toml/COPYING similarity index 100% rename from third/github.com/BurntSushi/toml/COPYING rename to internal/thirdparty/github.com/BurntSushi/toml/COPYING diff --git a/third/github.com/BurntSushi/toml/Makefile b/internal/thirdparty/github.com/BurntSushi/toml/Makefile similarity index 100% rename from third/github.com/BurntSushi/toml/Makefile rename to internal/thirdparty/github.com/BurntSushi/toml/Makefile diff --git a/third/github.com/BurntSushi/toml/README.md b/internal/thirdparty/github.com/BurntSushi/toml/README.md similarity index 100% rename from third/github.com/BurntSushi/toml/README.md rename to internal/thirdparty/github.com/BurntSushi/toml/README.md diff --git a/third/github.com/BurntSushi/toml/decode.go b/internal/thirdparty/github.com/BurntSushi/toml/decode.go similarity index 100% rename from third/github.com/BurntSushi/toml/decode.go rename to internal/thirdparty/github.com/BurntSushi/toml/decode.go diff --git a/third/github.com/BurntSushi/toml/decode_meta.go b/internal/thirdparty/github.com/BurntSushi/toml/decode_meta.go similarity index 100% rename from third/github.com/BurntSushi/toml/decode_meta.go rename to internal/thirdparty/github.com/BurntSushi/toml/decode_meta.go diff --git a/third/github.com/BurntSushi/toml/decode_test.go b/internal/thirdparty/github.com/BurntSushi/toml/decode_test.go similarity index 100% rename from third/github.com/BurntSushi/toml/decode_test.go rename to internal/thirdparty/github.com/BurntSushi/toml/decode_test.go diff --git a/third/github.com/BurntSushi/toml/doc.go b/internal/thirdparty/github.com/BurntSushi/toml/doc.go similarity index 100% rename from third/github.com/BurntSushi/toml/doc.go rename to internal/thirdparty/github.com/BurntSushi/toml/doc.go diff --git a/third/github.com/BurntSushi/toml/encode.go b/internal/thirdparty/github.com/BurntSushi/toml/encode.go similarity index 100% rename from third/github.com/BurntSushi/toml/encode.go rename to internal/thirdparty/github.com/BurntSushi/toml/encode.go diff --git a/third/github.com/BurntSushi/toml/encode_test.go b/internal/thirdparty/github.com/BurntSushi/toml/encode_test.go similarity index 100% rename from third/github.com/BurntSushi/toml/encode_test.go rename to internal/thirdparty/github.com/BurntSushi/toml/encode_test.go diff --git a/third/github.com/BurntSushi/toml/encoding_types.go b/internal/thirdparty/github.com/BurntSushi/toml/encoding_types.go similarity index 100% rename from third/github.com/BurntSushi/toml/encoding_types.go rename to internal/thirdparty/github.com/BurntSushi/toml/encoding_types.go diff --git a/third/github.com/BurntSushi/toml/encoding_types_1.1.go b/internal/thirdparty/github.com/BurntSushi/toml/encoding_types_1.1.go similarity index 100% rename from third/github.com/BurntSushi/toml/encoding_types_1.1.go rename to internal/thirdparty/github.com/BurntSushi/toml/encoding_types_1.1.go diff --git a/third/github.com/BurntSushi/toml/lex.go b/internal/thirdparty/github.com/BurntSushi/toml/lex.go similarity index 100% rename from third/github.com/BurntSushi/toml/lex.go rename to internal/thirdparty/github.com/BurntSushi/toml/lex.go diff --git a/third/github.com/BurntSushi/toml/parse.go b/internal/thirdparty/github.com/BurntSushi/toml/parse.go similarity index 100% rename from third/github.com/BurntSushi/toml/parse.go rename to internal/thirdparty/github.com/BurntSushi/toml/parse.go diff --git a/third/github.com/BurntSushi/toml/session.vim b/internal/thirdparty/github.com/BurntSushi/toml/session.vim similarity index 100% rename from third/github.com/BurntSushi/toml/session.vim rename to internal/thirdparty/github.com/BurntSushi/toml/session.vim diff --git a/third/github.com/BurntSushi/toml/type_check.go b/internal/thirdparty/github.com/BurntSushi/toml/type_check.go similarity index 100% rename from third/github.com/BurntSushi/toml/type_check.go rename to internal/thirdparty/github.com/BurntSushi/toml/type_check.go diff --git a/third/github.com/BurntSushi/toml/type_fields.go b/internal/thirdparty/github.com/BurntSushi/toml/type_fields.go similarity index 100% rename from third/github.com/BurntSushi/toml/type_fields.go rename to internal/thirdparty/github.com/BurntSushi/toml/type_fields.go diff --git a/third/github.com/clbanning/mxj/LICENSE b/internal/thirdparty/github.com/clbanning/mxj/LICENSE similarity index 100% rename from third/github.com/clbanning/mxj/LICENSE rename to internal/thirdparty/github.com/clbanning/mxj/LICENSE diff --git a/third/github.com/clbanning/mxj/anyxml.go b/internal/thirdparty/github.com/clbanning/mxj/anyxml.go similarity index 98% rename from third/github.com/clbanning/mxj/anyxml.go rename to internal/thirdparty/github.com/clbanning/mxj/anyxml.go index 3d0b9e765..ac4c3d095 100644 --- a/third/github.com/clbanning/mxj/anyxml.go +++ b/internal/thirdparty/github.com/clbanning/mxj/anyxml.go @@ -21,7 +21,7 @@ const ( import ( "encoding/json" "fmt" - "github.com/gogf/gf/third/github.com/clbanning/mxj" + "github.com/gogf/gf/internal/thirdparty/github.com/clbanning/mxj" ) func main() { diff --git a/third/github.com/clbanning/mxj/anyxml_test.go b/internal/thirdparty/github.com/clbanning/mxj/anyxml_test.go similarity index 100% rename from third/github.com/clbanning/mxj/anyxml_test.go rename to internal/thirdparty/github.com/clbanning/mxj/anyxml_test.go diff --git a/third/github.com/clbanning/mxj/atomFeedString.xml b/internal/thirdparty/github.com/clbanning/mxj/atomFeedString.xml similarity index 100% rename from third/github.com/clbanning/mxj/atomFeedString.xml rename to internal/thirdparty/github.com/clbanning/mxj/atomFeedString.xml diff --git a/third/github.com/clbanning/mxj/attrprefix_test.go b/internal/thirdparty/github.com/clbanning/mxj/attrprefix_test.go similarity index 100% rename from third/github.com/clbanning/mxj/attrprefix_test.go rename to internal/thirdparty/github.com/clbanning/mxj/attrprefix_test.go diff --git a/third/github.com/clbanning/mxj/badxml_test.go b/internal/thirdparty/github.com/clbanning/mxj/badxml_test.go similarity index 100% rename from third/github.com/clbanning/mxj/badxml_test.go rename to internal/thirdparty/github.com/clbanning/mxj/badxml_test.go diff --git a/third/github.com/clbanning/mxj/bom_test.go b/internal/thirdparty/github.com/clbanning/mxj/bom_test.go similarity index 100% rename from third/github.com/clbanning/mxj/bom_test.go rename to internal/thirdparty/github.com/clbanning/mxj/bom_test.go diff --git a/third/github.com/clbanning/mxj/bulk_test.go b/internal/thirdparty/github.com/clbanning/mxj/bulk_test.go similarity index 100% rename from third/github.com/clbanning/mxj/bulk_test.go rename to internal/thirdparty/github.com/clbanning/mxj/bulk_test.go diff --git a/third/github.com/clbanning/mxj/bulkraw_test.go b/internal/thirdparty/github.com/clbanning/mxj/bulkraw_test.go similarity index 100% rename from third/github.com/clbanning/mxj/bulkraw_test.go rename to internal/thirdparty/github.com/clbanning/mxj/bulkraw_test.go diff --git a/third/github.com/clbanning/mxj/data_test.go b/internal/thirdparty/github.com/clbanning/mxj/data_test.go similarity index 100% rename from third/github.com/clbanning/mxj/data_test.go rename to internal/thirdparty/github.com/clbanning/mxj/data_test.go diff --git a/third/github.com/clbanning/mxj/doc.go b/internal/thirdparty/github.com/clbanning/mxj/doc.go similarity index 100% rename from third/github.com/clbanning/mxj/doc.go rename to internal/thirdparty/github.com/clbanning/mxj/doc.go diff --git a/third/github.com/clbanning/mxj/escapechars.go b/internal/thirdparty/github.com/clbanning/mxj/escapechars.go similarity index 100% rename from third/github.com/clbanning/mxj/escapechars.go rename to internal/thirdparty/github.com/clbanning/mxj/escapechars.go diff --git a/third/github.com/clbanning/mxj/escapechars_test.go b/internal/thirdparty/github.com/clbanning/mxj/escapechars_test.go similarity index 100% rename from third/github.com/clbanning/mxj/escapechars_test.go rename to internal/thirdparty/github.com/clbanning/mxj/escapechars_test.go diff --git a/third/github.com/clbanning/mxj/example_test.go b/internal/thirdparty/github.com/clbanning/mxj/example_test.go similarity index 99% rename from third/github.com/clbanning/mxj/example_test.go rename to internal/thirdparty/github.com/clbanning/mxj/example_test.go index 82983ed13..51ceb8ced 100644 --- a/third/github.com/clbanning/mxj/example_test.go +++ b/internal/thirdparty/github.com/clbanning/mxj/example_test.go @@ -10,8 +10,9 @@ package mxj_test import ( "bytes" "fmt" - "github.com/gogf/gf/third/github.com/clbanning/mxj" "io" + + "github.com/gogf/gf/internal/thirdparty/github.com/clbanning/mxj" ) func ExampleHandleXmlReader() { diff --git a/third/github.com/clbanning/mxj/exists.go b/internal/thirdparty/github.com/clbanning/mxj/exists.go similarity index 100% rename from third/github.com/clbanning/mxj/exists.go rename to internal/thirdparty/github.com/clbanning/mxj/exists.go diff --git a/third/github.com/clbanning/mxj/exists_test.go b/internal/thirdparty/github.com/clbanning/mxj/exists_test.go similarity index 100% rename from third/github.com/clbanning/mxj/exists_test.go rename to internal/thirdparty/github.com/clbanning/mxj/exists_test.go diff --git a/third/github.com/clbanning/mxj/files.go b/internal/thirdparty/github.com/clbanning/mxj/files.go similarity index 100% rename from third/github.com/clbanning/mxj/files.go rename to internal/thirdparty/github.com/clbanning/mxj/files.go diff --git a/third/github.com/clbanning/mxj/files_test.badjson b/internal/thirdparty/github.com/clbanning/mxj/files_test.badjson similarity index 100% rename from third/github.com/clbanning/mxj/files_test.badjson rename to internal/thirdparty/github.com/clbanning/mxj/files_test.badjson diff --git a/third/github.com/clbanning/mxj/files_test.badxml b/internal/thirdparty/github.com/clbanning/mxj/files_test.badxml similarity index 100% rename from third/github.com/clbanning/mxj/files_test.badxml rename to internal/thirdparty/github.com/clbanning/mxj/files_test.badxml diff --git a/third/github.com/clbanning/mxj/files_test.go b/internal/thirdparty/github.com/clbanning/mxj/files_test.go similarity index 100% rename from third/github.com/clbanning/mxj/files_test.go rename to internal/thirdparty/github.com/clbanning/mxj/files_test.go diff --git a/third/github.com/clbanning/mxj/files_test.json b/internal/thirdparty/github.com/clbanning/mxj/files_test.json similarity index 100% rename from third/github.com/clbanning/mxj/files_test.json rename to internal/thirdparty/github.com/clbanning/mxj/files_test.json diff --git a/third/github.com/clbanning/mxj/files_test.xml b/internal/thirdparty/github.com/clbanning/mxj/files_test.xml similarity index 100% rename from third/github.com/clbanning/mxj/files_test.xml rename to internal/thirdparty/github.com/clbanning/mxj/files_test.xml diff --git a/third/github.com/clbanning/mxj/files_test_dup.json b/internal/thirdparty/github.com/clbanning/mxj/files_test_dup.json similarity index 100% rename from third/github.com/clbanning/mxj/files_test_dup.json rename to internal/thirdparty/github.com/clbanning/mxj/files_test_dup.json diff --git a/third/github.com/clbanning/mxj/files_test_dup.xml b/internal/thirdparty/github.com/clbanning/mxj/files_test_dup.xml similarity index 100% rename from third/github.com/clbanning/mxj/files_test_dup.xml rename to internal/thirdparty/github.com/clbanning/mxj/files_test_dup.xml diff --git a/third/github.com/clbanning/mxj/files_test_indent.json b/internal/thirdparty/github.com/clbanning/mxj/files_test_indent.json similarity index 100% rename from third/github.com/clbanning/mxj/files_test_indent.json rename to internal/thirdparty/github.com/clbanning/mxj/files_test_indent.json diff --git a/third/github.com/clbanning/mxj/files_test_indent.xml b/internal/thirdparty/github.com/clbanning/mxj/files_test_indent.xml similarity index 100% rename from third/github.com/clbanning/mxj/files_test_indent.xml rename to internal/thirdparty/github.com/clbanning/mxj/files_test_indent.xml diff --git a/third/github.com/clbanning/mxj/gob.go b/internal/thirdparty/github.com/clbanning/mxj/gob.go similarity index 100% rename from third/github.com/clbanning/mxj/gob.go rename to internal/thirdparty/github.com/clbanning/mxj/gob.go diff --git a/third/github.com/clbanning/mxj/gob_test.go b/internal/thirdparty/github.com/clbanning/mxj/gob_test.go similarity index 100% rename from third/github.com/clbanning/mxj/gob_test.go rename to internal/thirdparty/github.com/clbanning/mxj/gob_test.go diff --git a/third/github.com/clbanning/mxj/j2x/j2x.go b/internal/thirdparty/github.com/clbanning/mxj/j2x/j2x.go similarity index 98% rename from third/github.com/clbanning/mxj/j2x/j2x.go rename to internal/thirdparty/github.com/clbanning/mxj/j2x/j2x.go index 4715665a1..036cfb20b 100644 --- a/third/github.com/clbanning/mxj/j2x/j2x.go +++ b/internal/thirdparty/github.com/clbanning/mxj/j2x/j2x.go @@ -7,8 +7,9 @@ package j2x import ( - . "github.com/gogf/gf/third/github.com/clbanning/mxj" "io" + + . "github.com/gogf/gf/internal/thirdparty/github.com/clbanning/mxj" ) // FromJson() --> map[string]interface{} diff --git a/third/github.com/clbanning/mxj/j2x/j2x_test.go b/internal/thirdparty/github.com/clbanning/mxj/j2x/j2x_test.go similarity index 100% rename from third/github.com/clbanning/mxj/j2x/j2x_test.go rename to internal/thirdparty/github.com/clbanning/mxj/j2x/j2x_test.go diff --git a/third/github.com/clbanning/mxj/j2x_test.go b/internal/thirdparty/github.com/clbanning/mxj/j2x_test.go similarity index 100% rename from third/github.com/clbanning/mxj/j2x_test.go rename to internal/thirdparty/github.com/clbanning/mxj/j2x_test.go diff --git a/third/github.com/clbanning/mxj/json.go b/internal/thirdparty/github.com/clbanning/mxj/json.go similarity index 100% rename from third/github.com/clbanning/mxj/json.go rename to internal/thirdparty/github.com/clbanning/mxj/json.go diff --git a/third/github.com/clbanning/mxj/json_test.go b/internal/thirdparty/github.com/clbanning/mxj/json_test.go similarity index 100% rename from third/github.com/clbanning/mxj/json_test.go rename to internal/thirdparty/github.com/clbanning/mxj/json_test.go diff --git a/third/github.com/clbanning/mxj/keystolower_test.go b/internal/thirdparty/github.com/clbanning/mxj/keystolower_test.go similarity index 100% rename from third/github.com/clbanning/mxj/keystolower_test.go rename to internal/thirdparty/github.com/clbanning/mxj/keystolower_test.go diff --git a/third/github.com/clbanning/mxj/keyvalues.go b/internal/thirdparty/github.com/clbanning/mxj/keyvalues.go similarity index 100% rename from third/github.com/clbanning/mxj/keyvalues.go rename to internal/thirdparty/github.com/clbanning/mxj/keyvalues.go diff --git a/third/github.com/clbanning/mxj/keyvalues2_test.go b/internal/thirdparty/github.com/clbanning/mxj/keyvalues2_test.go similarity index 100% rename from third/github.com/clbanning/mxj/keyvalues2_test.go rename to internal/thirdparty/github.com/clbanning/mxj/keyvalues2_test.go diff --git a/third/github.com/clbanning/mxj/keyvalues_test.go b/internal/thirdparty/github.com/clbanning/mxj/keyvalues_test.go similarity index 100% rename from third/github.com/clbanning/mxj/keyvalues_test.go rename to internal/thirdparty/github.com/clbanning/mxj/keyvalues_test.go diff --git a/third/github.com/clbanning/mxj/leafnode.go b/internal/thirdparty/github.com/clbanning/mxj/leafnode.go similarity index 100% rename from third/github.com/clbanning/mxj/leafnode.go rename to internal/thirdparty/github.com/clbanning/mxj/leafnode.go diff --git a/third/github.com/clbanning/mxj/leafnode_test.go b/internal/thirdparty/github.com/clbanning/mxj/leafnode_test.go similarity index 100% rename from third/github.com/clbanning/mxj/leafnode_test.go rename to internal/thirdparty/github.com/clbanning/mxj/leafnode_test.go diff --git a/third/github.com/clbanning/mxj/misc.go b/internal/thirdparty/github.com/clbanning/mxj/misc.go similarity index 100% rename from third/github.com/clbanning/mxj/misc.go rename to internal/thirdparty/github.com/clbanning/mxj/misc.go diff --git a/third/github.com/clbanning/mxj/misc_test.go b/internal/thirdparty/github.com/clbanning/mxj/misc_test.go similarity index 100% rename from third/github.com/clbanning/mxj/misc_test.go rename to internal/thirdparty/github.com/clbanning/mxj/misc_test.go diff --git a/third/github.com/clbanning/mxj/mxj.go b/internal/thirdparty/github.com/clbanning/mxj/mxj.go similarity index 100% rename from third/github.com/clbanning/mxj/mxj.go rename to internal/thirdparty/github.com/clbanning/mxj/mxj.go diff --git a/third/github.com/clbanning/mxj/mxj_test.go b/internal/thirdparty/github.com/clbanning/mxj/mxj_test.go similarity index 100% rename from third/github.com/clbanning/mxj/mxj_test.go rename to internal/thirdparty/github.com/clbanning/mxj/mxj_test.go diff --git a/third/github.com/clbanning/mxj/namespace_test.go b/internal/thirdparty/github.com/clbanning/mxj/namespace_test.go similarity index 100% rename from third/github.com/clbanning/mxj/namespace_test.go rename to internal/thirdparty/github.com/clbanning/mxj/namespace_test.go diff --git a/third/github.com/clbanning/mxj/nan_test.go b/internal/thirdparty/github.com/clbanning/mxj/nan_test.go similarity index 100% rename from third/github.com/clbanning/mxj/nan_test.go rename to internal/thirdparty/github.com/clbanning/mxj/nan_test.go diff --git a/third/github.com/clbanning/mxj/newmap.go b/internal/thirdparty/github.com/clbanning/mxj/newmap.go similarity index 100% rename from third/github.com/clbanning/mxj/newmap.go rename to internal/thirdparty/github.com/clbanning/mxj/newmap.go diff --git a/third/github.com/clbanning/mxj/newmap_test.go b/internal/thirdparty/github.com/clbanning/mxj/newmap_test.go similarity index 100% rename from third/github.com/clbanning/mxj/newmap_test.go rename to internal/thirdparty/github.com/clbanning/mxj/newmap_test.go diff --git a/third/github.com/clbanning/mxj/readme.md b/internal/thirdparty/github.com/clbanning/mxj/readme.md similarity index 100% rename from third/github.com/clbanning/mxj/readme.md rename to internal/thirdparty/github.com/clbanning/mxj/readme.md diff --git a/third/github.com/clbanning/mxj/remove.go b/internal/thirdparty/github.com/clbanning/mxj/remove.go similarity index 100% rename from third/github.com/clbanning/mxj/remove.go rename to internal/thirdparty/github.com/clbanning/mxj/remove.go diff --git a/third/github.com/clbanning/mxj/remove_test.go b/internal/thirdparty/github.com/clbanning/mxj/remove_test.go similarity index 100% rename from third/github.com/clbanning/mxj/remove_test.go rename to internal/thirdparty/github.com/clbanning/mxj/remove_test.go diff --git a/third/github.com/clbanning/mxj/rename.go b/internal/thirdparty/github.com/clbanning/mxj/rename.go similarity index 100% rename from third/github.com/clbanning/mxj/rename.go rename to internal/thirdparty/github.com/clbanning/mxj/rename.go diff --git a/third/github.com/clbanning/mxj/rename_test.go b/internal/thirdparty/github.com/clbanning/mxj/rename_test.go similarity index 100% rename from third/github.com/clbanning/mxj/rename_test.go rename to internal/thirdparty/github.com/clbanning/mxj/rename_test.go diff --git a/third/github.com/clbanning/mxj/seqnum_test.go b/internal/thirdparty/github.com/clbanning/mxj/seqnum_test.go similarity index 100% rename from third/github.com/clbanning/mxj/seqnum_test.go rename to internal/thirdparty/github.com/clbanning/mxj/seqnum_test.go diff --git a/third/github.com/clbanning/mxj/set.go b/internal/thirdparty/github.com/clbanning/mxj/set.go similarity index 100% rename from third/github.com/clbanning/mxj/set.go rename to internal/thirdparty/github.com/clbanning/mxj/set.go diff --git a/third/github.com/clbanning/mxj/set_test.go b/internal/thirdparty/github.com/clbanning/mxj/set_test.go similarity index 100% rename from third/github.com/clbanning/mxj/set_test.go rename to internal/thirdparty/github.com/clbanning/mxj/set_test.go diff --git a/third/github.com/clbanning/mxj/setfieldsep.go b/internal/thirdparty/github.com/clbanning/mxj/setfieldsep.go similarity index 100% rename from third/github.com/clbanning/mxj/setfieldsep.go rename to internal/thirdparty/github.com/clbanning/mxj/setfieldsep.go diff --git a/third/github.com/clbanning/mxj/snakecase_test.go b/internal/thirdparty/github.com/clbanning/mxj/snakecase_test.go similarity index 100% rename from third/github.com/clbanning/mxj/snakecase_test.go rename to internal/thirdparty/github.com/clbanning/mxj/snakecase_test.go diff --git a/third/github.com/clbanning/mxj/songtext.xml b/internal/thirdparty/github.com/clbanning/mxj/songtext.xml similarity index 100% rename from third/github.com/clbanning/mxj/songtext.xml rename to internal/thirdparty/github.com/clbanning/mxj/songtext.xml diff --git a/third/github.com/clbanning/mxj/strict.go b/internal/thirdparty/github.com/clbanning/mxj/strict.go similarity index 100% rename from third/github.com/clbanning/mxj/strict.go rename to internal/thirdparty/github.com/clbanning/mxj/strict.go diff --git a/third/github.com/clbanning/mxj/strict_test.go b/internal/thirdparty/github.com/clbanning/mxj/strict_test.go similarity index 100% rename from third/github.com/clbanning/mxj/strict_test.go rename to internal/thirdparty/github.com/clbanning/mxj/strict_test.go diff --git a/third/github.com/clbanning/mxj/struct.go b/internal/thirdparty/github.com/clbanning/mxj/struct.go similarity index 91% rename from third/github.com/clbanning/mxj/struct.go rename to internal/thirdparty/github.com/clbanning/mxj/struct.go index ee52a3506..cc37eed41 100644 --- a/third/github.com/clbanning/mxj/struct.go +++ b/internal/thirdparty/github.com/clbanning/mxj/struct.go @@ -8,7 +8,7 @@ import ( "encoding/json" "errors" "reflect" - // "github.com/gogf/gf/third/github.com/fatih/structs" + // "github.com/gogf/gf/internal/thirdparty/github.com/fatih/structs" ) // Create a new Map value from a structure. Error returned if argument is not a structure. @@ -16,7 +16,7 @@ import ( // for handling of "structs" tags. // DEPRECATED - import github.com/fatih/structs and cast result of structs.Map to mxj.Map. -// import "github.com/gogf/gf/third/github.com/fatih/structs" +// import "github.com/gogf/gf/internal/thirdparty/github.com/fatih/structs" // ... // sm, err := structs.Map() // if err != nil { diff --git a/third/github.com/clbanning/mxj/struct_test.go b/internal/thirdparty/github.com/clbanning/mxj/struct_test.go similarity index 100% rename from third/github.com/clbanning/mxj/struct_test.go rename to internal/thirdparty/github.com/clbanning/mxj/struct_test.go diff --git a/third/github.com/clbanning/mxj/updatevalues.go b/internal/thirdparty/github.com/clbanning/mxj/updatevalues.go similarity index 100% rename from third/github.com/clbanning/mxj/updatevalues.go rename to internal/thirdparty/github.com/clbanning/mxj/updatevalues.go diff --git a/third/github.com/clbanning/mxj/updatevalues_test.go b/internal/thirdparty/github.com/clbanning/mxj/updatevalues_test.go similarity index 100% rename from third/github.com/clbanning/mxj/updatevalues_test.go rename to internal/thirdparty/github.com/clbanning/mxj/updatevalues_test.go diff --git a/third/github.com/clbanning/mxj/x2j-wrapper/LICENSE b/internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/LICENSE similarity index 100% rename from third/github.com/clbanning/mxj/x2j-wrapper/LICENSE rename to internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/LICENSE diff --git a/third/github.com/clbanning/mxj/x2j-wrapper/README b/internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/README similarity index 100% rename from third/github.com/clbanning/mxj/x2j-wrapper/README rename to internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/README diff --git a/third/github.com/clbanning/mxj/x2j-wrapper/atomFeedString.xml b/internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/atomFeedString.xml similarity index 100% rename from third/github.com/clbanning/mxj/x2j-wrapper/atomFeedString.xml rename to internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/atomFeedString.xml diff --git a/third/github.com/clbanning/mxj/x2j-wrapper/goofy_test.go b/internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/goofy_test.go similarity index 100% rename from third/github.com/clbanning/mxj/x2j-wrapper/goofy_test.go rename to internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/goofy_test.go diff --git a/third/github.com/clbanning/mxj/x2j-wrapper/pathTestString.xml b/internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/pathTestString.xml similarity index 100% rename from third/github.com/clbanning/mxj/x2j-wrapper/pathTestString.xml rename to internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/pathTestString.xml diff --git a/third/github.com/clbanning/mxj/x2j-wrapper/reader2j.go b/internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/reader2j.go similarity index 96% rename from third/github.com/clbanning/mxj/x2j-wrapper/reader2j.go rename to internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/reader2j.go index 8f6e93727..b97536dab 100755 --- a/third/github.com/clbanning/mxj/x2j-wrapper/reader2j.go +++ b/internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/reader2j.go @@ -10,7 +10,7 @@ import ( "encoding/json" "io" - "github.com/gogf/gf/third/github.com/clbanning/mxj" + "github.com/gogf/gf/internal/thirdparty/github.com/clbanning/mxj" ) // ToMap() - parse a XML io.Reader to a map[string]interface{} diff --git a/third/github.com/clbanning/mxj/x2j-wrapper/reader2j_test.go b/internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/reader2j_test.go similarity index 100% rename from third/github.com/clbanning/mxj/x2j-wrapper/reader2j_test.go rename to internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/reader2j_test.go diff --git a/third/github.com/clbanning/mxj/x2j-wrapper/songTextString.xml b/internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/songTextString.xml similarity index 100% rename from third/github.com/clbanning/mxj/x2j-wrapper/songTextString.xml rename to internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/songTextString.xml diff --git a/third/github.com/clbanning/mxj/x2j-wrapper/x2j.go b/internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/x2j.go similarity index 99% rename from third/github.com/clbanning/mxj/x2j-wrapper/x2j.go rename to internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/x2j.go index c61aebb05..ee5dfecf2 100755 --- a/third/github.com/clbanning/mxj/x2j-wrapper/x2j.go +++ b/internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/x2j.go @@ -81,7 +81,7 @@ import ( "strconv" "strings" - "github.com/gogf/gf/third/github.com/clbanning/mxj" + "github.com/gogf/gf/internal/thirdparty/github.com/clbanning/mxj" ) // If X2jCharsetReader != nil, it will be used to decode the doc or stream if required diff --git a/third/github.com/clbanning/mxj/x2j-wrapper/x2j_bulk.go b/internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/x2j_bulk.go similarity index 98% rename from third/github.com/clbanning/mxj/x2j-wrapper/x2j_bulk.go rename to internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/x2j_bulk.go index 303184312..ffa2c8640 100755 --- a/third/github.com/clbanning/mxj/x2j-wrapper/x2j_bulk.go +++ b/internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/x2j_bulk.go @@ -13,7 +13,7 @@ import ( "os" "regexp" - "github.com/gogf/gf/third/github.com/clbanning/mxj" + "github.com/gogf/gf/internal/thirdparty/github.com/clbanning/mxj" ) // XmlMsgsFromFileAsJson() diff --git a/third/github.com/clbanning/mxj/x2j-wrapper/x2j_findPath.go b/internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/x2j_findPath.go similarity index 98% rename from third/github.com/clbanning/mxj/x2j-wrapper/x2j_findPath.go rename to internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/x2j_findPath.go index 187483c4b..7e367dba9 100755 --- a/third/github.com/clbanning/mxj/x2j-wrapper/x2j_findPath.go +++ b/internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/x2j_findPath.go @@ -8,7 +8,7 @@ package x2j import ( "strings" - "github.com/gogf/gf/third/github.com/clbanning/mxj" + "github.com/gogf/gf/internal/thirdparty/github.com/clbanning/mxj" ) //----------------------------- find all paths to a key -------------------------------- diff --git a/third/github.com/clbanning/mxj/x2j-wrapper/x2j_test.go b/internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/x2j_test.go similarity index 100% rename from third/github.com/clbanning/mxj/x2j-wrapper/x2j_test.go rename to internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/x2j_test.go diff --git a/third/github.com/clbanning/mxj/x2j-wrapper/x2j_test.xml b/internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/x2j_test.xml similarity index 100% rename from third/github.com/clbanning/mxj/x2j-wrapper/x2j_test.xml rename to internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/x2j_test.xml diff --git a/third/github.com/clbanning/mxj/x2j-wrapper/x2j_valuesAt.go b/internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/x2j_valuesAt.go similarity index 97% rename from third/github.com/clbanning/mxj/x2j-wrapper/x2j_valuesAt.go rename to internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/x2j_valuesAt.go index 152da82f7..e90231bfa 100755 --- a/third/github.com/clbanning/mxj/x2j-wrapper/x2j_valuesAt.go +++ b/internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/x2j_valuesAt.go @@ -10,7 +10,7 @@ package x2j import ( "strings" - "github.com/gogf/gf/third/github.com/clbanning/mxj" + "github.com/gogf/gf/internal/thirdparty/github.com/clbanning/mxj" ) // ------------------- sweep up everything for some point in the node tree --------------------- diff --git a/third/github.com/clbanning/mxj/x2j-wrapper/x2j_valuesFrom.go b/internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/x2j_valuesFrom.go similarity index 98% rename from third/github.com/clbanning/mxj/x2j-wrapper/x2j_valuesFrom.go rename to internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/x2j_valuesFrom.go index f7b3ad639..ae38738fe 100755 --- a/third/github.com/clbanning/mxj/x2j-wrapper/x2j_valuesFrom.go +++ b/internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/x2j_valuesFrom.go @@ -9,7 +9,7 @@ package x2j import ( "strings" - "github.com/gogf/gf/third/github.com/clbanning/mxj" + "github.com/gogf/gf/internal/thirdparty/github.com/clbanning/mxj" ) // ------------------- sweep up everything for some point in the node tree --------------------- diff --git a/third/github.com/clbanning/mxj/x2j-wrapper/x2jat_test.go b/internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/x2jat_test.go similarity index 100% rename from third/github.com/clbanning/mxj/x2j-wrapper/x2jat_test.go rename to internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/x2jat_test.go diff --git a/third/github.com/clbanning/mxj/x2j-wrapper/x2jfindPath_test.go b/internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/x2jfindPath_test.go similarity index 100% rename from third/github.com/clbanning/mxj/x2j-wrapper/x2jfindPath_test.go rename to internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/x2jfindPath_test.go diff --git a/third/github.com/clbanning/mxj/x2j-wrapper/x2jpath_test.go b/internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/x2jpath_test.go similarity index 100% rename from third/github.com/clbanning/mxj/x2j-wrapper/x2jpath_test.go rename to internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/x2jpath_test.go diff --git a/third/github.com/clbanning/mxj/x2j-wrapper/x2junmarshal_test.go b/internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/x2junmarshal_test.go similarity index 100% rename from third/github.com/clbanning/mxj/x2j-wrapper/x2junmarshal_test.go rename to internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/x2junmarshal_test.go diff --git a/third/github.com/clbanning/mxj/x2j-wrapper/x2m_bulk.go b/internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/x2m_bulk.go similarity index 98% rename from third/github.com/clbanning/mxj/x2j-wrapper/x2m_bulk.go rename to internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/x2m_bulk.go index fbebbb7ea..fada14b05 100755 --- a/third/github.com/clbanning/mxj/x2j-wrapper/x2m_bulk.go +++ b/internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/x2m_bulk.go @@ -12,7 +12,7 @@ import ( "os" "regexp" - "github.com/gogf/gf/third/github.com/clbanning/mxj" + "github.com/gogf/gf/internal/thirdparty/github.com/clbanning/mxj" ) // XmlMsgsFromFile() diff --git a/third/github.com/clbanning/mxj/x2j-wrapper/x2m_bulk.xml b/internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/x2m_bulk.xml similarity index 100% rename from third/github.com/clbanning/mxj/x2j-wrapper/x2m_bulk.xml rename to internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/x2m_bulk.xml diff --git a/third/github.com/clbanning/mxj/x2j-wrapper/xml.go b/internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/xml.go similarity index 100% rename from third/github.com/clbanning/mxj/x2j-wrapper/xml.go rename to internal/thirdparty/github.com/clbanning/mxj/x2j-wrapper/xml.go diff --git a/third/github.com/clbanning/mxj/x2j/x2j.go b/internal/thirdparty/github.com/clbanning/mxj/x2j/x2j.go similarity index 98% rename from third/github.com/clbanning/mxj/x2j/x2j.go rename to internal/thirdparty/github.com/clbanning/mxj/x2j/x2j.go index cd1dec076..e316f8d6d 100644 --- a/third/github.com/clbanning/mxj/x2j/x2j.go +++ b/internal/thirdparty/github.com/clbanning/mxj/x2j/x2j.go @@ -7,8 +7,9 @@ package x2j import ( - . "github.com/gogf/gf/third/github.com/clbanning/mxj" "io" + + . "github.com/gogf/gf/internal/thirdparty/github.com/clbanning/mxj" ) // FromXml() --> map[string]interface{} diff --git a/third/github.com/clbanning/mxj/xml.go b/internal/thirdparty/github.com/clbanning/mxj/xml.go similarity index 100% rename from third/github.com/clbanning/mxj/xml.go rename to internal/thirdparty/github.com/clbanning/mxj/xml.go diff --git a/third/github.com/clbanning/mxj/xml2_test.go b/internal/thirdparty/github.com/clbanning/mxj/xml2_test.go similarity index 100% rename from third/github.com/clbanning/mxj/xml2_test.go rename to internal/thirdparty/github.com/clbanning/mxj/xml2_test.go diff --git a/third/github.com/clbanning/mxj/xml3_test.go b/internal/thirdparty/github.com/clbanning/mxj/xml3_test.go similarity index 100% rename from third/github.com/clbanning/mxj/xml3_test.go rename to internal/thirdparty/github.com/clbanning/mxj/xml3_test.go diff --git a/third/github.com/clbanning/mxj/xml_test.go b/internal/thirdparty/github.com/clbanning/mxj/xml_test.go similarity index 100% rename from third/github.com/clbanning/mxj/xml_test.go rename to internal/thirdparty/github.com/clbanning/mxj/xml_test.go diff --git a/third/github.com/clbanning/mxj/xmlseq.go b/internal/thirdparty/github.com/clbanning/mxj/xmlseq.go similarity index 100% rename from third/github.com/clbanning/mxj/xmlseq.go rename to internal/thirdparty/github.com/clbanning/mxj/xmlseq.go diff --git a/third/github.com/clbanning/mxj/xmlseq_test.go b/internal/thirdparty/github.com/clbanning/mxj/xmlseq_test.go similarity index 100% rename from third/github.com/clbanning/mxj/xmlseq_test.go rename to internal/thirdparty/github.com/clbanning/mxj/xmlseq_test.go diff --git a/third/github.com/clbanning/mxj/xmppStream_test.go b/internal/thirdparty/github.com/clbanning/mxj/xmppStream_test.go similarity index 100% rename from third/github.com/clbanning/mxj/xmppStream_test.go rename to internal/thirdparty/github.com/clbanning/mxj/xmppStream_test.go diff --git a/third/github.com/fatih/structs/.gitignore b/internal/thirdparty/github.com/fatih/structs/.gitignore similarity index 100% rename from third/github.com/fatih/structs/.gitignore rename to internal/thirdparty/github.com/fatih/structs/.gitignore diff --git a/third/github.com/fatih/structs/.travis.yml b/internal/thirdparty/github.com/fatih/structs/.travis.yml similarity index 100% rename from third/github.com/fatih/structs/.travis.yml rename to internal/thirdparty/github.com/fatih/structs/.travis.yml diff --git a/third/github.com/fatih/structs/LICENSE b/internal/thirdparty/github.com/fatih/structs/LICENSE similarity index 100% rename from third/github.com/fatih/structs/LICENSE rename to internal/thirdparty/github.com/fatih/structs/LICENSE diff --git a/third/github.com/fatih/structs/README.md b/internal/thirdparty/github.com/fatih/structs/README.md similarity index 100% rename from third/github.com/fatih/structs/README.md rename to internal/thirdparty/github.com/fatih/structs/README.md diff --git a/third/github.com/fatih/structs/field.go b/internal/thirdparty/github.com/fatih/structs/field.go similarity index 100% rename from third/github.com/fatih/structs/field.go rename to internal/thirdparty/github.com/fatih/structs/field.go diff --git a/third/github.com/fatih/structs/field_test.go b/internal/thirdparty/github.com/fatih/structs/field_test.go similarity index 100% rename from third/github.com/fatih/structs/field_test.go rename to internal/thirdparty/github.com/fatih/structs/field_test.go diff --git a/third/github.com/fatih/structs/structs.go b/internal/thirdparty/github.com/fatih/structs/structs.go similarity index 100% rename from third/github.com/fatih/structs/structs.go rename to internal/thirdparty/github.com/fatih/structs/structs.go diff --git a/third/github.com/fatih/structs/structs_example_test.go b/internal/thirdparty/github.com/fatih/structs/structs_example_test.go similarity index 100% rename from third/github.com/fatih/structs/structs_example_test.go rename to internal/thirdparty/github.com/fatih/structs/structs_example_test.go diff --git a/third/github.com/fatih/structs/structs_test.go b/internal/thirdparty/github.com/fatih/structs/structs_test.go similarity index 100% rename from third/github.com/fatih/structs/structs_test.go rename to internal/thirdparty/github.com/fatih/structs/structs_test.go diff --git a/third/github.com/fatih/structs/tags.go b/internal/thirdparty/github.com/fatih/structs/tags.go similarity index 100% rename from third/github.com/fatih/structs/tags.go rename to internal/thirdparty/github.com/fatih/structs/tags.go diff --git a/third/github.com/fatih/structs/tags_test.go b/internal/thirdparty/github.com/fatih/structs/tags_test.go similarity index 100% rename from third/github.com/fatih/structs/tags_test.go rename to internal/thirdparty/github.com/fatih/structs/tags_test.go diff --git a/third/github.com/fsnotify/fsnotify/.editorconfig b/internal/thirdparty/github.com/fsnotify/fsnotify/.editorconfig similarity index 100% rename from third/github.com/fsnotify/fsnotify/.editorconfig rename to internal/thirdparty/github.com/fsnotify/fsnotify/.editorconfig diff --git a/third/github.com/fsnotify/fsnotify/.gitignore b/internal/thirdparty/github.com/fsnotify/fsnotify/.gitignore similarity index 100% rename from third/github.com/fsnotify/fsnotify/.gitignore rename to internal/thirdparty/github.com/fsnotify/fsnotify/.gitignore diff --git a/third/github.com/fsnotify/fsnotify/.travis.yml b/internal/thirdparty/github.com/fsnotify/fsnotify/.travis.yml similarity index 100% rename from third/github.com/fsnotify/fsnotify/.travis.yml rename to internal/thirdparty/github.com/fsnotify/fsnotify/.travis.yml diff --git a/third/github.com/fsnotify/fsnotify/AUTHORS b/internal/thirdparty/github.com/fsnotify/fsnotify/AUTHORS similarity index 100% rename from third/github.com/fsnotify/fsnotify/AUTHORS rename to internal/thirdparty/github.com/fsnotify/fsnotify/AUTHORS diff --git a/third/github.com/fsnotify/fsnotify/CHANGELOG.md b/internal/thirdparty/github.com/fsnotify/fsnotify/CHANGELOG.md similarity index 100% rename from third/github.com/fsnotify/fsnotify/CHANGELOG.md rename to internal/thirdparty/github.com/fsnotify/fsnotify/CHANGELOG.md diff --git a/third/github.com/fsnotify/fsnotify/CONTRIBUTING.md b/internal/thirdparty/github.com/fsnotify/fsnotify/CONTRIBUTING.md similarity index 100% rename from third/github.com/fsnotify/fsnotify/CONTRIBUTING.md rename to internal/thirdparty/github.com/fsnotify/fsnotify/CONTRIBUTING.md diff --git a/third/github.com/fsnotify/fsnotify/LICENSE b/internal/thirdparty/github.com/fsnotify/fsnotify/LICENSE similarity index 100% rename from third/github.com/fsnotify/fsnotify/LICENSE rename to internal/thirdparty/github.com/fsnotify/fsnotify/LICENSE diff --git a/third/github.com/fsnotify/fsnotify/README.md b/internal/thirdparty/github.com/fsnotify/fsnotify/README.md similarity index 100% rename from third/github.com/fsnotify/fsnotify/README.md rename to internal/thirdparty/github.com/fsnotify/fsnotify/README.md diff --git a/third/github.com/fsnotify/fsnotify/example_test.go b/internal/thirdparty/github.com/fsnotify/fsnotify/example_test.go similarity index 91% rename from third/github.com/fsnotify/fsnotify/example_test.go rename to internal/thirdparty/github.com/fsnotify/fsnotify/example_test.go index ab5a606cb..1d3d5438f 100644 --- a/third/github.com/fsnotify/fsnotify/example_test.go +++ b/internal/thirdparty/github.com/fsnotify/fsnotify/example_test.go @@ -9,7 +9,7 @@ package fsnotify_test import ( "log" - "github.com/gogf/gf/third/github.com/fsnotify/fsnotify" + "github.com/gogf/gf/internal/thirdparty/github.com/fsnotify/fsnotify" ) func ExampleNewWatcher() { diff --git a/third/github.com/fsnotify/fsnotify/fen.go b/internal/thirdparty/github.com/fsnotify/fsnotify/fen.go similarity index 100% rename from third/github.com/fsnotify/fsnotify/fen.go rename to internal/thirdparty/github.com/fsnotify/fsnotify/fen.go diff --git a/third/github.com/fsnotify/fsnotify/fsnotify.go b/internal/thirdparty/github.com/fsnotify/fsnotify/fsnotify.go similarity index 100% rename from third/github.com/fsnotify/fsnotify/fsnotify.go rename to internal/thirdparty/github.com/fsnotify/fsnotify/fsnotify.go diff --git a/third/github.com/fsnotify/fsnotify/fsnotify_test.go b/internal/thirdparty/github.com/fsnotify/fsnotify/fsnotify_test.go similarity index 100% rename from third/github.com/fsnotify/fsnotify/fsnotify_test.go rename to internal/thirdparty/github.com/fsnotify/fsnotify/fsnotify_test.go diff --git a/third/github.com/fsnotify/fsnotify/inotify.go b/internal/thirdparty/github.com/fsnotify/fsnotify/inotify.go similarity index 99% rename from third/github.com/fsnotify/fsnotify/inotify.go rename to internal/thirdparty/github.com/fsnotify/fsnotify/inotify.go index 470659fe4..64226ebf3 100644 --- a/third/github.com/fsnotify/fsnotify/inotify.go +++ b/internal/thirdparty/github.com/fsnotify/fsnotify/inotify.go @@ -16,7 +16,7 @@ import ( "sync" "unsafe" - "github.com/gogf/gf/third/golang.org/x/sys/unix" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/unix" ) // Watcher watches a set of files, delivering events to a channel. diff --git a/third/github.com/fsnotify/fsnotify/inotify_poller.go b/internal/thirdparty/github.com/fsnotify/fsnotify/inotify_poller.go similarity index 98% rename from third/github.com/fsnotify/fsnotify/inotify_poller.go rename to internal/thirdparty/github.com/fsnotify/fsnotify/inotify_poller.go index 832112fdd..1238ea699 100644 --- a/third/github.com/fsnotify/fsnotify/inotify_poller.go +++ b/internal/thirdparty/github.com/fsnotify/fsnotify/inotify_poller.go @@ -9,7 +9,7 @@ package fsnotify import ( "errors" - "github.com/gogf/gf/third/golang.org/x/sys/unix" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/unix" ) type fdPoller struct { diff --git a/third/github.com/fsnotify/fsnotify/inotify_poller_test.go b/internal/thirdparty/github.com/fsnotify/fsnotify/inotify_poller_test.go similarity index 98% rename from third/github.com/fsnotify/fsnotify/inotify_poller_test.go rename to internal/thirdparty/github.com/fsnotify/fsnotify/inotify_poller_test.go index e001c1c63..eb09a51a9 100644 --- a/third/github.com/fsnotify/fsnotify/inotify_poller_test.go +++ b/internal/thirdparty/github.com/fsnotify/fsnotify/inotify_poller_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/gogf/gf/third/golang.org/x/sys/unix" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/unix" ) type testFd [2]int diff --git a/third/github.com/fsnotify/fsnotify/inotify_test.go b/internal/thirdparty/github.com/fsnotify/fsnotify/inotify_test.go similarity index 100% rename from third/github.com/fsnotify/fsnotify/inotify_test.go rename to internal/thirdparty/github.com/fsnotify/fsnotify/inotify_test.go diff --git a/third/github.com/fsnotify/fsnotify/integration_darwin_test.go b/internal/thirdparty/github.com/fsnotify/fsnotify/integration_darwin_test.go similarity index 98% rename from third/github.com/fsnotify/fsnotify/integration_darwin_test.go rename to internal/thirdparty/github.com/fsnotify/fsnotify/integration_darwin_test.go index bbadc1ad5..ed192d313 100644 --- a/third/github.com/fsnotify/fsnotify/integration_darwin_test.go +++ b/internal/thirdparty/github.com/fsnotify/fsnotify/integration_darwin_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/gogf/gf/third/golang.org/x/sys/unix" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/unix" ) // testExchangedataForWatcher tests the watcher with the exchangedata operation on macOS. diff --git a/third/github.com/fsnotify/fsnotify/integration_test.go b/internal/thirdparty/github.com/fsnotify/fsnotify/integration_test.go similarity index 100% rename from third/github.com/fsnotify/fsnotify/integration_test.go rename to internal/thirdparty/github.com/fsnotify/fsnotify/integration_test.go diff --git a/third/github.com/fsnotify/fsnotify/kqueue.go b/internal/thirdparty/github.com/fsnotify/fsnotify/kqueue.go similarity index 99% rename from third/github.com/fsnotify/fsnotify/kqueue.go rename to internal/thirdparty/github.com/fsnotify/fsnotify/kqueue.go index 963a806b5..2d1834982 100644 --- a/third/github.com/fsnotify/fsnotify/kqueue.go +++ b/internal/thirdparty/github.com/fsnotify/fsnotify/kqueue.go @@ -15,7 +15,7 @@ import ( "sync" "time" - "github.com/gogf/gf/third/golang.org/x/sys/unix" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/unix" ) // Watcher watches a set of files, delivering events to a channel. diff --git a/third/github.com/fsnotify/fsnotify/open_mode_bsd.go b/internal/thirdparty/github.com/fsnotify/fsnotify/open_mode_bsd.go similarity index 79% rename from third/github.com/fsnotify/fsnotify/open_mode_bsd.go rename to internal/thirdparty/github.com/fsnotify/fsnotify/open_mode_bsd.go index 8bf2e852e..5d24471d7 100644 --- a/third/github.com/fsnotify/fsnotify/open_mode_bsd.go +++ b/internal/thirdparty/github.com/fsnotify/fsnotify/open_mode_bsd.go @@ -6,6 +6,6 @@ package fsnotify -import "github.com/gogf/gf/third/golang.org/x/sys/unix" +import "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/unix" const openMode = unix.O_NONBLOCK | unix.O_RDONLY diff --git a/third/github.com/fsnotify/fsnotify/open_mode_darwin.go b/internal/thirdparty/github.com/fsnotify/fsnotify/open_mode_darwin.go similarity index 79% rename from third/github.com/fsnotify/fsnotify/open_mode_darwin.go rename to internal/thirdparty/github.com/fsnotify/fsnotify/open_mode_darwin.go index 57cfe09f8..fc1c62e72 100644 --- a/third/github.com/fsnotify/fsnotify/open_mode_darwin.go +++ b/internal/thirdparty/github.com/fsnotify/fsnotify/open_mode_darwin.go @@ -6,7 +6,7 @@ package fsnotify -import "github.com/gogf/gf/third/golang.org/x/sys/unix" +import "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/unix" // note: this constant is not defined on BSD const openMode = unix.O_EVTONLY diff --git a/third/github.com/fsnotify/fsnotify/windows.go b/internal/thirdparty/github.com/fsnotify/fsnotify/windows.go similarity index 100% rename from third/github.com/fsnotify/fsnotify/windows.go rename to internal/thirdparty/github.com/fsnotify/fsnotify/windows.go diff --git a/third/github.com/gf-third/mysql/AUTHORS b/internal/thirdparty/github.com/gf-third/mysql/AUTHORS similarity index 100% rename from third/github.com/gf-third/mysql/AUTHORS rename to internal/thirdparty/github.com/gf-third/mysql/AUTHORS diff --git a/third/github.com/gf-third/mysql/CHANGELOG.md b/internal/thirdparty/github.com/gf-third/mysql/CHANGELOG.md similarity index 100% rename from third/github.com/gf-third/mysql/CHANGELOG.md rename to internal/thirdparty/github.com/gf-third/mysql/CHANGELOG.md diff --git a/third/github.com/gf-third/mysql/CONTRIBUTING.md b/internal/thirdparty/github.com/gf-third/mysql/CONTRIBUTING.md similarity index 100% rename from third/github.com/gf-third/mysql/CONTRIBUTING.md rename to internal/thirdparty/github.com/gf-third/mysql/CONTRIBUTING.md diff --git a/third/github.com/gf-third/mysql/LICENSE b/internal/thirdparty/github.com/gf-third/mysql/LICENSE similarity index 100% rename from third/github.com/gf-third/mysql/LICENSE rename to internal/thirdparty/github.com/gf-third/mysql/LICENSE diff --git a/third/github.com/gf-third/mysql/README.md b/internal/thirdparty/github.com/gf-third/mysql/README.md similarity index 100% rename from third/github.com/gf-third/mysql/README.md rename to internal/thirdparty/github.com/gf-third/mysql/README.md diff --git a/third/github.com/gf-third/mysql/appengine.go b/internal/thirdparty/github.com/gf-third/mysql/appengine.go similarity index 100% rename from third/github.com/gf-third/mysql/appengine.go rename to internal/thirdparty/github.com/gf-third/mysql/appengine.go diff --git a/third/github.com/gf-third/mysql/auth.go b/internal/thirdparty/github.com/gf-third/mysql/auth.go similarity index 100% rename from third/github.com/gf-third/mysql/auth.go rename to internal/thirdparty/github.com/gf-third/mysql/auth.go diff --git a/third/github.com/gf-third/mysql/auth_test.go b/internal/thirdparty/github.com/gf-third/mysql/auth_test.go similarity index 100% rename from third/github.com/gf-third/mysql/auth_test.go rename to internal/thirdparty/github.com/gf-third/mysql/auth_test.go diff --git a/third/github.com/gf-third/mysql/benchmark_test.go b/internal/thirdparty/github.com/gf-third/mysql/benchmark_test.go similarity index 100% rename from third/github.com/gf-third/mysql/benchmark_test.go rename to internal/thirdparty/github.com/gf-third/mysql/benchmark_test.go diff --git a/third/github.com/gf-third/mysql/buffer.go b/internal/thirdparty/github.com/gf-third/mysql/buffer.go similarity index 100% rename from third/github.com/gf-third/mysql/buffer.go rename to internal/thirdparty/github.com/gf-third/mysql/buffer.go diff --git a/third/github.com/gf-third/mysql/collations.go b/internal/thirdparty/github.com/gf-third/mysql/collations.go similarity index 100% rename from third/github.com/gf-third/mysql/collations.go rename to internal/thirdparty/github.com/gf-third/mysql/collations.go diff --git a/third/github.com/gf-third/mysql/conncheck.go b/internal/thirdparty/github.com/gf-third/mysql/conncheck.go similarity index 100% rename from third/github.com/gf-third/mysql/conncheck.go rename to internal/thirdparty/github.com/gf-third/mysql/conncheck.go diff --git a/third/github.com/gf-third/mysql/conncheck_dummy.go b/internal/thirdparty/github.com/gf-third/mysql/conncheck_dummy.go similarity index 100% rename from third/github.com/gf-third/mysql/conncheck_dummy.go rename to internal/thirdparty/github.com/gf-third/mysql/conncheck_dummy.go diff --git a/third/github.com/gf-third/mysql/conncheck_test.go b/internal/thirdparty/github.com/gf-third/mysql/conncheck_test.go similarity index 100% rename from third/github.com/gf-third/mysql/conncheck_test.go rename to internal/thirdparty/github.com/gf-third/mysql/conncheck_test.go diff --git a/third/github.com/gf-third/mysql/connection.go b/internal/thirdparty/github.com/gf-third/mysql/connection.go similarity index 100% rename from third/github.com/gf-third/mysql/connection.go rename to internal/thirdparty/github.com/gf-third/mysql/connection.go diff --git a/third/github.com/gf-third/mysql/connection_test.go b/internal/thirdparty/github.com/gf-third/mysql/connection_test.go similarity index 100% rename from third/github.com/gf-third/mysql/connection_test.go rename to internal/thirdparty/github.com/gf-third/mysql/connection_test.go diff --git a/third/github.com/gf-third/mysql/connector.go b/internal/thirdparty/github.com/gf-third/mysql/connector.go similarity index 100% rename from third/github.com/gf-third/mysql/connector.go rename to internal/thirdparty/github.com/gf-third/mysql/connector.go diff --git a/third/github.com/gf-third/mysql/const.go b/internal/thirdparty/github.com/gf-third/mysql/const.go similarity index 100% rename from third/github.com/gf-third/mysql/const.go rename to internal/thirdparty/github.com/gf-third/mysql/const.go diff --git a/third/github.com/gf-third/mysql/driver.go b/internal/thirdparty/github.com/gf-third/mysql/driver.go similarity index 100% rename from third/github.com/gf-third/mysql/driver.go rename to internal/thirdparty/github.com/gf-third/mysql/driver.go diff --git a/third/github.com/gf-third/mysql/driver_go110.go b/internal/thirdparty/github.com/gf-third/mysql/driver_go110.go similarity index 100% rename from third/github.com/gf-third/mysql/driver_go110.go rename to internal/thirdparty/github.com/gf-third/mysql/driver_go110.go diff --git a/third/github.com/gf-third/mysql/driver_go110_test.go b/internal/thirdparty/github.com/gf-third/mysql/driver_go110_test.go similarity index 100% rename from third/github.com/gf-third/mysql/driver_go110_test.go rename to internal/thirdparty/github.com/gf-third/mysql/driver_go110_test.go diff --git a/third/github.com/gf-third/mysql/driver_test.go b/internal/thirdparty/github.com/gf-third/mysql/driver_test.go similarity index 100% rename from third/github.com/gf-third/mysql/driver_test.go rename to internal/thirdparty/github.com/gf-third/mysql/driver_test.go diff --git a/third/github.com/gf-third/mysql/dsn.go b/internal/thirdparty/github.com/gf-third/mysql/dsn.go similarity index 100% rename from third/github.com/gf-third/mysql/dsn.go rename to internal/thirdparty/github.com/gf-third/mysql/dsn.go diff --git a/third/github.com/gf-third/mysql/dsn_test.go b/internal/thirdparty/github.com/gf-third/mysql/dsn_test.go similarity index 100% rename from third/github.com/gf-third/mysql/dsn_test.go rename to internal/thirdparty/github.com/gf-third/mysql/dsn_test.go diff --git a/third/github.com/gf-third/mysql/errors.go b/internal/thirdparty/github.com/gf-third/mysql/errors.go similarity index 100% rename from third/github.com/gf-third/mysql/errors.go rename to internal/thirdparty/github.com/gf-third/mysql/errors.go diff --git a/third/github.com/gf-third/mysql/errors_test.go b/internal/thirdparty/github.com/gf-third/mysql/errors_test.go similarity index 100% rename from third/github.com/gf-third/mysql/errors_test.go rename to internal/thirdparty/github.com/gf-third/mysql/errors_test.go diff --git a/third/github.com/gf-third/mysql/fields.go b/internal/thirdparty/github.com/gf-third/mysql/fields.go similarity index 100% rename from third/github.com/gf-third/mysql/fields.go rename to internal/thirdparty/github.com/gf-third/mysql/fields.go diff --git a/third/github.com/gf-third/mysql/infile.go b/internal/thirdparty/github.com/gf-third/mysql/infile.go similarity index 100% rename from third/github.com/gf-third/mysql/infile.go rename to internal/thirdparty/github.com/gf-third/mysql/infile.go diff --git a/third/github.com/gf-third/mysql/packets.go b/internal/thirdparty/github.com/gf-third/mysql/packets.go similarity index 100% rename from third/github.com/gf-third/mysql/packets.go rename to internal/thirdparty/github.com/gf-third/mysql/packets.go diff --git a/third/github.com/gf-third/mysql/packets_test.go b/internal/thirdparty/github.com/gf-third/mysql/packets_test.go similarity index 100% rename from third/github.com/gf-third/mysql/packets_test.go rename to internal/thirdparty/github.com/gf-third/mysql/packets_test.go diff --git a/third/github.com/gf-third/mysql/result.go b/internal/thirdparty/github.com/gf-third/mysql/result.go similarity index 100% rename from third/github.com/gf-third/mysql/result.go rename to internal/thirdparty/github.com/gf-third/mysql/result.go diff --git a/third/github.com/gf-third/mysql/rows.go b/internal/thirdparty/github.com/gf-third/mysql/rows.go similarity index 100% rename from third/github.com/gf-third/mysql/rows.go rename to internal/thirdparty/github.com/gf-third/mysql/rows.go diff --git a/third/github.com/gf-third/mysql/statement.go b/internal/thirdparty/github.com/gf-third/mysql/statement.go similarity index 100% rename from third/github.com/gf-third/mysql/statement.go rename to internal/thirdparty/github.com/gf-third/mysql/statement.go diff --git a/third/github.com/gf-third/mysql/statement_test.go b/internal/thirdparty/github.com/gf-third/mysql/statement_test.go similarity index 100% rename from third/github.com/gf-third/mysql/statement_test.go rename to internal/thirdparty/github.com/gf-third/mysql/statement_test.go diff --git a/third/github.com/gf-third/mysql/transaction.go b/internal/thirdparty/github.com/gf-third/mysql/transaction.go similarity index 100% rename from third/github.com/gf-third/mysql/transaction.go rename to internal/thirdparty/github.com/gf-third/mysql/transaction.go diff --git a/third/github.com/gf-third/mysql/utils.go b/internal/thirdparty/github.com/gf-third/mysql/utils.go similarity index 100% rename from third/github.com/gf-third/mysql/utils.go rename to internal/thirdparty/github.com/gf-third/mysql/utils.go diff --git a/third/github.com/gf-third/mysql/utils_test.go b/internal/thirdparty/github.com/gf-third/mysql/utils_test.go similarity index 100% rename from third/github.com/gf-third/mysql/utils_test.go rename to internal/thirdparty/github.com/gf-third/mysql/utils_test.go diff --git a/third/github.com/ghodss/yaml/.gitignore b/internal/thirdparty/github.com/ghodss/yaml/.gitignore similarity index 100% rename from third/github.com/ghodss/yaml/.gitignore rename to internal/thirdparty/github.com/ghodss/yaml/.gitignore diff --git a/third/github.com/ghodss/yaml/.travis.yml b/internal/thirdparty/github.com/ghodss/yaml/.travis.yml similarity index 100% rename from third/github.com/ghodss/yaml/.travis.yml rename to internal/thirdparty/github.com/ghodss/yaml/.travis.yml diff --git a/third/github.com/ghodss/yaml/LICENSE b/internal/thirdparty/github.com/ghodss/yaml/LICENSE similarity index 100% rename from third/github.com/ghodss/yaml/LICENSE rename to internal/thirdparty/github.com/ghodss/yaml/LICENSE diff --git a/third/github.com/ghodss/yaml/README.md b/internal/thirdparty/github.com/ghodss/yaml/README.md similarity index 93% rename from third/github.com/ghodss/yaml/README.md rename to internal/thirdparty/github.com/ghodss/yaml/README.md index 942ca0c48..e92d38ee6 100644 --- a/third/github.com/ghodss/yaml/README.md +++ b/internal/thirdparty/github.com/ghodss/yaml/README.md @@ -38,7 +38,7 @@ $ go get github.com/ghodss/yaml And import using: ``` -import "github.com/gogf/gf/third/github.com/ghodss/yaml" +import "github.com/gogf/gf/internal/thirdparty/github.com/ghodss/yaml" ``` Usage is very similar to the JSON library: @@ -49,7 +49,7 @@ package main import ( "fmt" - "github.com/gogf/gf/third/github.com/ghodss/yaml" + "github.com/gogf/gf/internal/thirdparty/github.com/ghodss/yaml" ) type Person struct { @@ -93,7 +93,7 @@ package main import ( "fmt" - "github.com/gogf/gf/third/github.com/ghodss/yaml" + "github.com/gogf/gf/internal/thirdparty/github.com/ghodss/yaml" ) func main() { diff --git a/third/github.com/ghodss/yaml/fields.go b/internal/thirdparty/github.com/ghodss/yaml/fields.go similarity index 100% rename from third/github.com/ghodss/yaml/fields.go rename to internal/thirdparty/github.com/ghodss/yaml/fields.go diff --git a/third/github.com/ghodss/yaml/yaml.go b/internal/thirdparty/github.com/ghodss/yaml/yaml.go similarity index 99% rename from third/github.com/ghodss/yaml/yaml.go rename to internal/thirdparty/github.com/ghodss/yaml/yaml.go index 485b6c5ff..4accb38fb 100644 --- a/third/github.com/ghodss/yaml/yaml.go +++ b/internal/thirdparty/github.com/ghodss/yaml/yaml.go @@ -7,7 +7,7 @@ import ( "reflect" "strconv" - "github.com/gogf/gf/third/gopkg.in/yaml.v2" + "github.com/gogf/gf/internal/thirdparty/gopkg.in/yaml.v2" ) // Marshals the object into JSON then converts JSON to YAML and returns the diff --git a/third/github.com/ghodss/yaml/yaml_test.go b/internal/thirdparty/github.com/ghodss/yaml/yaml_test.go similarity index 100% rename from third/github.com/ghodss/yaml/yaml_test.go rename to internal/thirdparty/github.com/ghodss/yaml/yaml_test.go diff --git a/third/github.com/gomodule/redigo/.travis.yml b/internal/thirdparty/github.com/gomodule/redigo/.travis.yml similarity index 100% rename from third/github.com/gomodule/redigo/.travis.yml rename to internal/thirdparty/github.com/gomodule/redigo/.travis.yml diff --git a/third/github.com/gomodule/redigo/LICENSE b/internal/thirdparty/github.com/gomodule/redigo/LICENSE similarity index 100% rename from third/github.com/gomodule/redigo/LICENSE rename to internal/thirdparty/github.com/gomodule/redigo/LICENSE diff --git a/third/github.com/gomodule/redigo/README.markdown b/internal/thirdparty/github.com/gomodule/redigo/README.markdown similarity index 100% rename from third/github.com/gomodule/redigo/README.markdown rename to internal/thirdparty/github.com/gomodule/redigo/README.markdown diff --git a/third/github.com/gomodule/redigo/internal/commandinfo.go b/internal/thirdparty/github.com/gomodule/redigo/internal/commandinfo.go similarity index 92% rename from third/github.com/gomodule/redigo/internal/commandinfo.go rename to internal/thirdparty/github.com/gomodule/redigo/internal/commandinfo.go index 65395db2b..f4a217bca 100644 --- a/third/github.com/gomodule/redigo/internal/commandinfo.go +++ b/internal/thirdparty/github.com/gomodule/redigo/internal/commandinfo.go @@ -12,7 +12,7 @@ // License for the specific language governing permissions and limitations // under the License. -package internal // import "github.com/gogf/gf/third/github.com/gomodule/redigo/internal" +package internal // import "github.com/gogf/gf/internal/thirdparty/github.com/gomodule/redigo/internal" import ( "strings" diff --git a/third/github.com/gomodule/redigo/internal/commandinfo_test.go b/internal/thirdparty/github.com/gomodule/redigo/internal/commandinfo_test.go similarity index 100% rename from third/github.com/gomodule/redigo/internal/commandinfo_test.go rename to internal/thirdparty/github.com/gomodule/redigo/internal/commandinfo_test.go diff --git a/third/github.com/gomodule/redigo/internal/redistest/testdb.go b/internal/thirdparty/github.com/gomodule/redigo/internal/redistest/testdb.go similarity index 95% rename from third/github.com/gomodule/redigo/internal/redistest/testdb.go rename to internal/thirdparty/github.com/gomodule/redigo/internal/redistest/testdb.go index f52bef89a..b168b2abf 100644 --- a/third/github.com/gomodule/redigo/internal/redistest/testdb.go +++ b/internal/thirdparty/github.com/gomodule/redigo/internal/redistest/testdb.go @@ -19,7 +19,7 @@ import ( "errors" "time" - "github.com/gogf/gf/third/github.com/gomodule/redigo/redis" + "github.com/gogf/gf/internal/thirdparty/github.com/gomodule/redigo/redis" ) type testConn struct { diff --git a/third/github.com/gomodule/redigo/redis/conn.go b/internal/thirdparty/github.com/gomodule/redigo/redis/conn.go similarity index 100% rename from third/github.com/gomodule/redigo/redis/conn.go rename to internal/thirdparty/github.com/gomodule/redigo/redis/conn.go diff --git a/third/github.com/gomodule/redigo/redis/conn_test.go b/internal/thirdparty/github.com/gomodule/redigo/redis/conn_test.go similarity index 99% rename from third/github.com/gomodule/redigo/redis/conn_test.go rename to internal/thirdparty/github.com/gomodule/redigo/redis/conn_test.go index 3d301a6a4..6beea59be 100644 --- a/third/github.com/gomodule/redigo/redis/conn_test.go +++ b/internal/thirdparty/github.com/gomodule/redigo/redis/conn_test.go @@ -28,7 +28,7 @@ import ( "testing" "time" - "github.com/gogf/gf/third/github.com/gomodule/redigo/redis" + "github.com/gogf/gf/internal/thirdparty/github.com/gomodule/redigo/redis" ) type testConn struct { diff --git a/third/github.com/gomodule/redigo/redis/doc.go b/internal/thirdparty/github.com/gomodule/redigo/redis/doc.go similarity index 98% rename from third/github.com/gomodule/redigo/redis/doc.go rename to internal/thirdparty/github.com/gomodule/redigo/redis/doc.go index 1c4397855..2e534c72f 100644 --- a/third/github.com/gomodule/redigo/redis/doc.go +++ b/internal/thirdparty/github.com/gomodule/redigo/redis/doc.go @@ -174,4 +174,4 @@ // non-recoverable error such as a network error or protocol parsing error. If // Err() returns a non-nil value, then the connection is not usable and should // be closed. -package redis // import "github.com/gogf/gf/third/github.com/gomodule/redigo/redis" +package redis // import "github.com/gogf/gf/internal/thirdparty/github.com/gomodule/redigo/redis" diff --git a/third/github.com/gomodule/redigo/redis/go16.go b/internal/thirdparty/github.com/gomodule/redigo/redis/go16.go similarity index 100% rename from third/github.com/gomodule/redigo/redis/go16.go rename to internal/thirdparty/github.com/gomodule/redigo/redis/go16.go diff --git a/third/github.com/gomodule/redigo/redis/go17.go b/internal/thirdparty/github.com/gomodule/redigo/redis/go17.go similarity index 100% rename from third/github.com/gomodule/redigo/redis/go17.go rename to internal/thirdparty/github.com/gomodule/redigo/redis/go17.go diff --git a/third/github.com/gomodule/redigo/redis/go18.go b/internal/thirdparty/github.com/gomodule/redigo/redis/go18.go similarity index 100% rename from third/github.com/gomodule/redigo/redis/go18.go rename to internal/thirdparty/github.com/gomodule/redigo/redis/go18.go diff --git a/third/github.com/gomodule/redigo/redis/list_test.go b/internal/thirdparty/github.com/gomodule/redigo/redis/list_test.go similarity index 100% rename from third/github.com/gomodule/redigo/redis/list_test.go rename to internal/thirdparty/github.com/gomodule/redigo/redis/list_test.go diff --git a/third/github.com/gomodule/redigo/redis/log.go b/internal/thirdparty/github.com/gomodule/redigo/redis/log.go similarity index 100% rename from third/github.com/gomodule/redigo/redis/log.go rename to internal/thirdparty/github.com/gomodule/redigo/redis/log.go diff --git a/third/github.com/gomodule/redigo/redis/pool.go b/internal/thirdparty/github.com/gomodule/redigo/redis/pool.go similarity index 99% rename from third/github.com/gomodule/redigo/redis/pool.go rename to internal/thirdparty/github.com/gomodule/redigo/redis/pool.go index 6b77adfca..386a5538d 100644 --- a/third/github.com/gomodule/redigo/redis/pool.go +++ b/internal/thirdparty/github.com/gomodule/redigo/redis/pool.go @@ -25,7 +25,7 @@ import ( "sync/atomic" "time" - "github.com/gogf/gf/third/github.com/gomodule/redigo/internal" + "github.com/gogf/gf/internal/thirdparty/github.com/gomodule/redigo/internal" ) var ( diff --git a/third/github.com/gomodule/redigo/redis/pool17.go b/internal/thirdparty/github.com/gomodule/redigo/redis/pool17.go similarity index 100% rename from third/github.com/gomodule/redigo/redis/pool17.go rename to internal/thirdparty/github.com/gomodule/redigo/redis/pool17.go diff --git a/third/github.com/gomodule/redigo/redis/pool17_test.go b/internal/thirdparty/github.com/gomodule/redigo/redis/pool17_test.go similarity index 95% rename from third/github.com/gomodule/redigo/redis/pool17_test.go rename to internal/thirdparty/github.com/gomodule/redigo/redis/pool17_test.go index 21fa307f8..7dec8d51b 100644 --- a/third/github.com/gomodule/redigo/redis/pool17_test.go +++ b/internal/thirdparty/github.com/gomodule/redigo/redis/pool17_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - "github.com/gogf/gf/third/github.com/gomodule/redigo/redis" + "github.com/gogf/gf/internal/thirdparty/github.com/gomodule/redigo/redis" ) func TestWaitPoolGetContext(t *testing.T) { diff --git a/third/github.com/gomodule/redigo/redis/pool_test.go b/internal/thirdparty/github.com/gomodule/redigo/redis/pool_test.go similarity index 99% rename from third/github.com/gomodule/redigo/redis/pool_test.go rename to internal/thirdparty/github.com/gomodule/redigo/redis/pool_test.go index b05aafe20..e3123314a 100644 --- a/third/github.com/gomodule/redigo/redis/pool_test.go +++ b/internal/thirdparty/github.com/gomodule/redigo/redis/pool_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/gogf/gf/third/github.com/gomodule/redigo/redis" + "github.com/gogf/gf/internal/thirdparty/github.com/gomodule/redigo/redis" ) type poolTestConn struct { diff --git a/third/github.com/gomodule/redigo/redis/pubsub.go b/internal/thirdparty/github.com/gomodule/redigo/redis/pubsub.go similarity index 100% rename from third/github.com/gomodule/redigo/redis/pubsub.go rename to internal/thirdparty/github.com/gomodule/redigo/redis/pubsub.go diff --git a/third/github.com/gomodule/redigo/redis/pubsub_example_test.go b/internal/thirdparty/github.com/gomodule/redigo/redis/pubsub_example_test.go similarity index 98% rename from third/github.com/gomodule/redigo/redis/pubsub_example_test.go rename to internal/thirdparty/github.com/gomodule/redigo/redis/pubsub_example_test.go index ee7d557bd..5502b6601 100644 --- a/third/github.com/gomodule/redigo/redis/pubsub_example_test.go +++ b/internal/thirdparty/github.com/gomodule/redigo/redis/pubsub_example_test.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/gogf/gf/third/github.com/gomodule/redigo/redis" + "github.com/gogf/gf/internal/thirdparty/github.com/gomodule/redigo/redis" ) // listenPubSubChannels listens for messages on Redis pubsub channels. The diff --git a/third/github.com/gomodule/redigo/redis/pubsub_test.go b/internal/thirdparty/github.com/gomodule/redigo/redis/pubsub_test.go similarity index 96% rename from third/github.com/gomodule/redigo/redis/pubsub_test.go rename to internal/thirdparty/github.com/gomodule/redigo/redis/pubsub_test.go index 870d957ce..38854ec3e 100644 --- a/third/github.com/gomodule/redigo/redis/pubsub_test.go +++ b/internal/thirdparty/github.com/gomodule/redigo/redis/pubsub_test.go @@ -19,7 +19,7 @@ import ( "testing" "time" - "github.com/gogf/gf/third/github.com/gomodule/redigo/redis" + "github.com/gogf/gf/internal/thirdparty/github.com/gomodule/redigo/redis" ) func expectPushed(t *testing.T, c redis.PubSubConn, message string, expected interface{}) { diff --git a/third/github.com/gomodule/redigo/redis/redis.go b/internal/thirdparty/github.com/gomodule/redigo/redis/redis.go similarity index 100% rename from third/github.com/gomodule/redigo/redis/redis.go rename to internal/thirdparty/github.com/gomodule/redigo/redis/redis.go diff --git a/third/github.com/gomodule/redigo/redis/redis_test.go b/internal/thirdparty/github.com/gomodule/redigo/redis/redis_test.go similarity index 96% rename from third/github.com/gomodule/redigo/redis/redis_test.go rename to internal/thirdparty/github.com/gomodule/redigo/redis/redis_test.go index 7bf3b6084..929e5dac6 100644 --- a/third/github.com/gomodule/redigo/redis/redis_test.go +++ b/internal/thirdparty/github.com/gomodule/redigo/redis/redis_test.go @@ -18,7 +18,7 @@ import ( "testing" "time" - "github.com/gogf/gf/third/github.com/gomodule/redigo/redis" + "github.com/gogf/gf/internal/thirdparty/github.com/gomodule/redigo/redis" ) type timeoutTestConn int diff --git a/third/github.com/gomodule/redigo/redis/reply.go b/internal/thirdparty/github.com/gomodule/redigo/redis/reply.go similarity index 100% rename from third/github.com/gomodule/redigo/redis/reply.go rename to internal/thirdparty/github.com/gomodule/redigo/redis/reply.go diff --git a/third/github.com/gomodule/redigo/redis/reply_test.go b/internal/thirdparty/github.com/gomodule/redigo/redis/reply_test.go similarity index 98% rename from third/github.com/gomodule/redigo/redis/reply_test.go rename to internal/thirdparty/github.com/gomodule/redigo/redis/reply_test.go index 6ceb22a89..4d2746576 100644 --- a/third/github.com/gomodule/redigo/redis/reply_test.go +++ b/internal/thirdparty/github.com/gomodule/redigo/redis/reply_test.go @@ -19,7 +19,7 @@ import ( "reflect" "testing" - "github.com/gogf/gf/third/github.com/gomodule/redigo/redis" + "github.com/gogf/gf/internal/thirdparty/github.com/gomodule/redigo/redis" ) type valueError struct { diff --git a/third/github.com/gomodule/redigo/redis/scan.go b/internal/thirdparty/github.com/gomodule/redigo/redis/scan.go similarity index 100% rename from third/github.com/gomodule/redigo/redis/scan.go rename to internal/thirdparty/github.com/gomodule/redigo/redis/scan.go diff --git a/third/github.com/gomodule/redigo/redis/scan_test.go b/internal/thirdparty/github.com/gomodule/redigo/redis/scan_test.go similarity index 99% rename from third/github.com/gomodule/redigo/redis/scan_test.go rename to internal/thirdparty/github.com/gomodule/redigo/redis/scan_test.go index 6adadcfd9..ec29fc08d 100644 --- a/third/github.com/gomodule/redigo/redis/scan_test.go +++ b/internal/thirdparty/github.com/gomodule/redigo/redis/scan_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/gogf/gf/third/github.com/gomodule/redigo/redis" + "github.com/gogf/gf/internal/thirdparty/github.com/gomodule/redigo/redis" ) type durationScan struct { diff --git a/third/github.com/gomodule/redigo/redis/script.go b/internal/thirdparty/github.com/gomodule/redigo/redis/script.go similarity index 100% rename from third/github.com/gomodule/redigo/redis/script.go rename to internal/thirdparty/github.com/gomodule/redigo/redis/script.go diff --git a/third/github.com/gomodule/redigo/redis/script_test.go b/internal/thirdparty/github.com/gomodule/redigo/redis/script_test.go similarity index 97% rename from third/github.com/gomodule/redigo/redis/script_test.go rename to internal/thirdparty/github.com/gomodule/redigo/redis/script_test.go index 4a06427ea..e4795b289 100644 --- a/third/github.com/gomodule/redigo/redis/script_test.go +++ b/internal/thirdparty/github.com/gomodule/redigo/redis/script_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "github.com/gogf/gf/third/github.com/gomodule/redigo/redis" + "github.com/gogf/gf/internal/thirdparty/github.com/gomodule/redigo/redis" ) var ( diff --git a/third/github.com/gomodule/redigo/redis/test_test.go b/internal/thirdparty/github.com/gomodule/redigo/redis/test_test.go similarity index 100% rename from third/github.com/gomodule/redigo/redis/test_test.go rename to internal/thirdparty/github.com/gomodule/redigo/redis/test_test.go diff --git a/third/github.com/gomodule/redigo/redis/zpop_example_test.go b/internal/thirdparty/github.com/gomodule/redigo/redis/zpop_example_test.go similarity index 96% rename from third/github.com/gomodule/redigo/redis/zpop_example_test.go rename to internal/thirdparty/github.com/gomodule/redigo/redis/zpop_example_test.go index 1f6024c2b..170d0d528 100644 --- a/third/github.com/gomodule/redigo/redis/zpop_example_test.go +++ b/internal/thirdparty/github.com/gomodule/redigo/redis/zpop_example_test.go @@ -17,7 +17,7 @@ package redis_test import ( "fmt" - "github.com/gogf/gf/third/github.com/gomodule/redigo/redis" + "github.com/gogf/gf/internal/thirdparty/github.com/gomodule/redigo/redis" ) // zpop pops a value from the ZSET key using WATCH/MULTI/EXEC commands. diff --git a/third/github.com/gomodule/redigo/redisx/connmux.go b/internal/thirdparty/github.com/gomodule/redigo/redisx/connmux.go similarity index 95% rename from third/github.com/gomodule/redigo/redisx/connmux.go rename to internal/thirdparty/github.com/gomodule/redigo/redisx/connmux.go index fb5297feb..ce47540af 100644 --- a/third/github.com/gomodule/redigo/redisx/connmux.go +++ b/internal/thirdparty/github.com/gomodule/redigo/redisx/connmux.go @@ -18,8 +18,8 @@ import ( "errors" "sync" - "github.com/gogf/gf/third/github.com/gomodule/redigo/internal" - "github.com/gogf/gf/third/github.com/gomodule/redigo/redis" + "github.com/gogf/gf/internal/thirdparty/github.com/gomodule/redigo/internal" + "github.com/gogf/gf/internal/thirdparty/github.com/gomodule/redigo/redis" ) // ConnMux multiplexes one or more connections to a single underlying diff --git a/third/github.com/gomodule/redigo/redisx/connmux_test.go b/internal/thirdparty/github.com/gomodule/redigo/redisx/connmux_test.go similarity index 95% rename from third/github.com/gomodule/redigo/redisx/connmux_test.go rename to internal/thirdparty/github.com/gomodule/redigo/redisx/connmux_test.go index 81765b198..e4b4e56e2 100644 --- a/third/github.com/gomodule/redigo/redisx/connmux_test.go +++ b/internal/thirdparty/github.com/gomodule/redigo/redisx/connmux_test.go @@ -19,9 +19,9 @@ import ( "sync" "testing" - "github.com/gogf/gf/third/github.com/gomodule/redigo/internal/redistest" - "github.com/gogf/gf/third/github.com/gomodule/redigo/redis" - "github.com/gogf/gf/third/github.com/gomodule/redigo/redisx" + "github.com/gogf/gf/internal/thirdparty/github.com/gomodule/redigo/internal/redistest" + "github.com/gogf/gf/internal/thirdparty/github.com/gomodule/redigo/redis" + "github.com/gogf/gf/internal/thirdparty/github.com/gomodule/redigo/redisx" ) func TestConnMux(t *testing.T) { diff --git a/third/github.com/gomodule/redigo/redisx/doc.go b/internal/thirdparty/github.com/gomodule/redigo/redisx/doc.go similarity index 87% rename from third/github.com/gomodule/redigo/redisx/doc.go rename to internal/thirdparty/github.com/gomodule/redigo/redisx/doc.go index 6ba30474b..45318384c 100644 --- a/third/github.com/gomodule/redigo/redisx/doc.go +++ b/internal/thirdparty/github.com/gomodule/redigo/redisx/doc.go @@ -14,4 +14,4 @@ // Package redisx contains experimental features for Redigo. Features in this // package may be modified or deleted at any time. -package redisx // import "github.com/gogf/gf/third/github.com/gomodule/redigo/redisx" +package redisx // import "github.com/gogf/gf/internal/thirdparty/github.com/gomodule/redigo/redisx" diff --git a/third/github.com/gorilla/websocket/.gitignore b/internal/thirdparty/github.com/gorilla/websocket/.gitignore similarity index 100% rename from third/github.com/gorilla/websocket/.gitignore rename to internal/thirdparty/github.com/gorilla/websocket/.gitignore diff --git a/third/github.com/gorilla/websocket/.travis.yml b/internal/thirdparty/github.com/gorilla/websocket/.travis.yml similarity index 100% rename from third/github.com/gorilla/websocket/.travis.yml rename to internal/thirdparty/github.com/gorilla/websocket/.travis.yml diff --git a/third/github.com/gorilla/websocket/AUTHORS b/internal/thirdparty/github.com/gorilla/websocket/AUTHORS similarity index 100% rename from third/github.com/gorilla/websocket/AUTHORS rename to internal/thirdparty/github.com/gorilla/websocket/AUTHORS diff --git a/third/github.com/gorilla/websocket/LICENSE b/internal/thirdparty/github.com/gorilla/websocket/LICENSE similarity index 100% rename from third/github.com/gorilla/websocket/LICENSE rename to internal/thirdparty/github.com/gorilla/websocket/LICENSE diff --git a/third/github.com/gorilla/websocket/README.md b/internal/thirdparty/github.com/gorilla/websocket/README.md similarity index 100% rename from third/github.com/gorilla/websocket/README.md rename to internal/thirdparty/github.com/gorilla/websocket/README.md diff --git a/third/github.com/gorilla/websocket/client.go b/internal/thirdparty/github.com/gorilla/websocket/client.go similarity index 100% rename from third/github.com/gorilla/websocket/client.go rename to internal/thirdparty/github.com/gorilla/websocket/client.go diff --git a/third/github.com/gorilla/websocket/client_clone.go b/internal/thirdparty/github.com/gorilla/websocket/client_clone.go similarity index 100% rename from third/github.com/gorilla/websocket/client_clone.go rename to internal/thirdparty/github.com/gorilla/websocket/client_clone.go diff --git a/third/github.com/gorilla/websocket/client_clone_legacy.go b/internal/thirdparty/github.com/gorilla/websocket/client_clone_legacy.go similarity index 100% rename from third/github.com/gorilla/websocket/client_clone_legacy.go rename to internal/thirdparty/github.com/gorilla/websocket/client_clone_legacy.go diff --git a/third/github.com/gorilla/websocket/client_server_test.go b/internal/thirdparty/github.com/gorilla/websocket/client_server_test.go similarity index 100% rename from third/github.com/gorilla/websocket/client_server_test.go rename to internal/thirdparty/github.com/gorilla/websocket/client_server_test.go diff --git a/third/github.com/gorilla/websocket/client_test.go b/internal/thirdparty/github.com/gorilla/websocket/client_test.go similarity index 100% rename from third/github.com/gorilla/websocket/client_test.go rename to internal/thirdparty/github.com/gorilla/websocket/client_test.go diff --git a/third/github.com/gorilla/websocket/compression.go b/internal/thirdparty/github.com/gorilla/websocket/compression.go similarity index 100% rename from third/github.com/gorilla/websocket/compression.go rename to internal/thirdparty/github.com/gorilla/websocket/compression.go diff --git a/third/github.com/gorilla/websocket/compression_test.go b/internal/thirdparty/github.com/gorilla/websocket/compression_test.go similarity index 100% rename from third/github.com/gorilla/websocket/compression_test.go rename to internal/thirdparty/github.com/gorilla/websocket/compression_test.go diff --git a/third/github.com/gorilla/websocket/conn.go b/internal/thirdparty/github.com/gorilla/websocket/conn.go similarity index 100% rename from third/github.com/gorilla/websocket/conn.go rename to internal/thirdparty/github.com/gorilla/websocket/conn.go diff --git a/third/github.com/gorilla/websocket/conn_broadcast_test.go b/internal/thirdparty/github.com/gorilla/websocket/conn_broadcast_test.go similarity index 100% rename from third/github.com/gorilla/websocket/conn_broadcast_test.go rename to internal/thirdparty/github.com/gorilla/websocket/conn_broadcast_test.go diff --git a/third/github.com/gorilla/websocket/conn_read.go b/internal/thirdparty/github.com/gorilla/websocket/conn_read.go similarity index 100% rename from third/github.com/gorilla/websocket/conn_read.go rename to internal/thirdparty/github.com/gorilla/websocket/conn_read.go diff --git a/third/github.com/gorilla/websocket/conn_read_legacy.go b/internal/thirdparty/github.com/gorilla/websocket/conn_read_legacy.go similarity index 100% rename from third/github.com/gorilla/websocket/conn_read_legacy.go rename to internal/thirdparty/github.com/gorilla/websocket/conn_read_legacy.go diff --git a/third/github.com/gorilla/websocket/conn_test.go b/internal/thirdparty/github.com/gorilla/websocket/conn_test.go similarity index 100% rename from third/github.com/gorilla/websocket/conn_test.go rename to internal/thirdparty/github.com/gorilla/websocket/conn_test.go diff --git a/third/github.com/gorilla/websocket/conn_write.go b/internal/thirdparty/github.com/gorilla/websocket/conn_write.go similarity index 100% rename from third/github.com/gorilla/websocket/conn_write.go rename to internal/thirdparty/github.com/gorilla/websocket/conn_write.go diff --git a/third/github.com/gorilla/websocket/conn_write_legacy.go b/internal/thirdparty/github.com/gorilla/websocket/conn_write_legacy.go similarity index 100% rename from third/github.com/gorilla/websocket/conn_write_legacy.go rename to internal/thirdparty/github.com/gorilla/websocket/conn_write_legacy.go diff --git a/third/github.com/gorilla/websocket/doc.go b/internal/thirdparty/github.com/gorilla/websocket/doc.go similarity index 100% rename from third/github.com/gorilla/websocket/doc.go rename to internal/thirdparty/github.com/gorilla/websocket/doc.go diff --git a/third/github.com/gorilla/websocket/example_test.go b/internal/thirdparty/github.com/gorilla/websocket/example_test.go similarity index 94% rename from third/github.com/gorilla/websocket/example_test.go rename to internal/thirdparty/github.com/gorilla/websocket/example_test.go index 8ddb61919..f2b342ed9 100644 --- a/third/github.com/gorilla/websocket/example_test.go +++ b/internal/thirdparty/github.com/gorilla/websocket/example_test.go @@ -9,7 +9,7 @@ import ( "net/http" "testing" - "github.com/gogf/gf/third/github.com/gorilla/websocket" + "github.com/gogf/gf/internal/thirdparty/github.com/gorilla/websocket" ) var ( diff --git a/third/github.com/gorilla/websocket/json.go b/internal/thirdparty/github.com/gorilla/websocket/json.go similarity index 100% rename from third/github.com/gorilla/websocket/json.go rename to internal/thirdparty/github.com/gorilla/websocket/json.go diff --git a/third/github.com/gorilla/websocket/json_test.go b/internal/thirdparty/github.com/gorilla/websocket/json_test.go similarity index 100% rename from third/github.com/gorilla/websocket/json_test.go rename to internal/thirdparty/github.com/gorilla/websocket/json_test.go diff --git a/third/github.com/gorilla/websocket/mask.go b/internal/thirdparty/github.com/gorilla/websocket/mask.go similarity index 100% rename from third/github.com/gorilla/websocket/mask.go rename to internal/thirdparty/github.com/gorilla/websocket/mask.go diff --git a/third/github.com/gorilla/websocket/mask_safe.go b/internal/thirdparty/github.com/gorilla/websocket/mask_safe.go similarity index 100% rename from third/github.com/gorilla/websocket/mask_safe.go rename to internal/thirdparty/github.com/gorilla/websocket/mask_safe.go diff --git a/third/github.com/gorilla/websocket/mask_test.go b/internal/thirdparty/github.com/gorilla/websocket/mask_test.go similarity index 100% rename from third/github.com/gorilla/websocket/mask_test.go rename to internal/thirdparty/github.com/gorilla/websocket/mask_test.go diff --git a/third/github.com/gorilla/websocket/prepared.go b/internal/thirdparty/github.com/gorilla/websocket/prepared.go similarity index 100% rename from third/github.com/gorilla/websocket/prepared.go rename to internal/thirdparty/github.com/gorilla/websocket/prepared.go diff --git a/third/github.com/gorilla/websocket/prepared_test.go b/internal/thirdparty/github.com/gorilla/websocket/prepared_test.go similarity index 100% rename from third/github.com/gorilla/websocket/prepared_test.go rename to internal/thirdparty/github.com/gorilla/websocket/prepared_test.go diff --git a/third/github.com/gorilla/websocket/proxy.go b/internal/thirdparty/github.com/gorilla/websocket/proxy.go similarity index 100% rename from third/github.com/gorilla/websocket/proxy.go rename to internal/thirdparty/github.com/gorilla/websocket/proxy.go diff --git a/third/github.com/gorilla/websocket/server.go b/internal/thirdparty/github.com/gorilla/websocket/server.go similarity index 100% rename from third/github.com/gorilla/websocket/server.go rename to internal/thirdparty/github.com/gorilla/websocket/server.go diff --git a/third/github.com/gorilla/websocket/server_test.go b/internal/thirdparty/github.com/gorilla/websocket/server_test.go similarity index 100% rename from third/github.com/gorilla/websocket/server_test.go rename to internal/thirdparty/github.com/gorilla/websocket/server_test.go diff --git a/third/github.com/gorilla/websocket/util.go b/internal/thirdparty/github.com/gorilla/websocket/util.go similarity index 100% rename from third/github.com/gorilla/websocket/util.go rename to internal/thirdparty/github.com/gorilla/websocket/util.go diff --git a/third/github.com/gorilla/websocket/util_test.go b/internal/thirdparty/github.com/gorilla/websocket/util_test.go similarity index 100% rename from third/github.com/gorilla/websocket/util_test.go rename to internal/thirdparty/github.com/gorilla/websocket/util_test.go diff --git a/third/github.com/gorilla/websocket/x_net_proxy.go b/internal/thirdparty/github.com/gorilla/websocket/x_net_proxy.go similarity index 100% rename from third/github.com/gorilla/websocket/x_net_proxy.go rename to internal/thirdparty/github.com/gorilla/websocket/x_net_proxy.go diff --git a/third/github.com/grokify/html-strip-tags-go/.codeclimate.yml b/internal/thirdparty/github.com/grokify/html-strip-tags-go/.codeclimate.yml similarity index 100% rename from third/github.com/grokify/html-strip-tags-go/.codeclimate.yml rename to internal/thirdparty/github.com/grokify/html-strip-tags-go/.codeclimate.yml diff --git a/third/github.com/grokify/html-strip-tags-go/.travis.yml b/internal/thirdparty/github.com/grokify/html-strip-tags-go/.travis.yml similarity index 100% rename from third/github.com/grokify/html-strip-tags-go/.travis.yml rename to internal/thirdparty/github.com/grokify/html-strip-tags-go/.travis.yml diff --git a/third/github.com/grokify/html-strip-tags-go/LICENSE b/internal/thirdparty/github.com/grokify/html-strip-tags-go/LICENSE similarity index 100% rename from third/github.com/grokify/html-strip-tags-go/LICENSE rename to internal/thirdparty/github.com/grokify/html-strip-tags-go/LICENSE diff --git a/third/github.com/grokify/html-strip-tags-go/PATENTS b/internal/thirdparty/github.com/grokify/html-strip-tags-go/PATENTS similarity index 100% rename from third/github.com/grokify/html-strip-tags-go/PATENTS rename to internal/thirdparty/github.com/grokify/html-strip-tags-go/PATENTS diff --git a/third/github.com/grokify/html-strip-tags-go/README.md b/internal/thirdparty/github.com/grokify/html-strip-tags-go/README.md similarity index 96% rename from third/github.com/grokify/html-strip-tags-go/README.md rename to internal/thirdparty/github.com/grokify/html-strip-tags-go/README.md index 6398e99bc..b3798e1b1 100644 --- a/third/github.com/grokify/html-strip-tags-go/README.md +++ b/internal/thirdparty/github.com/grokify/html-strip-tags-go/README.md @@ -27,7 +27,7 @@ $ go get github.com/grokify/html-strip-tags-go ```go import( - "github.com/gogf/gf/third/github.com/grokify/html-strip-tags-go" // => strip + "github.com/gogf/gf/internal/thirdparty/github.com/grokify/html-strip-tags-go" // => strip ) func main() { diff --git a/third/github.com/grokify/html-strip-tags-go/strip.go b/internal/thirdparty/github.com/grokify/html-strip-tags-go/strip.go similarity index 100% rename from third/github.com/grokify/html-strip-tags-go/strip.go rename to internal/thirdparty/github.com/grokify/html-strip-tags-go/strip.go diff --git a/third/github.com/grokify/html-strip-tags-go/strip_test.go b/internal/thirdparty/github.com/grokify/html-strip-tags-go/strip_test.go similarity index 100% rename from third/github.com/grokify/html-strip-tags-go/strip_test.go rename to internal/thirdparty/github.com/grokify/html-strip-tags-go/strip_test.go diff --git a/third/github.com/mattn/go-runewidth/.travis.yml b/internal/thirdparty/github.com/mattn/go-runewidth/.travis.yml similarity index 100% rename from third/github.com/mattn/go-runewidth/.travis.yml rename to internal/thirdparty/github.com/mattn/go-runewidth/.travis.yml diff --git a/third/github.com/mattn/go-runewidth/LICENSE b/internal/thirdparty/github.com/mattn/go-runewidth/LICENSE similarity index 100% rename from third/github.com/mattn/go-runewidth/LICENSE rename to internal/thirdparty/github.com/mattn/go-runewidth/LICENSE diff --git a/third/github.com/mattn/go-runewidth/README.mkd b/internal/thirdparty/github.com/mattn/go-runewidth/README.mkd similarity index 100% rename from third/github.com/mattn/go-runewidth/README.mkd rename to internal/thirdparty/github.com/mattn/go-runewidth/README.mkd diff --git a/third/github.com/mattn/go-runewidth/runewidth.go b/internal/thirdparty/github.com/mattn/go-runewidth/runewidth.go similarity index 100% rename from third/github.com/mattn/go-runewidth/runewidth.go rename to internal/thirdparty/github.com/mattn/go-runewidth/runewidth.go diff --git a/third/github.com/mattn/go-runewidth/runewidth_js.go b/internal/thirdparty/github.com/mattn/go-runewidth/runewidth_js.go similarity index 100% rename from third/github.com/mattn/go-runewidth/runewidth_js.go rename to internal/thirdparty/github.com/mattn/go-runewidth/runewidth_js.go diff --git a/third/github.com/mattn/go-runewidth/runewidth_posix.go b/internal/thirdparty/github.com/mattn/go-runewidth/runewidth_posix.go similarity index 100% rename from third/github.com/mattn/go-runewidth/runewidth_posix.go rename to internal/thirdparty/github.com/mattn/go-runewidth/runewidth_posix.go diff --git a/third/github.com/mattn/go-runewidth/runewidth_posix_test.go b/internal/thirdparty/github.com/mattn/go-runewidth/runewidth_posix_test.go similarity index 100% rename from third/github.com/mattn/go-runewidth/runewidth_posix_test.go rename to internal/thirdparty/github.com/mattn/go-runewidth/runewidth_posix_test.go diff --git a/third/github.com/mattn/go-runewidth/runewidth_test.go b/internal/thirdparty/github.com/mattn/go-runewidth/runewidth_test.go similarity index 100% rename from third/github.com/mattn/go-runewidth/runewidth_test.go rename to internal/thirdparty/github.com/mattn/go-runewidth/runewidth_test.go diff --git a/third/github.com/mattn/go-runewidth/runewidth_windows.go b/internal/thirdparty/github.com/mattn/go-runewidth/runewidth_windows.go similarity index 100% rename from third/github.com/mattn/go-runewidth/runewidth_windows.go rename to internal/thirdparty/github.com/mattn/go-runewidth/runewidth_windows.go diff --git a/third/github.com/olekukonko/tablewriter/.gitignore b/internal/thirdparty/github.com/olekukonko/tablewriter/.gitignore similarity index 100% rename from third/github.com/olekukonko/tablewriter/.gitignore rename to internal/thirdparty/github.com/olekukonko/tablewriter/.gitignore diff --git a/third/github.com/olekukonko/tablewriter/.travis.yml b/internal/thirdparty/github.com/olekukonko/tablewriter/.travis.yml similarity index 100% rename from third/github.com/olekukonko/tablewriter/.travis.yml rename to internal/thirdparty/github.com/olekukonko/tablewriter/.travis.yml diff --git a/third/github.com/olekukonko/tablewriter/LICENCE.md b/internal/thirdparty/github.com/olekukonko/tablewriter/LICENCE.md similarity index 100% rename from third/github.com/olekukonko/tablewriter/LICENCE.md rename to internal/thirdparty/github.com/olekukonko/tablewriter/LICENCE.md diff --git a/third/github.com/olekukonko/tablewriter/README.md b/internal/thirdparty/github.com/olekukonko/tablewriter/README.md similarity index 100% rename from third/github.com/olekukonko/tablewriter/README.md rename to internal/thirdparty/github.com/olekukonko/tablewriter/README.md diff --git a/third/github.com/olekukonko/tablewriter/csv.go b/internal/thirdparty/github.com/olekukonko/tablewriter/csv.go similarity index 100% rename from third/github.com/olekukonko/tablewriter/csv.go rename to internal/thirdparty/github.com/olekukonko/tablewriter/csv.go diff --git a/third/github.com/olekukonko/tablewriter/csv2table/README.md b/internal/thirdparty/github.com/olekukonko/tablewriter/csv2table/README.md similarity index 100% rename from third/github.com/olekukonko/tablewriter/csv2table/README.md rename to internal/thirdparty/github.com/olekukonko/tablewriter/csv2table/README.md diff --git a/third/github.com/olekukonko/tablewriter/csv2table/csv2table.go b/internal/thirdparty/github.com/olekukonko/tablewriter/csv2table/csv2table.go similarity index 95% rename from third/github.com/olekukonko/tablewriter/csv2table/csv2table.go rename to internal/thirdparty/github.com/olekukonko/tablewriter/csv2table/csv2table.go index bb5b8a31c..a547323b4 100644 --- a/third/github.com/olekukonko/tablewriter/csv2table/csv2table.go +++ b/internal/thirdparty/github.com/olekukonko/tablewriter/csv2table/csv2table.go @@ -8,7 +8,7 @@ import ( "os" "unicode/utf8" - "github.com/gogf/gf/third/github.com/olekukonko/tablewriter" + "github.com/gogf/gf/internal/thirdparty/github.com/olekukonko/tablewriter" ) var ( diff --git a/third/github.com/olekukonko/tablewriter/table.go b/internal/thirdparty/github.com/olekukonko/tablewriter/table.go similarity index 100% rename from third/github.com/olekukonko/tablewriter/table.go rename to internal/thirdparty/github.com/olekukonko/tablewriter/table.go diff --git a/third/github.com/olekukonko/tablewriter/table_test.go b/internal/thirdparty/github.com/olekukonko/tablewriter/table_test.go similarity index 100% rename from third/github.com/olekukonko/tablewriter/table_test.go rename to internal/thirdparty/github.com/olekukonko/tablewriter/table_test.go diff --git a/third/github.com/olekukonko/tablewriter/table_with_color.go b/internal/thirdparty/github.com/olekukonko/tablewriter/table_with_color.go similarity index 100% rename from third/github.com/olekukonko/tablewriter/table_with_color.go rename to internal/thirdparty/github.com/olekukonko/tablewriter/table_with_color.go diff --git a/third/github.com/olekukonko/tablewriter/util.go b/internal/thirdparty/github.com/olekukonko/tablewriter/util.go similarity index 96% rename from third/github.com/olekukonko/tablewriter/util.go rename to internal/thirdparty/github.com/olekukonko/tablewriter/util.go index cbb2e50a5..a79f9a9c5 100644 --- a/third/github.com/olekukonko/tablewriter/util.go +++ b/internal/thirdparty/github.com/olekukonko/tablewriter/util.go @@ -12,7 +12,7 @@ import ( "regexp" "strings" - "github.com/gogf/gf/third/github.com/mattn/go-runewidth" + "github.com/gogf/gf/internal/thirdparty/github.com/mattn/go-runewidth" ) var ansi = regexp.MustCompile("\033\\[(?:[0-9]{1,3}(?:;[0-9]{1,3})*)?[m|K]") diff --git a/third/github.com/olekukonko/tablewriter/wrap.go b/internal/thirdparty/github.com/olekukonko/tablewriter/wrap.go similarity index 97% rename from third/github.com/olekukonko/tablewriter/wrap.go rename to internal/thirdparty/github.com/olekukonko/tablewriter/wrap.go index bda4d5ce9..7ae831919 100644 --- a/third/github.com/olekukonko/tablewriter/wrap.go +++ b/internal/thirdparty/github.com/olekukonko/tablewriter/wrap.go @@ -11,7 +11,7 @@ import ( "math" "strings" - "github.com/gogf/gf/third/github.com/mattn/go-runewidth" + "github.com/gogf/gf/internal/thirdparty/github.com/mattn/go-runewidth" ) var ( diff --git a/third/github.com/olekukonko/tablewriter/wrap_test.go b/internal/thirdparty/github.com/olekukonko/tablewriter/wrap_test.go similarity index 95% rename from third/github.com/olekukonko/tablewriter/wrap_test.go rename to internal/thirdparty/github.com/olekukonko/tablewriter/wrap_test.go index cfa866043..c6cbe2213 100644 --- a/third/github.com/olekukonko/tablewriter/wrap_test.go +++ b/internal/thirdparty/github.com/olekukonko/tablewriter/wrap_test.go @@ -11,7 +11,7 @@ import ( "strings" "testing" - "github.com/gogf/gf/third/github.com/mattn/go-runewidth" + "github.com/gogf/gf/internal/thirdparty/github.com/mattn/go-runewidth" ) var text = "The quick brown fox jumps over the lazy dog." diff --git a/third/github.com/stathat/go/.gitignore b/internal/thirdparty/github.com/stathat/go/.gitignore similarity index 100% rename from third/github.com/stathat/go/.gitignore rename to internal/thirdparty/github.com/stathat/go/.gitignore diff --git a/third/github.com/stathat/go/LICENSE b/internal/thirdparty/github.com/stathat/go/LICENSE similarity index 100% rename from third/github.com/stathat/go/LICENSE rename to internal/thirdparty/github.com/stathat/go/LICENSE diff --git a/third/github.com/stathat/go/README.md b/internal/thirdparty/github.com/stathat/go/README.md similarity index 100% rename from third/github.com/stathat/go/README.md rename to internal/thirdparty/github.com/stathat/go/README.md diff --git a/third/github.com/stathat/go/example_test.go b/internal/thirdparty/github.com/stathat/go/example_test.go similarity index 100% rename from third/github.com/stathat/go/example_test.go rename to internal/thirdparty/github.com/stathat/go/example_test.go diff --git a/third/github.com/stathat/go/stathat.go b/internal/thirdparty/github.com/stathat/go/stathat.go similarity index 100% rename from third/github.com/stathat/go/stathat.go rename to internal/thirdparty/github.com/stathat/go/stathat.go diff --git a/third/github.com/stathat/go/stathat_test.go b/internal/thirdparty/github.com/stathat/go/stathat_test.go similarity index 100% rename from third/github.com/stathat/go/stathat_test.go rename to internal/thirdparty/github.com/stathat/go/stathat_test.go diff --git a/third/github.com/theckman/go-flock/LICENSE b/internal/thirdparty/github.com/theckman/go-flock/LICENSE similarity index 100% rename from third/github.com/theckman/go-flock/LICENSE rename to internal/thirdparty/github.com/theckman/go-flock/LICENSE diff --git a/third/github.com/theckman/go-flock/README.md b/internal/thirdparty/github.com/theckman/go-flock/README.md similarity index 94% rename from third/github.com/theckman/go-flock/README.md rename to internal/thirdparty/github.com/theckman/go-flock/README.md index da9526d78..ea9cb9af4 100644 --- a/third/github.com/theckman/go-flock/README.md +++ b/internal/thirdparty/github.com/theckman/go-flock/README.md @@ -20,7 +20,7 @@ go get -u github.com/theckman/go-flock ## Usage ```Go -import "github.com/gogf/gf/third/github.com/theckman/go-flock" +import "github.com/gogf/gf/internal/thirdparty/github.com/theckman/go-flock" fileLock := flock.NewFlock("/var/lock/go-lock.lock") diff --git a/third/github.com/theckman/go-flock/flock.go b/internal/thirdparty/github.com/theckman/go-flock/flock.go similarity index 100% rename from third/github.com/theckman/go-flock/flock.go rename to internal/thirdparty/github.com/theckman/go-flock/flock.go diff --git a/third/github.com/theckman/go-flock/flock_unix.go b/internal/thirdparty/github.com/theckman/go-flock/flock_unix.go similarity index 100% rename from third/github.com/theckman/go-flock/flock_unix.go rename to internal/thirdparty/github.com/theckman/go-flock/flock_unix.go diff --git a/third/github.com/theckman/go-flock/flock_winapi.go b/internal/thirdparty/github.com/theckman/go-flock/flock_winapi.go similarity index 100% rename from third/github.com/theckman/go-flock/flock_winapi.go rename to internal/thirdparty/github.com/theckman/go-flock/flock_winapi.go diff --git a/third/github.com/theckman/go-flock/flock_windows.go b/internal/thirdparty/github.com/theckman/go-flock/flock_windows.go similarity index 100% rename from third/github.com/theckman/go-flock/flock_windows.go rename to internal/thirdparty/github.com/theckman/go-flock/flock_windows.go diff --git a/third/golang.org/x/sys/AUTHORS b/internal/thirdparty/golang.org/x/sys/AUTHORS similarity index 100% rename from third/golang.org/x/sys/AUTHORS rename to internal/thirdparty/golang.org/x/sys/AUTHORS diff --git a/third/golang.org/x/sys/CONTRIBUTING.md b/internal/thirdparty/golang.org/x/sys/CONTRIBUTING.md similarity index 100% rename from third/golang.org/x/sys/CONTRIBUTING.md rename to internal/thirdparty/golang.org/x/sys/CONTRIBUTING.md diff --git a/third/golang.org/x/sys/CONTRIBUTORS b/internal/thirdparty/golang.org/x/sys/CONTRIBUTORS similarity index 100% rename from third/golang.org/x/sys/CONTRIBUTORS rename to internal/thirdparty/golang.org/x/sys/CONTRIBUTORS diff --git a/third/golang.org/x/sys/LICENSE b/internal/thirdparty/golang.org/x/sys/LICENSE similarity index 100% rename from third/golang.org/x/sys/LICENSE rename to internal/thirdparty/golang.org/x/sys/LICENSE diff --git a/third/golang.org/x/sys/PATENTS b/internal/thirdparty/golang.org/x/sys/PATENTS similarity index 100% rename from third/golang.org/x/sys/PATENTS rename to internal/thirdparty/golang.org/x/sys/PATENTS diff --git a/third/golang.org/x/sys/README.md b/internal/thirdparty/golang.org/x/sys/README.md similarity index 100% rename from third/golang.org/x/sys/README.md rename to internal/thirdparty/golang.org/x/sys/README.md diff --git a/third/golang.org/x/sys/codereview.cfg b/internal/thirdparty/golang.org/x/sys/codereview.cfg similarity index 100% rename from third/golang.org/x/sys/codereview.cfg rename to internal/thirdparty/golang.org/x/sys/codereview.cfg diff --git a/third/golang.org/x/sys/cpu/cpu.go b/internal/thirdparty/golang.org/x/sys/cpu/cpu.go similarity index 100% rename from third/golang.org/x/sys/cpu/cpu.go rename to internal/thirdparty/golang.org/x/sys/cpu/cpu.go diff --git a/third/golang.org/x/sys/cpu/cpu_arm.go b/internal/thirdparty/golang.org/x/sys/cpu/cpu_arm.go similarity index 100% rename from third/golang.org/x/sys/cpu/cpu_arm.go rename to internal/thirdparty/golang.org/x/sys/cpu/cpu_arm.go diff --git a/third/golang.org/x/sys/cpu/cpu_arm64.go b/internal/thirdparty/golang.org/x/sys/cpu/cpu_arm64.go similarity index 100% rename from third/golang.org/x/sys/cpu/cpu_arm64.go rename to internal/thirdparty/golang.org/x/sys/cpu/cpu_arm64.go diff --git a/third/golang.org/x/sys/cpu/cpu_gc_x86.go b/internal/thirdparty/golang.org/x/sys/cpu/cpu_gc_x86.go similarity index 100% rename from third/golang.org/x/sys/cpu/cpu_gc_x86.go rename to internal/thirdparty/golang.org/x/sys/cpu/cpu_gc_x86.go diff --git a/third/golang.org/x/sys/cpu/cpu_gccgo.c b/internal/thirdparty/golang.org/x/sys/cpu/cpu_gccgo.c similarity index 100% rename from third/golang.org/x/sys/cpu/cpu_gccgo.c rename to internal/thirdparty/golang.org/x/sys/cpu/cpu_gccgo.c diff --git a/third/golang.org/x/sys/cpu/cpu_gccgo.go b/internal/thirdparty/golang.org/x/sys/cpu/cpu_gccgo.go similarity index 100% rename from third/golang.org/x/sys/cpu/cpu_gccgo.go rename to internal/thirdparty/golang.org/x/sys/cpu/cpu_gccgo.go diff --git a/third/golang.org/x/sys/cpu/cpu_linux.go b/internal/thirdparty/golang.org/x/sys/cpu/cpu_linux.go similarity index 100% rename from third/golang.org/x/sys/cpu/cpu_linux.go rename to internal/thirdparty/golang.org/x/sys/cpu/cpu_linux.go diff --git a/third/golang.org/x/sys/cpu/cpu_mips64x.go b/internal/thirdparty/golang.org/x/sys/cpu/cpu_mips64x.go similarity index 100% rename from third/golang.org/x/sys/cpu/cpu_mips64x.go rename to internal/thirdparty/golang.org/x/sys/cpu/cpu_mips64x.go diff --git a/third/golang.org/x/sys/cpu/cpu_mipsx.go b/internal/thirdparty/golang.org/x/sys/cpu/cpu_mipsx.go similarity index 100% rename from third/golang.org/x/sys/cpu/cpu_mipsx.go rename to internal/thirdparty/golang.org/x/sys/cpu/cpu_mipsx.go diff --git a/third/golang.org/x/sys/cpu/cpu_ppc64x.go b/internal/thirdparty/golang.org/x/sys/cpu/cpu_ppc64x.go similarity index 100% rename from third/golang.org/x/sys/cpu/cpu_ppc64x.go rename to internal/thirdparty/golang.org/x/sys/cpu/cpu_ppc64x.go diff --git a/third/golang.org/x/sys/cpu/cpu_s390x.go b/internal/thirdparty/golang.org/x/sys/cpu/cpu_s390x.go similarity index 100% rename from third/golang.org/x/sys/cpu/cpu_s390x.go rename to internal/thirdparty/golang.org/x/sys/cpu/cpu_s390x.go diff --git a/third/golang.org/x/sys/cpu/cpu_test.go b/internal/thirdparty/golang.org/x/sys/cpu/cpu_test.go similarity index 95% rename from third/golang.org/x/sys/cpu/cpu_test.go rename to internal/thirdparty/golang.org/x/sys/cpu/cpu_test.go index 15f48f620..640fb340a 100644 --- a/third/golang.org/x/sys/cpu/cpu_test.go +++ b/internal/thirdparty/golang.org/x/sys/cpu/cpu_test.go @@ -8,7 +8,7 @@ import ( "runtime" "testing" - "github.com/gogf/gf/third/golang.org/x/sys/cpu" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/cpu" ) func TestAMD64minimalFeatures(t *testing.T) { diff --git a/third/golang.org/x/sys/cpu/cpu_x86.go b/internal/thirdparty/golang.org/x/sys/cpu/cpu_x86.go similarity index 100% rename from third/golang.org/x/sys/cpu/cpu_x86.go rename to internal/thirdparty/golang.org/x/sys/cpu/cpu_x86.go diff --git a/third/golang.org/x/sys/cpu/cpu_x86.s b/internal/thirdparty/golang.org/x/sys/cpu/cpu_x86.s similarity index 100% rename from third/golang.org/x/sys/cpu/cpu_x86.s rename to internal/thirdparty/golang.org/x/sys/cpu/cpu_x86.s diff --git a/third/golang.org/x/sys/plan9/asm.s b/internal/thirdparty/golang.org/x/sys/plan9/asm.s similarity index 100% rename from third/golang.org/x/sys/plan9/asm.s rename to internal/thirdparty/golang.org/x/sys/plan9/asm.s diff --git a/third/golang.org/x/sys/plan9/asm_plan9_386.s b/internal/thirdparty/golang.org/x/sys/plan9/asm_plan9_386.s similarity index 100% rename from third/golang.org/x/sys/plan9/asm_plan9_386.s rename to internal/thirdparty/golang.org/x/sys/plan9/asm_plan9_386.s diff --git a/third/golang.org/x/sys/plan9/asm_plan9_amd64.s b/internal/thirdparty/golang.org/x/sys/plan9/asm_plan9_amd64.s similarity index 100% rename from third/golang.org/x/sys/plan9/asm_plan9_amd64.s rename to internal/thirdparty/golang.org/x/sys/plan9/asm_plan9_amd64.s diff --git a/third/golang.org/x/sys/plan9/asm_plan9_arm.s b/internal/thirdparty/golang.org/x/sys/plan9/asm_plan9_arm.s similarity index 100% rename from third/golang.org/x/sys/plan9/asm_plan9_arm.s rename to internal/thirdparty/golang.org/x/sys/plan9/asm_plan9_arm.s diff --git a/third/golang.org/x/sys/plan9/const_plan9.go b/internal/thirdparty/golang.org/x/sys/plan9/const_plan9.go similarity index 100% rename from third/golang.org/x/sys/plan9/const_plan9.go rename to internal/thirdparty/golang.org/x/sys/plan9/const_plan9.go diff --git a/third/golang.org/x/sys/plan9/dir_plan9.go b/internal/thirdparty/golang.org/x/sys/plan9/dir_plan9.go similarity index 100% rename from third/golang.org/x/sys/plan9/dir_plan9.go rename to internal/thirdparty/golang.org/x/sys/plan9/dir_plan9.go diff --git a/third/golang.org/x/sys/plan9/env_plan9.go b/internal/thirdparty/golang.org/x/sys/plan9/env_plan9.go similarity index 100% rename from third/golang.org/x/sys/plan9/env_plan9.go rename to internal/thirdparty/golang.org/x/sys/plan9/env_plan9.go diff --git a/third/golang.org/x/sys/plan9/errors_plan9.go b/internal/thirdparty/golang.org/x/sys/plan9/errors_plan9.go similarity index 100% rename from third/golang.org/x/sys/plan9/errors_plan9.go rename to internal/thirdparty/golang.org/x/sys/plan9/errors_plan9.go diff --git a/third/golang.org/x/sys/plan9/mkall.sh b/internal/thirdparty/golang.org/x/sys/plan9/mkall.sh similarity index 100% rename from third/golang.org/x/sys/plan9/mkall.sh rename to internal/thirdparty/golang.org/x/sys/plan9/mkall.sh diff --git a/third/golang.org/x/sys/plan9/mkerrors.sh b/internal/thirdparty/golang.org/x/sys/plan9/mkerrors.sh similarity index 100% rename from third/golang.org/x/sys/plan9/mkerrors.sh rename to internal/thirdparty/golang.org/x/sys/plan9/mkerrors.sh diff --git a/third/golang.org/x/sys/plan9/mksyscall.go b/internal/thirdparty/golang.org/x/sys/plan9/mksyscall.go similarity index 100% rename from third/golang.org/x/sys/plan9/mksyscall.go rename to internal/thirdparty/golang.org/x/sys/plan9/mksyscall.go diff --git a/third/golang.org/x/sys/plan9/mksysnum_plan9.sh b/internal/thirdparty/golang.org/x/sys/plan9/mksysnum_plan9.sh similarity index 100% rename from third/golang.org/x/sys/plan9/mksysnum_plan9.sh rename to internal/thirdparty/golang.org/x/sys/plan9/mksysnum_plan9.sh diff --git a/third/golang.org/x/sys/plan9/pwd_go15_plan9.go b/internal/thirdparty/golang.org/x/sys/plan9/pwd_go15_plan9.go similarity index 100% rename from third/golang.org/x/sys/plan9/pwd_go15_plan9.go rename to internal/thirdparty/golang.org/x/sys/plan9/pwd_go15_plan9.go diff --git a/third/golang.org/x/sys/plan9/pwd_plan9.go b/internal/thirdparty/golang.org/x/sys/plan9/pwd_plan9.go similarity index 100% rename from third/golang.org/x/sys/plan9/pwd_plan9.go rename to internal/thirdparty/golang.org/x/sys/plan9/pwd_plan9.go diff --git a/third/golang.org/x/sys/plan9/race.go b/internal/thirdparty/golang.org/x/sys/plan9/race.go similarity index 100% rename from third/golang.org/x/sys/plan9/race.go rename to internal/thirdparty/golang.org/x/sys/plan9/race.go diff --git a/third/golang.org/x/sys/plan9/race0.go b/internal/thirdparty/golang.org/x/sys/plan9/race0.go similarity index 100% rename from third/golang.org/x/sys/plan9/race0.go rename to internal/thirdparty/golang.org/x/sys/plan9/race0.go diff --git a/third/golang.org/x/sys/plan9/str.go b/internal/thirdparty/golang.org/x/sys/plan9/str.go similarity index 100% rename from third/golang.org/x/sys/plan9/str.go rename to internal/thirdparty/golang.org/x/sys/plan9/str.go diff --git a/third/golang.org/x/sys/plan9/syscall.go b/internal/thirdparty/golang.org/x/sys/plan9/syscall.go similarity index 96% rename from third/golang.org/x/sys/plan9/syscall.go rename to internal/thirdparty/golang.org/x/sys/plan9/syscall.go index 85954e195..c026f31e2 100644 --- a/third/golang.org/x/sys/plan9/syscall.go +++ b/internal/thirdparty/golang.org/x/sys/plan9/syscall.go @@ -22,7 +22,7 @@ // These calls return err == nil to indicate success; otherwise // err represents an operating system error describing the failure and // holds a value of type syscall.ErrorString. -package plan9 // import "github.com/gogf/gf/third/golang.org/x/sys/plan9" +package plan9 // import "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/plan9" import "unsafe" diff --git a/third/golang.org/x/sys/plan9/syscall_plan9.go b/internal/thirdparty/golang.org/x/sys/plan9/syscall_plan9.go similarity index 100% rename from third/golang.org/x/sys/plan9/syscall_plan9.go rename to internal/thirdparty/golang.org/x/sys/plan9/syscall_plan9.go diff --git a/third/golang.org/x/sys/plan9/syscall_test.go b/internal/thirdparty/golang.org/x/sys/plan9/syscall_test.go similarity index 92% rename from third/golang.org/x/sys/plan9/syscall_test.go rename to internal/thirdparty/golang.org/x/sys/plan9/syscall_test.go index b57b90df0..83e2a1f03 100644 --- a/third/golang.org/x/sys/plan9/syscall_test.go +++ b/internal/thirdparty/golang.org/x/sys/plan9/syscall_test.go @@ -9,7 +9,7 @@ package plan9_test import ( "testing" - "github.com/gogf/gf/third/golang.org/x/sys/plan9" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/plan9" ) func testSetGetenv(t *testing.T, key, value string) { diff --git a/third/golang.org/x/sys/plan9/zsyscall_plan9_386.go b/internal/thirdparty/golang.org/x/sys/plan9/zsyscall_plan9_386.go similarity index 100% rename from third/golang.org/x/sys/plan9/zsyscall_plan9_386.go rename to internal/thirdparty/golang.org/x/sys/plan9/zsyscall_plan9_386.go diff --git a/third/golang.org/x/sys/plan9/zsyscall_plan9_amd64.go b/internal/thirdparty/golang.org/x/sys/plan9/zsyscall_plan9_amd64.go similarity index 100% rename from third/golang.org/x/sys/plan9/zsyscall_plan9_amd64.go rename to internal/thirdparty/golang.org/x/sys/plan9/zsyscall_plan9_amd64.go diff --git a/third/golang.org/x/sys/plan9/zsyscall_plan9_arm.go b/internal/thirdparty/golang.org/x/sys/plan9/zsyscall_plan9_arm.go similarity index 100% rename from third/golang.org/x/sys/plan9/zsyscall_plan9_arm.go rename to internal/thirdparty/golang.org/x/sys/plan9/zsyscall_plan9_arm.go diff --git a/third/golang.org/x/sys/plan9/zsysnum_plan9.go b/internal/thirdparty/golang.org/x/sys/plan9/zsysnum_plan9.go similarity index 100% rename from third/golang.org/x/sys/plan9/zsysnum_plan9.go rename to internal/thirdparty/golang.org/x/sys/plan9/zsysnum_plan9.go diff --git a/third/golang.org/x/sys/unix/.gitignore b/internal/thirdparty/golang.org/x/sys/unix/.gitignore similarity index 100% rename from third/golang.org/x/sys/unix/.gitignore rename to internal/thirdparty/golang.org/x/sys/unix/.gitignore diff --git a/third/golang.org/x/sys/unix/README.md b/internal/thirdparty/golang.org/x/sys/unix/README.md similarity index 100% rename from third/golang.org/x/sys/unix/README.md rename to internal/thirdparty/golang.org/x/sys/unix/README.md diff --git a/third/golang.org/x/sys/unix/affinity_linux.go b/internal/thirdparty/golang.org/x/sys/unix/affinity_linux.go similarity index 100% rename from third/golang.org/x/sys/unix/affinity_linux.go rename to internal/thirdparty/golang.org/x/sys/unix/affinity_linux.go diff --git a/third/golang.org/x/sys/unix/aliases.go b/internal/thirdparty/golang.org/x/sys/unix/aliases.go similarity index 100% rename from third/golang.org/x/sys/unix/aliases.go rename to internal/thirdparty/golang.org/x/sys/unix/aliases.go diff --git a/third/golang.org/x/sys/unix/asm_aix_ppc64.s b/internal/thirdparty/golang.org/x/sys/unix/asm_aix_ppc64.s similarity index 100% rename from third/golang.org/x/sys/unix/asm_aix_ppc64.s rename to internal/thirdparty/golang.org/x/sys/unix/asm_aix_ppc64.s diff --git a/third/golang.org/x/sys/unix/asm_darwin_386.s b/internal/thirdparty/golang.org/x/sys/unix/asm_darwin_386.s similarity index 100% rename from third/golang.org/x/sys/unix/asm_darwin_386.s rename to internal/thirdparty/golang.org/x/sys/unix/asm_darwin_386.s diff --git a/third/golang.org/x/sys/unix/asm_darwin_amd64.s b/internal/thirdparty/golang.org/x/sys/unix/asm_darwin_amd64.s similarity index 100% rename from third/golang.org/x/sys/unix/asm_darwin_amd64.s rename to internal/thirdparty/golang.org/x/sys/unix/asm_darwin_amd64.s diff --git a/third/golang.org/x/sys/unix/asm_darwin_arm.s b/internal/thirdparty/golang.org/x/sys/unix/asm_darwin_arm.s similarity index 100% rename from third/golang.org/x/sys/unix/asm_darwin_arm.s rename to internal/thirdparty/golang.org/x/sys/unix/asm_darwin_arm.s diff --git a/third/golang.org/x/sys/unix/asm_darwin_arm64.s b/internal/thirdparty/golang.org/x/sys/unix/asm_darwin_arm64.s similarity index 100% rename from third/golang.org/x/sys/unix/asm_darwin_arm64.s rename to internal/thirdparty/golang.org/x/sys/unix/asm_darwin_arm64.s diff --git a/third/golang.org/x/sys/unix/asm_dragonfly_amd64.s b/internal/thirdparty/golang.org/x/sys/unix/asm_dragonfly_amd64.s similarity index 100% rename from third/golang.org/x/sys/unix/asm_dragonfly_amd64.s rename to internal/thirdparty/golang.org/x/sys/unix/asm_dragonfly_amd64.s diff --git a/third/golang.org/x/sys/unix/asm_freebsd_386.s b/internal/thirdparty/golang.org/x/sys/unix/asm_freebsd_386.s similarity index 100% rename from third/golang.org/x/sys/unix/asm_freebsd_386.s rename to internal/thirdparty/golang.org/x/sys/unix/asm_freebsd_386.s diff --git a/third/golang.org/x/sys/unix/asm_freebsd_amd64.s b/internal/thirdparty/golang.org/x/sys/unix/asm_freebsd_amd64.s similarity index 100% rename from third/golang.org/x/sys/unix/asm_freebsd_amd64.s rename to internal/thirdparty/golang.org/x/sys/unix/asm_freebsd_amd64.s diff --git a/third/golang.org/x/sys/unix/asm_freebsd_arm.s b/internal/thirdparty/golang.org/x/sys/unix/asm_freebsd_arm.s similarity index 100% rename from third/golang.org/x/sys/unix/asm_freebsd_arm.s rename to internal/thirdparty/golang.org/x/sys/unix/asm_freebsd_arm.s diff --git a/third/golang.org/x/sys/unix/asm_freebsd_arm64.s b/internal/thirdparty/golang.org/x/sys/unix/asm_freebsd_arm64.s similarity index 100% rename from third/golang.org/x/sys/unix/asm_freebsd_arm64.s rename to internal/thirdparty/golang.org/x/sys/unix/asm_freebsd_arm64.s diff --git a/third/golang.org/x/sys/unix/asm_linux_386.s b/internal/thirdparty/golang.org/x/sys/unix/asm_linux_386.s similarity index 100% rename from third/golang.org/x/sys/unix/asm_linux_386.s rename to internal/thirdparty/golang.org/x/sys/unix/asm_linux_386.s diff --git a/third/golang.org/x/sys/unix/asm_linux_amd64.s b/internal/thirdparty/golang.org/x/sys/unix/asm_linux_amd64.s similarity index 100% rename from third/golang.org/x/sys/unix/asm_linux_amd64.s rename to internal/thirdparty/golang.org/x/sys/unix/asm_linux_amd64.s diff --git a/third/golang.org/x/sys/unix/asm_linux_arm.s b/internal/thirdparty/golang.org/x/sys/unix/asm_linux_arm.s similarity index 100% rename from third/golang.org/x/sys/unix/asm_linux_arm.s rename to internal/thirdparty/golang.org/x/sys/unix/asm_linux_arm.s diff --git a/third/golang.org/x/sys/unix/asm_linux_arm64.s b/internal/thirdparty/golang.org/x/sys/unix/asm_linux_arm64.s similarity index 100% rename from third/golang.org/x/sys/unix/asm_linux_arm64.s rename to internal/thirdparty/golang.org/x/sys/unix/asm_linux_arm64.s diff --git a/third/golang.org/x/sys/unix/asm_linux_mips64x.s b/internal/thirdparty/golang.org/x/sys/unix/asm_linux_mips64x.s similarity index 100% rename from third/golang.org/x/sys/unix/asm_linux_mips64x.s rename to internal/thirdparty/golang.org/x/sys/unix/asm_linux_mips64x.s diff --git a/third/golang.org/x/sys/unix/asm_linux_mipsx.s b/internal/thirdparty/golang.org/x/sys/unix/asm_linux_mipsx.s similarity index 100% rename from third/golang.org/x/sys/unix/asm_linux_mipsx.s rename to internal/thirdparty/golang.org/x/sys/unix/asm_linux_mipsx.s diff --git a/third/golang.org/x/sys/unix/asm_linux_ppc64x.s b/internal/thirdparty/golang.org/x/sys/unix/asm_linux_ppc64x.s similarity index 100% rename from third/golang.org/x/sys/unix/asm_linux_ppc64x.s rename to internal/thirdparty/golang.org/x/sys/unix/asm_linux_ppc64x.s diff --git a/third/golang.org/x/sys/unix/asm_linux_s390x.s b/internal/thirdparty/golang.org/x/sys/unix/asm_linux_s390x.s similarity index 100% rename from third/golang.org/x/sys/unix/asm_linux_s390x.s rename to internal/thirdparty/golang.org/x/sys/unix/asm_linux_s390x.s diff --git a/third/golang.org/x/sys/unix/asm_netbsd_386.s b/internal/thirdparty/golang.org/x/sys/unix/asm_netbsd_386.s similarity index 100% rename from third/golang.org/x/sys/unix/asm_netbsd_386.s rename to internal/thirdparty/golang.org/x/sys/unix/asm_netbsd_386.s diff --git a/third/golang.org/x/sys/unix/asm_netbsd_amd64.s b/internal/thirdparty/golang.org/x/sys/unix/asm_netbsd_amd64.s similarity index 100% rename from third/golang.org/x/sys/unix/asm_netbsd_amd64.s rename to internal/thirdparty/golang.org/x/sys/unix/asm_netbsd_amd64.s diff --git a/third/golang.org/x/sys/unix/asm_netbsd_arm.s b/internal/thirdparty/golang.org/x/sys/unix/asm_netbsd_arm.s similarity index 100% rename from third/golang.org/x/sys/unix/asm_netbsd_arm.s rename to internal/thirdparty/golang.org/x/sys/unix/asm_netbsd_arm.s diff --git a/third/golang.org/x/sys/unix/asm_netbsd_arm64.s b/internal/thirdparty/golang.org/x/sys/unix/asm_netbsd_arm64.s similarity index 100% rename from third/golang.org/x/sys/unix/asm_netbsd_arm64.s rename to internal/thirdparty/golang.org/x/sys/unix/asm_netbsd_arm64.s diff --git a/third/golang.org/x/sys/unix/asm_openbsd_386.s b/internal/thirdparty/golang.org/x/sys/unix/asm_openbsd_386.s similarity index 100% rename from third/golang.org/x/sys/unix/asm_openbsd_386.s rename to internal/thirdparty/golang.org/x/sys/unix/asm_openbsd_386.s diff --git a/third/golang.org/x/sys/unix/asm_openbsd_amd64.s b/internal/thirdparty/golang.org/x/sys/unix/asm_openbsd_amd64.s similarity index 100% rename from third/golang.org/x/sys/unix/asm_openbsd_amd64.s rename to internal/thirdparty/golang.org/x/sys/unix/asm_openbsd_amd64.s diff --git a/third/golang.org/x/sys/unix/asm_openbsd_arm.s b/internal/thirdparty/golang.org/x/sys/unix/asm_openbsd_arm.s similarity index 100% rename from third/golang.org/x/sys/unix/asm_openbsd_arm.s rename to internal/thirdparty/golang.org/x/sys/unix/asm_openbsd_arm.s diff --git a/third/golang.org/x/sys/unix/asm_solaris_amd64.s b/internal/thirdparty/golang.org/x/sys/unix/asm_solaris_amd64.s similarity index 100% rename from third/golang.org/x/sys/unix/asm_solaris_amd64.s rename to internal/thirdparty/golang.org/x/sys/unix/asm_solaris_amd64.s diff --git a/third/golang.org/x/sys/unix/bluetooth_linux.go b/internal/thirdparty/golang.org/x/sys/unix/bluetooth_linux.go similarity index 100% rename from third/golang.org/x/sys/unix/bluetooth_linux.go rename to internal/thirdparty/golang.org/x/sys/unix/bluetooth_linux.go diff --git a/third/golang.org/x/sys/unix/cap_freebsd.go b/internal/thirdparty/golang.org/x/sys/unix/cap_freebsd.go similarity index 100% rename from third/golang.org/x/sys/unix/cap_freebsd.go rename to internal/thirdparty/golang.org/x/sys/unix/cap_freebsd.go diff --git a/third/golang.org/x/sys/unix/constants.go b/internal/thirdparty/golang.org/x/sys/unix/constants.go similarity index 100% rename from third/golang.org/x/sys/unix/constants.go rename to internal/thirdparty/golang.org/x/sys/unix/constants.go diff --git a/third/golang.org/x/sys/unix/creds_test.go b/internal/thirdparty/golang.org/x/sys/unix/creds_test.go similarity index 98% rename from third/golang.org/x/sys/unix/creds_test.go rename to internal/thirdparty/golang.org/x/sys/unix/creds_test.go index 4e2fdb32a..19c3f92b1 100644 --- a/third/golang.org/x/sys/unix/creds_test.go +++ b/internal/thirdparty/golang.org/x/sys/unix/creds_test.go @@ -13,7 +13,7 @@ import ( "os" "testing" - "github.com/gogf/gf/third/golang.org/x/sys/unix" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/unix" ) // TestSCMCredentials tests the sending and receiving of credentials diff --git a/third/golang.org/x/sys/unix/darwin_test.go b/internal/thirdparty/golang.org/x/sys/unix/darwin_test.go similarity index 100% rename from third/golang.org/x/sys/unix/darwin_test.go rename to internal/thirdparty/golang.org/x/sys/unix/darwin_test.go diff --git a/third/golang.org/x/sys/unix/dev_aix_ppc.go b/internal/thirdparty/golang.org/x/sys/unix/dev_aix_ppc.go similarity index 100% rename from third/golang.org/x/sys/unix/dev_aix_ppc.go rename to internal/thirdparty/golang.org/x/sys/unix/dev_aix_ppc.go diff --git a/third/golang.org/x/sys/unix/dev_aix_ppc64.go b/internal/thirdparty/golang.org/x/sys/unix/dev_aix_ppc64.go similarity index 100% rename from third/golang.org/x/sys/unix/dev_aix_ppc64.go rename to internal/thirdparty/golang.org/x/sys/unix/dev_aix_ppc64.go diff --git a/third/golang.org/x/sys/unix/dev_darwin.go b/internal/thirdparty/golang.org/x/sys/unix/dev_darwin.go similarity index 100% rename from third/golang.org/x/sys/unix/dev_darwin.go rename to internal/thirdparty/golang.org/x/sys/unix/dev_darwin.go diff --git a/third/golang.org/x/sys/unix/dev_dragonfly.go b/internal/thirdparty/golang.org/x/sys/unix/dev_dragonfly.go similarity index 100% rename from third/golang.org/x/sys/unix/dev_dragonfly.go rename to internal/thirdparty/golang.org/x/sys/unix/dev_dragonfly.go diff --git a/third/golang.org/x/sys/unix/dev_freebsd.go b/internal/thirdparty/golang.org/x/sys/unix/dev_freebsd.go similarity index 100% rename from third/golang.org/x/sys/unix/dev_freebsd.go rename to internal/thirdparty/golang.org/x/sys/unix/dev_freebsd.go diff --git a/third/golang.org/x/sys/unix/dev_linux.go b/internal/thirdparty/golang.org/x/sys/unix/dev_linux.go similarity index 100% rename from third/golang.org/x/sys/unix/dev_linux.go rename to internal/thirdparty/golang.org/x/sys/unix/dev_linux.go diff --git a/third/golang.org/x/sys/unix/dev_linux_test.go b/internal/thirdparty/golang.org/x/sys/unix/dev_linux_test.go similarity index 95% rename from third/golang.org/x/sys/unix/dev_linux_test.go rename to internal/thirdparty/golang.org/x/sys/unix/dev_linux_test.go index 095c4f350..c77a0e7e0 100644 --- a/third/golang.org/x/sys/unix/dev_linux_test.go +++ b/internal/thirdparty/golang.org/x/sys/unix/dev_linux_test.go @@ -10,7 +10,7 @@ import ( "fmt" "testing" - "github.com/gogf/gf/third/golang.org/x/sys/unix" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/unix" ) func TestDevices(t *testing.T) { diff --git a/third/golang.org/x/sys/unix/dev_netbsd.go b/internal/thirdparty/golang.org/x/sys/unix/dev_netbsd.go similarity index 100% rename from third/golang.org/x/sys/unix/dev_netbsd.go rename to internal/thirdparty/golang.org/x/sys/unix/dev_netbsd.go diff --git a/third/golang.org/x/sys/unix/dev_openbsd.go b/internal/thirdparty/golang.org/x/sys/unix/dev_openbsd.go similarity index 100% rename from third/golang.org/x/sys/unix/dev_openbsd.go rename to internal/thirdparty/golang.org/x/sys/unix/dev_openbsd.go diff --git a/third/golang.org/x/sys/unix/dirent.go b/internal/thirdparty/golang.org/x/sys/unix/dirent.go similarity index 100% rename from third/golang.org/x/sys/unix/dirent.go rename to internal/thirdparty/golang.org/x/sys/unix/dirent.go diff --git a/third/golang.org/x/sys/unix/endian_big.go b/internal/thirdparty/golang.org/x/sys/unix/endian_big.go similarity index 100% rename from third/golang.org/x/sys/unix/endian_big.go rename to internal/thirdparty/golang.org/x/sys/unix/endian_big.go diff --git a/third/golang.org/x/sys/unix/endian_little.go b/internal/thirdparty/golang.org/x/sys/unix/endian_little.go similarity index 100% rename from third/golang.org/x/sys/unix/endian_little.go rename to internal/thirdparty/golang.org/x/sys/unix/endian_little.go diff --git a/third/golang.org/x/sys/unix/env_unix.go b/internal/thirdparty/golang.org/x/sys/unix/env_unix.go similarity index 100% rename from third/golang.org/x/sys/unix/env_unix.go rename to internal/thirdparty/golang.org/x/sys/unix/env_unix.go diff --git a/third/golang.org/x/sys/unix/errors_freebsd_386.go b/internal/thirdparty/golang.org/x/sys/unix/errors_freebsd_386.go similarity index 100% rename from third/golang.org/x/sys/unix/errors_freebsd_386.go rename to internal/thirdparty/golang.org/x/sys/unix/errors_freebsd_386.go diff --git a/third/golang.org/x/sys/unix/errors_freebsd_amd64.go b/internal/thirdparty/golang.org/x/sys/unix/errors_freebsd_amd64.go similarity index 100% rename from third/golang.org/x/sys/unix/errors_freebsd_amd64.go rename to internal/thirdparty/golang.org/x/sys/unix/errors_freebsd_amd64.go diff --git a/third/golang.org/x/sys/unix/errors_freebsd_arm.go b/internal/thirdparty/golang.org/x/sys/unix/errors_freebsd_arm.go similarity index 100% rename from third/golang.org/x/sys/unix/errors_freebsd_arm.go rename to internal/thirdparty/golang.org/x/sys/unix/errors_freebsd_arm.go diff --git a/third/golang.org/x/sys/unix/example_exec_test.go b/internal/thirdparty/golang.org/x/sys/unix/example_exec_test.go similarity index 85% rename from third/golang.org/x/sys/unix/example_exec_test.go rename to internal/thirdparty/golang.org/x/sys/unix/example_exec_test.go index eb6a8dfdf..65ce8bdc3 100644 --- a/third/golang.org/x/sys/unix/example_exec_test.go +++ b/internal/thirdparty/golang.org/x/sys/unix/example_exec_test.go @@ -10,7 +10,7 @@ import ( "log" "os" - "github.com/gogf/gf/third/golang.org/x/sys/unix" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/unix" ) func ExampleExec() { diff --git a/third/golang.org/x/sys/unix/example_flock_test.go b/internal/thirdparty/golang.org/x/sys/unix/example_flock_test.go similarity index 89% rename from third/golang.org/x/sys/unix/example_flock_test.go rename to internal/thirdparty/golang.org/x/sys/unix/example_flock_test.go index 7f48aedb7..5290eb130 100644 --- a/third/golang.org/x/sys/unix/example_flock_test.go +++ b/internal/thirdparty/golang.org/x/sys/unix/example_flock_test.go @@ -10,7 +10,7 @@ import ( "log" "os" - "github.com/gogf/gf/third/golang.org/x/sys/unix" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/unix" ) func ExampleFlock() { diff --git a/third/golang.org/x/sys/unix/export_test.go b/internal/thirdparty/golang.org/x/sys/unix/export_test.go similarity index 100% rename from third/golang.org/x/sys/unix/export_test.go rename to internal/thirdparty/golang.org/x/sys/unix/export_test.go diff --git a/third/golang.org/x/sys/unix/fcntl.go b/internal/thirdparty/golang.org/x/sys/unix/fcntl.go similarity index 100% rename from third/golang.org/x/sys/unix/fcntl.go rename to internal/thirdparty/golang.org/x/sys/unix/fcntl.go diff --git a/third/golang.org/x/sys/unix/fcntl_darwin.go b/internal/thirdparty/golang.org/x/sys/unix/fcntl_darwin.go similarity index 100% rename from third/golang.org/x/sys/unix/fcntl_darwin.go rename to internal/thirdparty/golang.org/x/sys/unix/fcntl_darwin.go diff --git a/third/golang.org/x/sys/unix/fcntl_linux_32bit.go b/internal/thirdparty/golang.org/x/sys/unix/fcntl_linux_32bit.go similarity index 100% rename from third/golang.org/x/sys/unix/fcntl_linux_32bit.go rename to internal/thirdparty/golang.org/x/sys/unix/fcntl_linux_32bit.go diff --git a/third/golang.org/x/sys/unix/gccgo.go b/internal/thirdparty/golang.org/x/sys/unix/gccgo.go similarity index 100% rename from third/golang.org/x/sys/unix/gccgo.go rename to internal/thirdparty/golang.org/x/sys/unix/gccgo.go diff --git a/third/golang.org/x/sys/unix/gccgo_c.c b/internal/thirdparty/golang.org/x/sys/unix/gccgo_c.c similarity index 100% rename from third/golang.org/x/sys/unix/gccgo_c.c rename to internal/thirdparty/golang.org/x/sys/unix/gccgo_c.c diff --git a/third/golang.org/x/sys/unix/gccgo_linux_amd64.go b/internal/thirdparty/golang.org/x/sys/unix/gccgo_linux_amd64.go similarity index 100% rename from third/golang.org/x/sys/unix/gccgo_linux_amd64.go rename to internal/thirdparty/golang.org/x/sys/unix/gccgo_linux_amd64.go diff --git a/third/golang.org/x/sys/unix/ioctl.go b/internal/thirdparty/golang.org/x/sys/unix/ioctl.go similarity index 100% rename from third/golang.org/x/sys/unix/ioctl.go rename to internal/thirdparty/golang.org/x/sys/unix/ioctl.go diff --git a/third/golang.org/x/sys/unix/linux/Dockerfile b/internal/thirdparty/golang.org/x/sys/unix/linux/Dockerfile similarity index 100% rename from third/golang.org/x/sys/unix/linux/Dockerfile rename to internal/thirdparty/golang.org/x/sys/unix/linux/Dockerfile diff --git a/third/golang.org/x/sys/unix/linux/mkall.go b/internal/thirdparty/golang.org/x/sys/unix/linux/mkall.go similarity index 100% rename from third/golang.org/x/sys/unix/linux/mkall.go rename to internal/thirdparty/golang.org/x/sys/unix/linux/mkall.go diff --git a/third/golang.org/x/sys/unix/linux/mksysnum.go b/internal/thirdparty/golang.org/x/sys/unix/linux/mksysnum.go similarity index 100% rename from third/golang.org/x/sys/unix/linux/mksysnum.go rename to internal/thirdparty/golang.org/x/sys/unix/linux/mksysnum.go diff --git a/third/golang.org/x/sys/unix/linux/types.go b/internal/thirdparty/golang.org/x/sys/unix/linux/types.go similarity index 100% rename from third/golang.org/x/sys/unix/linux/types.go rename to internal/thirdparty/golang.org/x/sys/unix/linux/types.go diff --git a/third/golang.org/x/sys/unix/mkall.sh b/internal/thirdparty/golang.org/x/sys/unix/mkall.sh similarity index 100% rename from third/golang.org/x/sys/unix/mkall.sh rename to internal/thirdparty/golang.org/x/sys/unix/mkall.sh diff --git a/third/golang.org/x/sys/unix/mkasm_darwin.go b/internal/thirdparty/golang.org/x/sys/unix/mkasm_darwin.go similarity index 100% rename from third/golang.org/x/sys/unix/mkasm_darwin.go rename to internal/thirdparty/golang.org/x/sys/unix/mkasm_darwin.go diff --git a/third/golang.org/x/sys/unix/mkerrors.sh b/internal/thirdparty/golang.org/x/sys/unix/mkerrors.sh similarity index 100% rename from third/golang.org/x/sys/unix/mkerrors.sh rename to internal/thirdparty/golang.org/x/sys/unix/mkerrors.sh diff --git a/third/golang.org/x/sys/unix/mkpost.go b/internal/thirdparty/golang.org/x/sys/unix/mkpost.go similarity index 100% rename from third/golang.org/x/sys/unix/mkpost.go rename to internal/thirdparty/golang.org/x/sys/unix/mkpost.go diff --git a/third/golang.org/x/sys/unix/mksyscall.go b/internal/thirdparty/golang.org/x/sys/unix/mksyscall.go similarity index 100% rename from third/golang.org/x/sys/unix/mksyscall.go rename to internal/thirdparty/golang.org/x/sys/unix/mksyscall.go diff --git a/third/golang.org/x/sys/unix/mksyscall_aix_ppc.go b/internal/thirdparty/golang.org/x/sys/unix/mksyscall_aix_ppc.go similarity index 99% rename from third/golang.org/x/sys/unix/mksyscall_aix_ppc.go rename to internal/thirdparty/golang.org/x/sys/unix/mksyscall_aix_ppc.go index e1a5525aa..14f93480e 100644 --- a/third/golang.org/x/sys/unix/mksyscall_aix_ppc.go +++ b/internal/thirdparty/golang.org/x/sys/unix/mksyscall_aix_ppc.go @@ -376,7 +376,7 @@ func main() { } imp := "" if pack != "unix" { - imp = "import \"github.com/gogf/gf/third/golang.org/x/sys/unix\"\n" + imp = "import \"github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/unix\"\n" } fmt.Printf(srcTemplate, cmdLine(), buildTags(), pack, cExtern, imp, text) diff --git a/third/golang.org/x/sys/unix/mksyscall_aix_ppc64.go b/internal/thirdparty/golang.org/x/sys/unix/mksyscall_aix_ppc64.go similarity index 99% rename from third/golang.org/x/sys/unix/mksyscall_aix_ppc64.go rename to internal/thirdparty/golang.org/x/sys/unix/mksyscall_aix_ppc64.go index e62aa5987..280f3b30f 100755 --- a/third/golang.org/x/sys/unix/mksyscall_aix_ppc64.go +++ b/internal/thirdparty/golang.org/x/sys/unix/mksyscall_aix_ppc64.go @@ -504,7 +504,7 @@ func main() { } imp := "" if pack != "unix" { - imp = "import \"github.com/gogf/gf/third/golang.org/x/sys/unix\"\n" + imp = "import \"github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/unix\"\n" } diff --git a/third/golang.org/x/sys/unix/mksyscall_solaris.pl b/internal/thirdparty/golang.org/x/sys/unix/mksyscall_solaris.pl similarity index 98% rename from third/golang.org/x/sys/unix/mksyscall_solaris.pl rename to internal/thirdparty/golang.org/x/sys/unix/mksyscall_solaris.pl index c87c96995..c52910496 100755 --- a/third/golang.org/x/sys/unix/mksyscall_solaris.pl +++ b/internal/thirdparty/golang.org/x/sys/unix/mksyscall_solaris.pl @@ -275,7 +275,7 @@ import ( ) EOF -print "import \"github.com/gogf/gf/third/golang.org/x/sys/unix\"\n" if $package ne "unix"; +print "import \"github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/unix\"\n" if $package ne "unix"; my $vardecls = "\t" . join(",\n\t", @vars); $vardecls .= " syscallFunc"; diff --git a/third/golang.org/x/sys/unix/mksysctl_openbsd.pl b/internal/thirdparty/golang.org/x/sys/unix/mksysctl_openbsd.pl similarity index 100% rename from third/golang.org/x/sys/unix/mksysctl_openbsd.pl rename to internal/thirdparty/golang.org/x/sys/unix/mksysctl_openbsd.pl diff --git a/third/golang.org/x/sys/unix/mksysnum.go b/internal/thirdparty/golang.org/x/sys/unix/mksysnum.go similarity index 100% rename from third/golang.org/x/sys/unix/mksysnum.go rename to internal/thirdparty/golang.org/x/sys/unix/mksysnum.go diff --git a/third/golang.org/x/sys/unix/mmap_unix_test.go b/internal/thirdparty/golang.org/x/sys/unix/mmap_unix_test.go similarity index 93% rename from third/golang.org/x/sys/unix/mmap_unix_test.go rename to internal/thirdparty/golang.org/x/sys/unix/mmap_unix_test.go index 44992dd96..8c5f57594 100644 --- a/third/golang.org/x/sys/unix/mmap_unix_test.go +++ b/internal/thirdparty/golang.org/x/sys/unix/mmap_unix_test.go @@ -10,7 +10,7 @@ import ( "runtime" "testing" - "github.com/gogf/gf/third/golang.org/x/sys/unix" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/unix" ) func TestMmap(t *testing.T) { diff --git a/third/golang.org/x/sys/unix/openbsd_pledge.go b/internal/thirdparty/golang.org/x/sys/unix/openbsd_pledge.go similarity index 100% rename from third/golang.org/x/sys/unix/openbsd_pledge.go rename to internal/thirdparty/golang.org/x/sys/unix/openbsd_pledge.go diff --git a/third/golang.org/x/sys/unix/openbsd_test.go b/internal/thirdparty/golang.org/x/sys/unix/openbsd_test.go similarity index 97% rename from third/golang.org/x/sys/unix/openbsd_test.go rename to internal/thirdparty/golang.org/x/sys/unix/openbsd_test.go index d730c6ca7..1178ecaec 100644 --- a/third/golang.org/x/sys/unix/openbsd_test.go +++ b/internal/thirdparty/golang.org/x/sys/unix/openbsd_test.go @@ -19,7 +19,7 @@ import ( "path/filepath" "testing" - "github.com/gogf/gf/third/golang.org/x/sys/unix" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/unix" ) type testProc struct { diff --git a/third/golang.org/x/sys/unix/openbsd_unveil.go b/internal/thirdparty/golang.org/x/sys/unix/openbsd_unveil.go similarity index 100% rename from third/golang.org/x/sys/unix/openbsd_unveil.go rename to internal/thirdparty/golang.org/x/sys/unix/openbsd_unveil.go diff --git a/third/golang.org/x/sys/unix/pagesize_unix.go b/internal/thirdparty/golang.org/x/sys/unix/pagesize_unix.go similarity index 100% rename from third/golang.org/x/sys/unix/pagesize_unix.go rename to internal/thirdparty/golang.org/x/sys/unix/pagesize_unix.go diff --git a/third/golang.org/x/sys/unix/race.go b/internal/thirdparty/golang.org/x/sys/unix/race.go similarity index 100% rename from third/golang.org/x/sys/unix/race.go rename to internal/thirdparty/golang.org/x/sys/unix/race.go diff --git a/third/golang.org/x/sys/unix/race0.go b/internal/thirdparty/golang.org/x/sys/unix/race0.go similarity index 100% rename from third/golang.org/x/sys/unix/race0.go rename to internal/thirdparty/golang.org/x/sys/unix/race0.go diff --git a/third/golang.org/x/sys/unix/sendfile_test.go b/internal/thirdparty/golang.org/x/sys/unix/sendfile_test.go similarity index 97% rename from third/golang.org/x/sys/unix/sendfile_test.go rename to internal/thirdparty/golang.org/x/sys/unix/sendfile_test.go index eacd4593d..43db9ed4e 100644 --- a/third/golang.org/x/sys/unix/sendfile_test.go +++ b/internal/thirdparty/golang.org/x/sys/unix/sendfile_test.go @@ -13,7 +13,7 @@ import ( "path/filepath" "testing" - "github.com/gogf/gf/third/golang.org/x/sys/unix" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/unix" ) func TestSendfile(t *testing.T) { diff --git a/third/golang.org/x/sys/unix/sockcmsg_linux.go b/internal/thirdparty/golang.org/x/sys/unix/sockcmsg_linux.go similarity index 100% rename from third/golang.org/x/sys/unix/sockcmsg_linux.go rename to internal/thirdparty/golang.org/x/sys/unix/sockcmsg_linux.go diff --git a/third/golang.org/x/sys/unix/sockcmsg_unix.go b/internal/thirdparty/golang.org/x/sys/unix/sockcmsg_unix.go similarity index 100% rename from third/golang.org/x/sys/unix/sockcmsg_unix.go rename to internal/thirdparty/golang.org/x/sys/unix/sockcmsg_unix.go diff --git a/third/golang.org/x/sys/unix/str.go b/internal/thirdparty/golang.org/x/sys/unix/str.go similarity index 100% rename from third/golang.org/x/sys/unix/str.go rename to internal/thirdparty/golang.org/x/sys/unix/str.go diff --git a/third/golang.org/x/sys/unix/syscall.go b/internal/thirdparty/golang.org/x/sys/unix/syscall.go similarity index 95% rename from third/golang.org/x/sys/unix/syscall.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall.go index a32c04e2c..5ace3617c 100644 --- a/third/golang.org/x/sys/unix/syscall.go +++ b/internal/thirdparty/golang.org/x/sys/unix/syscall.go @@ -22,7 +22,7 @@ // These calls return err == nil to indicate success; otherwise // err represents an operating system error describing the failure and // holds a value of type syscall.Errno. -package unix // import "github.com/gogf/gf/third/golang.org/x/sys/unix" +package unix // import "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/unix" import "strings" diff --git a/third/golang.org/x/sys/unix/syscall_aix.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_aix.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_aix.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_aix.go diff --git a/third/golang.org/x/sys/unix/syscall_aix_ppc.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_aix_ppc.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_aix_ppc.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_aix_ppc.go diff --git a/third/golang.org/x/sys/unix/syscall_aix_ppc64.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_aix_ppc64.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_aix_ppc64.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_aix_ppc64.go diff --git a/third/golang.org/x/sys/unix/syscall_aix_test.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_aix_test.go similarity index 98% rename from third/golang.org/x/sys/unix/syscall_aix_test.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_aix_test.go index 0bff3a4cc..87dc56baa 100644 --- a/third/golang.org/x/sys/unix/syscall_aix_test.go +++ b/internal/thirdparty/golang.org/x/sys/unix/syscall_aix_test.go @@ -12,7 +12,7 @@ import ( "testing" "time" - "github.com/gogf/gf/third/golang.org/x/sys/unix" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/unix" ) func TestIoctlGetInt(t *testing.T) { diff --git a/third/golang.org/x/sys/unix/syscall_bsd.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_bsd.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_bsd.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_bsd.go diff --git a/third/golang.org/x/sys/unix/syscall_bsd_test.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_bsd_test.go similarity index 96% rename from third/golang.org/x/sys/unix/syscall_bsd_test.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_bsd_test.go index f2b6726ac..4bb898f45 100644 --- a/third/golang.org/x/sys/unix/syscall_bsd_test.go +++ b/internal/thirdparty/golang.org/x/sys/unix/syscall_bsd_test.go @@ -12,7 +12,7 @@ import ( "testing" "time" - "github.com/gogf/gf/third/golang.org/x/sys/unix" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/unix" ) func TestGetfsstat(t *testing.T) { diff --git a/third/golang.org/x/sys/unix/syscall_darwin.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_darwin.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_darwin.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_darwin.go diff --git a/third/golang.org/x/sys/unix/syscall_darwin_386.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_darwin_386.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_darwin_386.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_darwin_386.go diff --git a/third/golang.org/x/sys/unix/syscall_darwin_amd64.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_darwin_amd64.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_darwin_amd64.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_darwin_amd64.go diff --git a/third/golang.org/x/sys/unix/syscall_darwin_arm.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_darwin_arm.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_darwin_arm.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_darwin_arm.go diff --git a/third/golang.org/x/sys/unix/syscall_darwin_arm64.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_darwin_arm64.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_darwin_arm64.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_darwin_arm64.go diff --git a/third/golang.org/x/sys/unix/syscall_darwin_libSystem.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_darwin_libSystem.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_darwin_libSystem.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_darwin_libSystem.go diff --git a/third/golang.org/x/sys/unix/syscall_darwin_test.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_darwin_test.go similarity index 95% rename from third/golang.org/x/sys/unix/syscall_darwin_test.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_darwin_test.go index 74e79d8a7..c30a58c59 100644 --- a/third/golang.org/x/sys/unix/syscall_darwin_test.go +++ b/internal/thirdparty/golang.org/x/sys/unix/syscall_darwin_test.go @@ -8,7 +8,7 @@ import ( "os" "testing" - "github.com/gogf/gf/third/golang.org/x/sys/unix" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/unix" ) // stringsFromByteSlice converts a sequence of attributes to a []string. diff --git a/third/golang.org/x/sys/unix/syscall_dragonfly.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_dragonfly.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_dragonfly.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_dragonfly.go diff --git a/third/golang.org/x/sys/unix/syscall_dragonfly_amd64.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_dragonfly_amd64.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_dragonfly_amd64.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_dragonfly_amd64.go diff --git a/third/golang.org/x/sys/unix/syscall_freebsd.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_freebsd.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_freebsd.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_freebsd.go diff --git a/third/golang.org/x/sys/unix/syscall_freebsd_386.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_freebsd_386.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_freebsd_386.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_freebsd_386.go diff --git a/third/golang.org/x/sys/unix/syscall_freebsd_amd64.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_freebsd_amd64.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_freebsd_amd64.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_freebsd_amd64.go diff --git a/third/golang.org/x/sys/unix/syscall_freebsd_arm.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_freebsd_arm.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_freebsd_arm.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_freebsd_arm.go diff --git a/third/golang.org/x/sys/unix/syscall_freebsd_arm64.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_freebsd_arm64.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_freebsd_arm64.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_freebsd_arm64.go diff --git a/third/golang.org/x/sys/unix/syscall_freebsd_test.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_freebsd_test.go similarity index 99% rename from third/golang.org/x/sys/unix/syscall_freebsd_test.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_freebsd_test.go index df6cf928c..82b4121c0 100644 --- a/third/golang.org/x/sys/unix/syscall_freebsd_test.go +++ b/internal/thirdparty/golang.org/x/sys/unix/syscall_freebsd_test.go @@ -17,7 +17,7 @@ import ( "runtime" "testing" - "github.com/gogf/gf/third/golang.org/x/sys/unix" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/unix" ) func TestSysctlUint64(t *testing.T) { diff --git a/third/golang.org/x/sys/unix/syscall_linux.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_linux.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_linux.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_linux.go diff --git a/third/golang.org/x/sys/unix/syscall_linux_386.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_linux_386.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_linux_386.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_linux_386.go diff --git a/third/golang.org/x/sys/unix/syscall_linux_amd64.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_linux_amd64.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_linux_amd64.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_linux_amd64.go diff --git a/third/golang.org/x/sys/unix/syscall_linux_amd64_gc.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_linux_amd64_gc.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_linux_amd64_gc.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_linux_amd64_gc.go diff --git a/third/golang.org/x/sys/unix/syscall_linux_arm.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_linux_arm.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_linux_arm.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_linux_arm.go diff --git a/third/golang.org/x/sys/unix/syscall_linux_arm64.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_linux_arm64.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_linux_arm64.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_linux_arm64.go diff --git a/third/golang.org/x/sys/unix/syscall_linux_gc.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_linux_gc.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_linux_gc.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_linux_gc.go diff --git a/third/golang.org/x/sys/unix/syscall_linux_gc_386.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_linux_gc_386.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_linux_gc_386.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_linux_gc_386.go diff --git a/third/golang.org/x/sys/unix/syscall_linux_gccgo_386.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_linux_gccgo_386.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_linux_gccgo_386.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_linux_gccgo_386.go diff --git a/third/golang.org/x/sys/unix/syscall_linux_gccgo_arm.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_linux_gccgo_arm.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_linux_gccgo_arm.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_linux_gccgo_arm.go diff --git a/third/golang.org/x/sys/unix/syscall_linux_mips64x.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_linux_mips64x.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_linux_mips64x.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_linux_mips64x.go diff --git a/third/golang.org/x/sys/unix/syscall_linux_mipsx.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_linux_mipsx.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_linux_mipsx.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_linux_mipsx.go diff --git a/third/golang.org/x/sys/unix/syscall_linux_ppc64x.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_linux_ppc64x.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_linux_ppc64x.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_linux_ppc64x.go diff --git a/third/golang.org/x/sys/unix/syscall_linux_riscv64.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_linux_riscv64.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_linux_riscv64.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_linux_riscv64.go diff --git a/third/golang.org/x/sys/unix/syscall_linux_s390x.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_linux_s390x.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_linux_s390x.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_linux_s390x.go diff --git a/third/golang.org/x/sys/unix/syscall_linux_sparc64.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_linux_sparc64.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_linux_sparc64.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_linux_sparc64.go diff --git a/third/golang.org/x/sys/unix/syscall_linux_test.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_linux_test.go similarity index 99% rename from third/golang.org/x/sys/unix/syscall_linux_test.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_linux_test.go index b79bac731..42d148430 100644 --- a/third/golang.org/x/sys/unix/syscall_linux_test.go +++ b/internal/thirdparty/golang.org/x/sys/unix/syscall_linux_test.go @@ -14,7 +14,7 @@ import ( "testing" "time" - "github.com/gogf/gf/third/golang.org/x/sys/unix" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/unix" ) func TestIoctlGetInt(t *testing.T) { diff --git a/third/golang.org/x/sys/unix/syscall_netbsd.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_netbsd.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_netbsd.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_netbsd.go diff --git a/third/golang.org/x/sys/unix/syscall_netbsd_386.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_netbsd_386.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_netbsd_386.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_netbsd_386.go diff --git a/third/golang.org/x/sys/unix/syscall_netbsd_amd64.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_netbsd_amd64.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_netbsd_amd64.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_netbsd_amd64.go diff --git a/third/golang.org/x/sys/unix/syscall_netbsd_arm.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_netbsd_arm.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_netbsd_arm.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_netbsd_arm.go diff --git a/third/golang.org/x/sys/unix/syscall_netbsd_arm64.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_netbsd_arm64.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_netbsd_arm64.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_netbsd_arm64.go diff --git a/third/golang.org/x/sys/unix/syscall_netbsd_test.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_netbsd_test.go similarity index 95% rename from third/golang.org/x/sys/unix/syscall_netbsd_test.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_netbsd_test.go index d29df1917..5a2330dd6 100644 --- a/third/golang.org/x/sys/unix/syscall_netbsd_test.go +++ b/internal/thirdparty/golang.org/x/sys/unix/syscall_netbsd_test.go @@ -8,7 +8,7 @@ import ( "bytes" "testing" - "github.com/gogf/gf/third/golang.org/x/sys/unix" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/unix" ) // stringsFromByteSlice converts a sequence of attributes to a []string. diff --git a/third/golang.org/x/sys/unix/syscall_openbsd.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_openbsd.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_openbsd.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_openbsd.go diff --git a/third/golang.org/x/sys/unix/syscall_openbsd_386.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_openbsd_386.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_openbsd_386.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_openbsd_386.go diff --git a/third/golang.org/x/sys/unix/syscall_openbsd_amd64.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_openbsd_amd64.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_openbsd_amd64.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_openbsd_amd64.go diff --git a/third/golang.org/x/sys/unix/syscall_openbsd_arm.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_openbsd_arm.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_openbsd_arm.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_openbsd_arm.go diff --git a/third/golang.org/x/sys/unix/syscall_openbsd_test.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_openbsd_test.go similarity index 93% rename from third/golang.org/x/sys/unix/syscall_openbsd_test.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_openbsd_test.go index 08d46f697..0e3928fae 100644 --- a/third/golang.org/x/sys/unix/syscall_openbsd_test.go +++ b/internal/thirdparty/golang.org/x/sys/unix/syscall_openbsd_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/gogf/gf/third/golang.org/x/sys/unix" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/unix" ) func TestPpoll(t *testing.T) { diff --git a/third/golang.org/x/sys/unix/syscall_solaris.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_solaris.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_solaris.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_solaris.go diff --git a/third/golang.org/x/sys/unix/syscall_solaris_amd64.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_solaris_amd64.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_solaris_amd64.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_solaris_amd64.go diff --git a/third/golang.org/x/sys/unix/syscall_solaris_test.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_solaris_test.go similarity index 94% rename from third/golang.org/x/sys/unix/syscall_solaris_test.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_solaris_test.go index 22510bc3a..2d97edc03 100644 --- a/third/golang.org/x/sys/unix/syscall_solaris_test.go +++ b/internal/thirdparty/golang.org/x/sys/unix/syscall_solaris_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "github.com/gogf/gf/third/golang.org/x/sys/unix" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/unix" ) func TestSelect(t *testing.T) { diff --git a/third/golang.org/x/sys/unix/syscall_test.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_test.go similarity index 95% rename from third/golang.org/x/sys/unix/syscall_test.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_test.go index 06047b094..3f2a3ff82 100644 --- a/third/golang.org/x/sys/unix/syscall_test.go +++ b/internal/thirdparty/golang.org/x/sys/unix/syscall_test.go @@ -10,7 +10,7 @@ import ( "fmt" "testing" - "github.com/gogf/gf/third/golang.org/x/sys/unix" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/unix" ) func testSetGetenv(t *testing.T, key, value string) { diff --git a/third/golang.org/x/sys/unix/syscall_unix.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_unix.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_unix.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_unix.go diff --git a/third/golang.org/x/sys/unix/syscall_unix_gc.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_unix_gc.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_unix_gc.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_unix_gc.go diff --git a/third/golang.org/x/sys/unix/syscall_unix_gc_ppc64x.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_unix_gc_ppc64x.go similarity index 100% rename from third/golang.org/x/sys/unix/syscall_unix_gc_ppc64x.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_unix_gc_ppc64x.go diff --git a/third/golang.org/x/sys/unix/syscall_unix_test.go b/internal/thirdparty/golang.org/x/sys/unix/syscall_unix_test.go similarity index 99% rename from third/golang.org/x/sys/unix/syscall_unix_test.go rename to internal/thirdparty/golang.org/x/sys/unix/syscall_unix_test.go index 6f477ce5d..64a2593e3 100644 --- a/third/golang.org/x/sys/unix/syscall_unix_test.go +++ b/internal/thirdparty/golang.org/x/sys/unix/syscall_unix_test.go @@ -19,7 +19,7 @@ import ( "testing" "time" - "github.com/gogf/gf/third/golang.org/x/sys/unix" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/unix" ) // Tests that below functions, structures and constants are consistent diff --git a/third/golang.org/x/sys/unix/timestruct.go b/internal/thirdparty/golang.org/x/sys/unix/timestruct.go similarity index 100% rename from third/golang.org/x/sys/unix/timestruct.go rename to internal/thirdparty/golang.org/x/sys/unix/timestruct.go diff --git a/third/golang.org/x/sys/unix/timestruct_test.go b/internal/thirdparty/golang.org/x/sys/unix/timestruct_test.go similarity index 96% rename from third/golang.org/x/sys/unix/timestruct_test.go rename to internal/thirdparty/golang.org/x/sys/unix/timestruct_test.go index 0d2545b44..7cc2886c7 100644 --- a/third/golang.org/x/sys/unix/timestruct_test.go +++ b/internal/thirdparty/golang.org/x/sys/unix/timestruct_test.go @@ -11,7 +11,7 @@ import ( "time" "unsafe" - "github.com/gogf/gf/third/golang.org/x/sys/unix" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/unix" ) func TestTimeToTimespec(t *testing.T) { diff --git a/third/golang.org/x/sys/unix/types_aix.go b/internal/thirdparty/golang.org/x/sys/unix/types_aix.go similarity index 100% rename from third/golang.org/x/sys/unix/types_aix.go rename to internal/thirdparty/golang.org/x/sys/unix/types_aix.go diff --git a/third/golang.org/x/sys/unix/types_darwin.go b/internal/thirdparty/golang.org/x/sys/unix/types_darwin.go similarity index 100% rename from third/golang.org/x/sys/unix/types_darwin.go rename to internal/thirdparty/golang.org/x/sys/unix/types_darwin.go diff --git a/third/golang.org/x/sys/unix/types_dragonfly.go b/internal/thirdparty/golang.org/x/sys/unix/types_dragonfly.go similarity index 100% rename from third/golang.org/x/sys/unix/types_dragonfly.go rename to internal/thirdparty/golang.org/x/sys/unix/types_dragonfly.go diff --git a/third/golang.org/x/sys/unix/types_freebsd.go b/internal/thirdparty/golang.org/x/sys/unix/types_freebsd.go similarity index 100% rename from third/golang.org/x/sys/unix/types_freebsd.go rename to internal/thirdparty/golang.org/x/sys/unix/types_freebsd.go diff --git a/third/golang.org/x/sys/unix/types_netbsd.go b/internal/thirdparty/golang.org/x/sys/unix/types_netbsd.go similarity index 100% rename from third/golang.org/x/sys/unix/types_netbsd.go rename to internal/thirdparty/golang.org/x/sys/unix/types_netbsd.go diff --git a/third/golang.org/x/sys/unix/types_openbsd.go b/internal/thirdparty/golang.org/x/sys/unix/types_openbsd.go similarity index 100% rename from third/golang.org/x/sys/unix/types_openbsd.go rename to internal/thirdparty/golang.org/x/sys/unix/types_openbsd.go diff --git a/third/golang.org/x/sys/unix/types_solaris.go b/internal/thirdparty/golang.org/x/sys/unix/types_solaris.go similarity index 100% rename from third/golang.org/x/sys/unix/types_solaris.go rename to internal/thirdparty/golang.org/x/sys/unix/types_solaris.go diff --git a/third/golang.org/x/sys/unix/xattr_bsd.go b/internal/thirdparty/golang.org/x/sys/unix/xattr_bsd.go similarity index 100% rename from third/golang.org/x/sys/unix/xattr_bsd.go rename to internal/thirdparty/golang.org/x/sys/unix/xattr_bsd.go diff --git a/third/golang.org/x/sys/unix/xattr_test.go b/internal/thirdparty/golang.org/x/sys/unix/xattr_test.go similarity index 98% rename from third/golang.org/x/sys/unix/xattr_test.go rename to internal/thirdparty/golang.org/x/sys/unix/xattr_test.go index bb0196ce9..7b9c89ebd 100644 --- a/third/golang.org/x/sys/unix/xattr_test.go +++ b/internal/thirdparty/golang.org/x/sys/unix/xattr_test.go @@ -13,7 +13,7 @@ import ( "strings" "testing" - "github.com/gogf/gf/third/golang.org/x/sys/unix" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/unix" ) func TestXattr(t *testing.T) { diff --git a/third/golang.org/x/sys/unix/zerrors_aix_ppc.go b/internal/thirdparty/golang.org/x/sys/unix/zerrors_aix_ppc.go similarity index 100% rename from third/golang.org/x/sys/unix/zerrors_aix_ppc.go rename to internal/thirdparty/golang.org/x/sys/unix/zerrors_aix_ppc.go diff --git a/third/golang.org/x/sys/unix/zerrors_aix_ppc64.go b/internal/thirdparty/golang.org/x/sys/unix/zerrors_aix_ppc64.go similarity index 100% rename from third/golang.org/x/sys/unix/zerrors_aix_ppc64.go rename to internal/thirdparty/golang.org/x/sys/unix/zerrors_aix_ppc64.go diff --git a/third/golang.org/x/sys/unix/zerrors_darwin_386.go b/internal/thirdparty/golang.org/x/sys/unix/zerrors_darwin_386.go similarity index 100% rename from third/golang.org/x/sys/unix/zerrors_darwin_386.go rename to internal/thirdparty/golang.org/x/sys/unix/zerrors_darwin_386.go diff --git a/third/golang.org/x/sys/unix/zerrors_darwin_amd64.go b/internal/thirdparty/golang.org/x/sys/unix/zerrors_darwin_amd64.go similarity index 100% rename from third/golang.org/x/sys/unix/zerrors_darwin_amd64.go rename to internal/thirdparty/golang.org/x/sys/unix/zerrors_darwin_amd64.go diff --git a/third/golang.org/x/sys/unix/zerrors_darwin_arm.go b/internal/thirdparty/golang.org/x/sys/unix/zerrors_darwin_arm.go similarity index 100% rename from third/golang.org/x/sys/unix/zerrors_darwin_arm.go rename to internal/thirdparty/golang.org/x/sys/unix/zerrors_darwin_arm.go diff --git a/third/golang.org/x/sys/unix/zerrors_darwin_arm64.go b/internal/thirdparty/golang.org/x/sys/unix/zerrors_darwin_arm64.go similarity index 100% rename from third/golang.org/x/sys/unix/zerrors_darwin_arm64.go rename to internal/thirdparty/golang.org/x/sys/unix/zerrors_darwin_arm64.go diff --git a/third/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go b/internal/thirdparty/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go similarity index 100% rename from third/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go rename to internal/thirdparty/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go diff --git a/third/golang.org/x/sys/unix/zerrors_freebsd_386.go b/internal/thirdparty/golang.org/x/sys/unix/zerrors_freebsd_386.go similarity index 100% rename from third/golang.org/x/sys/unix/zerrors_freebsd_386.go rename to internal/thirdparty/golang.org/x/sys/unix/zerrors_freebsd_386.go diff --git a/third/golang.org/x/sys/unix/zerrors_freebsd_amd64.go b/internal/thirdparty/golang.org/x/sys/unix/zerrors_freebsd_amd64.go similarity index 100% rename from third/golang.org/x/sys/unix/zerrors_freebsd_amd64.go rename to internal/thirdparty/golang.org/x/sys/unix/zerrors_freebsd_amd64.go diff --git a/third/golang.org/x/sys/unix/zerrors_freebsd_arm.go b/internal/thirdparty/golang.org/x/sys/unix/zerrors_freebsd_arm.go similarity index 100% rename from third/golang.org/x/sys/unix/zerrors_freebsd_arm.go rename to internal/thirdparty/golang.org/x/sys/unix/zerrors_freebsd_arm.go diff --git a/third/golang.org/x/sys/unix/zerrors_freebsd_arm64.go b/internal/thirdparty/golang.org/x/sys/unix/zerrors_freebsd_arm64.go similarity index 100% rename from third/golang.org/x/sys/unix/zerrors_freebsd_arm64.go rename to internal/thirdparty/golang.org/x/sys/unix/zerrors_freebsd_arm64.go diff --git a/third/golang.org/x/sys/unix/zerrors_linux_386.go b/internal/thirdparty/golang.org/x/sys/unix/zerrors_linux_386.go similarity index 100% rename from third/golang.org/x/sys/unix/zerrors_linux_386.go rename to internal/thirdparty/golang.org/x/sys/unix/zerrors_linux_386.go diff --git a/third/golang.org/x/sys/unix/zerrors_linux_amd64.go b/internal/thirdparty/golang.org/x/sys/unix/zerrors_linux_amd64.go similarity index 100% rename from third/golang.org/x/sys/unix/zerrors_linux_amd64.go rename to internal/thirdparty/golang.org/x/sys/unix/zerrors_linux_amd64.go diff --git a/third/golang.org/x/sys/unix/zerrors_linux_arm.go b/internal/thirdparty/golang.org/x/sys/unix/zerrors_linux_arm.go similarity index 100% rename from third/golang.org/x/sys/unix/zerrors_linux_arm.go rename to internal/thirdparty/golang.org/x/sys/unix/zerrors_linux_arm.go diff --git a/third/golang.org/x/sys/unix/zerrors_linux_arm64.go b/internal/thirdparty/golang.org/x/sys/unix/zerrors_linux_arm64.go similarity index 100% rename from third/golang.org/x/sys/unix/zerrors_linux_arm64.go rename to internal/thirdparty/golang.org/x/sys/unix/zerrors_linux_arm64.go diff --git a/third/golang.org/x/sys/unix/zerrors_linux_mips.go b/internal/thirdparty/golang.org/x/sys/unix/zerrors_linux_mips.go similarity index 100% rename from third/golang.org/x/sys/unix/zerrors_linux_mips.go rename to internal/thirdparty/golang.org/x/sys/unix/zerrors_linux_mips.go diff --git a/third/golang.org/x/sys/unix/zerrors_linux_mips64.go b/internal/thirdparty/golang.org/x/sys/unix/zerrors_linux_mips64.go similarity index 100% rename from third/golang.org/x/sys/unix/zerrors_linux_mips64.go rename to internal/thirdparty/golang.org/x/sys/unix/zerrors_linux_mips64.go diff --git a/third/golang.org/x/sys/unix/zerrors_linux_mips64le.go b/internal/thirdparty/golang.org/x/sys/unix/zerrors_linux_mips64le.go similarity index 100% rename from third/golang.org/x/sys/unix/zerrors_linux_mips64le.go rename to internal/thirdparty/golang.org/x/sys/unix/zerrors_linux_mips64le.go diff --git a/third/golang.org/x/sys/unix/zerrors_linux_mipsle.go b/internal/thirdparty/golang.org/x/sys/unix/zerrors_linux_mipsle.go similarity index 100% rename from third/golang.org/x/sys/unix/zerrors_linux_mipsle.go rename to internal/thirdparty/golang.org/x/sys/unix/zerrors_linux_mipsle.go diff --git a/third/golang.org/x/sys/unix/zerrors_linux_ppc64.go b/internal/thirdparty/golang.org/x/sys/unix/zerrors_linux_ppc64.go similarity index 100% rename from third/golang.org/x/sys/unix/zerrors_linux_ppc64.go rename to internal/thirdparty/golang.org/x/sys/unix/zerrors_linux_ppc64.go diff --git a/third/golang.org/x/sys/unix/zerrors_linux_ppc64le.go b/internal/thirdparty/golang.org/x/sys/unix/zerrors_linux_ppc64le.go similarity index 100% rename from third/golang.org/x/sys/unix/zerrors_linux_ppc64le.go rename to internal/thirdparty/golang.org/x/sys/unix/zerrors_linux_ppc64le.go diff --git a/third/golang.org/x/sys/unix/zerrors_linux_riscv64.go b/internal/thirdparty/golang.org/x/sys/unix/zerrors_linux_riscv64.go similarity index 100% rename from third/golang.org/x/sys/unix/zerrors_linux_riscv64.go rename to internal/thirdparty/golang.org/x/sys/unix/zerrors_linux_riscv64.go diff --git a/third/golang.org/x/sys/unix/zerrors_linux_s390x.go b/internal/thirdparty/golang.org/x/sys/unix/zerrors_linux_s390x.go similarity index 100% rename from third/golang.org/x/sys/unix/zerrors_linux_s390x.go rename to internal/thirdparty/golang.org/x/sys/unix/zerrors_linux_s390x.go diff --git a/third/golang.org/x/sys/unix/zerrors_linux_sparc64.go b/internal/thirdparty/golang.org/x/sys/unix/zerrors_linux_sparc64.go similarity index 100% rename from third/golang.org/x/sys/unix/zerrors_linux_sparc64.go rename to internal/thirdparty/golang.org/x/sys/unix/zerrors_linux_sparc64.go diff --git a/third/golang.org/x/sys/unix/zerrors_netbsd_386.go b/internal/thirdparty/golang.org/x/sys/unix/zerrors_netbsd_386.go similarity index 100% rename from third/golang.org/x/sys/unix/zerrors_netbsd_386.go rename to internal/thirdparty/golang.org/x/sys/unix/zerrors_netbsd_386.go diff --git a/third/golang.org/x/sys/unix/zerrors_netbsd_amd64.go b/internal/thirdparty/golang.org/x/sys/unix/zerrors_netbsd_amd64.go similarity index 100% rename from third/golang.org/x/sys/unix/zerrors_netbsd_amd64.go rename to internal/thirdparty/golang.org/x/sys/unix/zerrors_netbsd_amd64.go diff --git a/third/golang.org/x/sys/unix/zerrors_netbsd_arm.go b/internal/thirdparty/golang.org/x/sys/unix/zerrors_netbsd_arm.go similarity index 100% rename from third/golang.org/x/sys/unix/zerrors_netbsd_arm.go rename to internal/thirdparty/golang.org/x/sys/unix/zerrors_netbsd_arm.go diff --git a/third/golang.org/x/sys/unix/zerrors_netbsd_arm64.go b/internal/thirdparty/golang.org/x/sys/unix/zerrors_netbsd_arm64.go similarity index 100% rename from third/golang.org/x/sys/unix/zerrors_netbsd_arm64.go rename to internal/thirdparty/golang.org/x/sys/unix/zerrors_netbsd_arm64.go diff --git a/third/golang.org/x/sys/unix/zerrors_openbsd_386.go b/internal/thirdparty/golang.org/x/sys/unix/zerrors_openbsd_386.go similarity index 100% rename from third/golang.org/x/sys/unix/zerrors_openbsd_386.go rename to internal/thirdparty/golang.org/x/sys/unix/zerrors_openbsd_386.go diff --git a/third/golang.org/x/sys/unix/zerrors_openbsd_amd64.go b/internal/thirdparty/golang.org/x/sys/unix/zerrors_openbsd_amd64.go similarity index 100% rename from third/golang.org/x/sys/unix/zerrors_openbsd_amd64.go rename to internal/thirdparty/golang.org/x/sys/unix/zerrors_openbsd_amd64.go diff --git a/third/golang.org/x/sys/unix/zerrors_openbsd_arm.go b/internal/thirdparty/golang.org/x/sys/unix/zerrors_openbsd_arm.go similarity index 100% rename from third/golang.org/x/sys/unix/zerrors_openbsd_arm.go rename to internal/thirdparty/golang.org/x/sys/unix/zerrors_openbsd_arm.go diff --git a/third/golang.org/x/sys/unix/zerrors_solaris_amd64.go b/internal/thirdparty/golang.org/x/sys/unix/zerrors_solaris_amd64.go similarity index 100% rename from third/golang.org/x/sys/unix/zerrors_solaris_amd64.go rename to internal/thirdparty/golang.org/x/sys/unix/zerrors_solaris_amd64.go diff --git a/third/golang.org/x/sys/unix/zptrace386_linux.go b/internal/thirdparty/golang.org/x/sys/unix/zptrace386_linux.go similarity index 100% rename from third/golang.org/x/sys/unix/zptrace386_linux.go rename to internal/thirdparty/golang.org/x/sys/unix/zptrace386_linux.go diff --git a/third/golang.org/x/sys/unix/zptracearm_linux.go b/internal/thirdparty/golang.org/x/sys/unix/zptracearm_linux.go similarity index 100% rename from third/golang.org/x/sys/unix/zptracearm_linux.go rename to internal/thirdparty/golang.org/x/sys/unix/zptracearm_linux.go diff --git a/third/golang.org/x/sys/unix/zptracemips_linux.go b/internal/thirdparty/golang.org/x/sys/unix/zptracemips_linux.go similarity index 100% rename from third/golang.org/x/sys/unix/zptracemips_linux.go rename to internal/thirdparty/golang.org/x/sys/unix/zptracemips_linux.go diff --git a/third/golang.org/x/sys/unix/zptracemipsle_linux.go b/internal/thirdparty/golang.org/x/sys/unix/zptracemipsle_linux.go similarity index 100% rename from third/golang.org/x/sys/unix/zptracemipsle_linux.go rename to internal/thirdparty/golang.org/x/sys/unix/zptracemipsle_linux.go diff --git a/third/golang.org/x/sys/unix/zsyscall_aix_ppc.go b/internal/thirdparty/golang.org/x/sys/unix/zsyscall_aix_ppc.go similarity index 100% rename from third/golang.org/x/sys/unix/zsyscall_aix_ppc.go rename to internal/thirdparty/golang.org/x/sys/unix/zsyscall_aix_ppc.go diff --git a/third/golang.org/x/sys/unix/zsyscall_aix_ppc64.go b/internal/thirdparty/golang.org/x/sys/unix/zsyscall_aix_ppc64.go similarity index 100% rename from third/golang.org/x/sys/unix/zsyscall_aix_ppc64.go rename to internal/thirdparty/golang.org/x/sys/unix/zsyscall_aix_ppc64.go diff --git a/third/golang.org/x/sys/unix/zsyscall_aix_ppc64_gc.go b/internal/thirdparty/golang.org/x/sys/unix/zsyscall_aix_ppc64_gc.go similarity index 100% rename from third/golang.org/x/sys/unix/zsyscall_aix_ppc64_gc.go rename to internal/thirdparty/golang.org/x/sys/unix/zsyscall_aix_ppc64_gc.go diff --git a/third/golang.org/x/sys/unix/zsyscall_aix_ppc64_gccgo.go b/internal/thirdparty/golang.org/x/sys/unix/zsyscall_aix_ppc64_gccgo.go similarity index 100% rename from third/golang.org/x/sys/unix/zsyscall_aix_ppc64_gccgo.go rename to internal/thirdparty/golang.org/x/sys/unix/zsyscall_aix_ppc64_gccgo.go diff --git a/third/golang.org/x/sys/unix/zsyscall_darwin_386.1_11.go b/internal/thirdparty/golang.org/x/sys/unix/zsyscall_darwin_386.1_11.go similarity index 100% rename from third/golang.org/x/sys/unix/zsyscall_darwin_386.1_11.go rename to internal/thirdparty/golang.org/x/sys/unix/zsyscall_darwin_386.1_11.go diff --git a/third/golang.org/x/sys/unix/zsyscall_darwin_386.go b/internal/thirdparty/golang.org/x/sys/unix/zsyscall_darwin_386.go similarity index 100% rename from third/golang.org/x/sys/unix/zsyscall_darwin_386.go rename to internal/thirdparty/golang.org/x/sys/unix/zsyscall_darwin_386.go diff --git a/third/golang.org/x/sys/unix/zsyscall_darwin_386.s b/internal/thirdparty/golang.org/x/sys/unix/zsyscall_darwin_386.s similarity index 100% rename from third/golang.org/x/sys/unix/zsyscall_darwin_386.s rename to internal/thirdparty/golang.org/x/sys/unix/zsyscall_darwin_386.s diff --git a/third/golang.org/x/sys/unix/zsyscall_darwin_amd64.1_11.go b/internal/thirdparty/golang.org/x/sys/unix/zsyscall_darwin_amd64.1_11.go similarity index 100% rename from third/golang.org/x/sys/unix/zsyscall_darwin_amd64.1_11.go rename to internal/thirdparty/golang.org/x/sys/unix/zsyscall_darwin_amd64.1_11.go diff --git a/third/golang.org/x/sys/unix/zsyscall_darwin_amd64.go b/internal/thirdparty/golang.org/x/sys/unix/zsyscall_darwin_amd64.go similarity index 100% rename from third/golang.org/x/sys/unix/zsyscall_darwin_amd64.go rename to internal/thirdparty/golang.org/x/sys/unix/zsyscall_darwin_amd64.go diff --git a/third/golang.org/x/sys/unix/zsyscall_darwin_amd64.s b/internal/thirdparty/golang.org/x/sys/unix/zsyscall_darwin_amd64.s similarity index 100% rename from third/golang.org/x/sys/unix/zsyscall_darwin_amd64.s rename to internal/thirdparty/golang.org/x/sys/unix/zsyscall_darwin_amd64.s diff --git a/third/golang.org/x/sys/unix/zsyscall_darwin_arm.1_11.go b/internal/thirdparty/golang.org/x/sys/unix/zsyscall_darwin_arm.1_11.go similarity index 100% rename from third/golang.org/x/sys/unix/zsyscall_darwin_arm.1_11.go rename to internal/thirdparty/golang.org/x/sys/unix/zsyscall_darwin_arm.1_11.go diff --git a/third/golang.org/x/sys/unix/zsyscall_darwin_arm.go b/internal/thirdparty/golang.org/x/sys/unix/zsyscall_darwin_arm.go similarity index 100% rename from third/golang.org/x/sys/unix/zsyscall_darwin_arm.go rename to internal/thirdparty/golang.org/x/sys/unix/zsyscall_darwin_arm.go diff --git a/third/golang.org/x/sys/unix/zsyscall_darwin_arm.s b/internal/thirdparty/golang.org/x/sys/unix/zsyscall_darwin_arm.s similarity index 100% rename from third/golang.org/x/sys/unix/zsyscall_darwin_arm.s rename to internal/thirdparty/golang.org/x/sys/unix/zsyscall_darwin_arm.s diff --git a/third/golang.org/x/sys/unix/zsyscall_darwin_arm64.1_11.go b/internal/thirdparty/golang.org/x/sys/unix/zsyscall_darwin_arm64.1_11.go similarity index 100% rename from third/golang.org/x/sys/unix/zsyscall_darwin_arm64.1_11.go rename to internal/thirdparty/golang.org/x/sys/unix/zsyscall_darwin_arm64.1_11.go diff --git a/third/golang.org/x/sys/unix/zsyscall_darwin_arm64.go b/internal/thirdparty/golang.org/x/sys/unix/zsyscall_darwin_arm64.go similarity index 100% rename from third/golang.org/x/sys/unix/zsyscall_darwin_arm64.go rename to internal/thirdparty/golang.org/x/sys/unix/zsyscall_darwin_arm64.go diff --git a/third/golang.org/x/sys/unix/zsyscall_darwin_arm64.s b/internal/thirdparty/golang.org/x/sys/unix/zsyscall_darwin_arm64.s similarity index 100% rename from third/golang.org/x/sys/unix/zsyscall_darwin_arm64.s rename to internal/thirdparty/golang.org/x/sys/unix/zsyscall_darwin_arm64.s diff --git a/third/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go b/internal/thirdparty/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go similarity index 100% rename from third/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go rename to internal/thirdparty/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go diff --git a/third/golang.org/x/sys/unix/zsyscall_freebsd_386.go b/internal/thirdparty/golang.org/x/sys/unix/zsyscall_freebsd_386.go similarity index 100% rename from third/golang.org/x/sys/unix/zsyscall_freebsd_386.go rename to internal/thirdparty/golang.org/x/sys/unix/zsyscall_freebsd_386.go diff --git a/third/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go b/internal/thirdparty/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go similarity index 100% rename from third/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go rename to internal/thirdparty/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go diff --git a/third/golang.org/x/sys/unix/zsyscall_freebsd_arm.go b/internal/thirdparty/golang.org/x/sys/unix/zsyscall_freebsd_arm.go similarity index 100% rename from third/golang.org/x/sys/unix/zsyscall_freebsd_arm.go rename to internal/thirdparty/golang.org/x/sys/unix/zsyscall_freebsd_arm.go diff --git a/third/golang.org/x/sys/unix/zsyscall_freebsd_arm64.go b/internal/thirdparty/golang.org/x/sys/unix/zsyscall_freebsd_arm64.go similarity index 100% rename from third/golang.org/x/sys/unix/zsyscall_freebsd_arm64.go rename to internal/thirdparty/golang.org/x/sys/unix/zsyscall_freebsd_arm64.go diff --git a/third/golang.org/x/sys/unix/zsyscall_linux_386.go b/internal/thirdparty/golang.org/x/sys/unix/zsyscall_linux_386.go similarity index 100% rename from third/golang.org/x/sys/unix/zsyscall_linux_386.go rename to internal/thirdparty/golang.org/x/sys/unix/zsyscall_linux_386.go diff --git a/third/golang.org/x/sys/unix/zsyscall_linux_amd64.go b/internal/thirdparty/golang.org/x/sys/unix/zsyscall_linux_amd64.go similarity index 100% rename from third/golang.org/x/sys/unix/zsyscall_linux_amd64.go rename to internal/thirdparty/golang.org/x/sys/unix/zsyscall_linux_amd64.go diff --git a/third/golang.org/x/sys/unix/zsyscall_linux_arm.go b/internal/thirdparty/golang.org/x/sys/unix/zsyscall_linux_arm.go similarity index 100% rename from third/golang.org/x/sys/unix/zsyscall_linux_arm.go rename to internal/thirdparty/golang.org/x/sys/unix/zsyscall_linux_arm.go diff --git a/third/golang.org/x/sys/unix/zsyscall_linux_arm64.go b/internal/thirdparty/golang.org/x/sys/unix/zsyscall_linux_arm64.go similarity index 100% rename from third/golang.org/x/sys/unix/zsyscall_linux_arm64.go rename to internal/thirdparty/golang.org/x/sys/unix/zsyscall_linux_arm64.go diff --git a/third/golang.org/x/sys/unix/zsyscall_linux_mips.go b/internal/thirdparty/golang.org/x/sys/unix/zsyscall_linux_mips.go similarity index 100% rename from third/golang.org/x/sys/unix/zsyscall_linux_mips.go rename to internal/thirdparty/golang.org/x/sys/unix/zsyscall_linux_mips.go diff --git a/third/golang.org/x/sys/unix/zsyscall_linux_mips64.go b/internal/thirdparty/golang.org/x/sys/unix/zsyscall_linux_mips64.go similarity index 100% rename from third/golang.org/x/sys/unix/zsyscall_linux_mips64.go rename to internal/thirdparty/golang.org/x/sys/unix/zsyscall_linux_mips64.go diff --git a/third/golang.org/x/sys/unix/zsyscall_linux_mips64le.go b/internal/thirdparty/golang.org/x/sys/unix/zsyscall_linux_mips64le.go similarity index 100% rename from third/golang.org/x/sys/unix/zsyscall_linux_mips64le.go rename to internal/thirdparty/golang.org/x/sys/unix/zsyscall_linux_mips64le.go diff --git a/third/golang.org/x/sys/unix/zsyscall_linux_mipsle.go b/internal/thirdparty/golang.org/x/sys/unix/zsyscall_linux_mipsle.go similarity index 100% rename from third/golang.org/x/sys/unix/zsyscall_linux_mipsle.go rename to internal/thirdparty/golang.org/x/sys/unix/zsyscall_linux_mipsle.go diff --git a/third/golang.org/x/sys/unix/zsyscall_linux_ppc64.go b/internal/thirdparty/golang.org/x/sys/unix/zsyscall_linux_ppc64.go similarity index 100% rename from third/golang.org/x/sys/unix/zsyscall_linux_ppc64.go rename to internal/thirdparty/golang.org/x/sys/unix/zsyscall_linux_ppc64.go diff --git a/third/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go b/internal/thirdparty/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go similarity index 100% rename from third/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go rename to internal/thirdparty/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go diff --git a/third/golang.org/x/sys/unix/zsyscall_linux_riscv64.go b/internal/thirdparty/golang.org/x/sys/unix/zsyscall_linux_riscv64.go similarity index 100% rename from third/golang.org/x/sys/unix/zsyscall_linux_riscv64.go rename to internal/thirdparty/golang.org/x/sys/unix/zsyscall_linux_riscv64.go diff --git a/third/golang.org/x/sys/unix/zsyscall_linux_s390x.go b/internal/thirdparty/golang.org/x/sys/unix/zsyscall_linux_s390x.go similarity index 100% rename from third/golang.org/x/sys/unix/zsyscall_linux_s390x.go rename to internal/thirdparty/golang.org/x/sys/unix/zsyscall_linux_s390x.go diff --git a/third/golang.org/x/sys/unix/zsyscall_linux_sparc64.go b/internal/thirdparty/golang.org/x/sys/unix/zsyscall_linux_sparc64.go similarity index 100% rename from third/golang.org/x/sys/unix/zsyscall_linux_sparc64.go rename to internal/thirdparty/golang.org/x/sys/unix/zsyscall_linux_sparc64.go diff --git a/third/golang.org/x/sys/unix/zsyscall_netbsd_386.go b/internal/thirdparty/golang.org/x/sys/unix/zsyscall_netbsd_386.go similarity index 100% rename from third/golang.org/x/sys/unix/zsyscall_netbsd_386.go rename to internal/thirdparty/golang.org/x/sys/unix/zsyscall_netbsd_386.go diff --git a/third/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go b/internal/thirdparty/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go similarity index 100% rename from third/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go rename to internal/thirdparty/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go diff --git a/third/golang.org/x/sys/unix/zsyscall_netbsd_arm.go b/internal/thirdparty/golang.org/x/sys/unix/zsyscall_netbsd_arm.go similarity index 100% rename from third/golang.org/x/sys/unix/zsyscall_netbsd_arm.go rename to internal/thirdparty/golang.org/x/sys/unix/zsyscall_netbsd_arm.go diff --git a/third/golang.org/x/sys/unix/zsyscall_netbsd_arm64.go b/internal/thirdparty/golang.org/x/sys/unix/zsyscall_netbsd_arm64.go similarity index 100% rename from third/golang.org/x/sys/unix/zsyscall_netbsd_arm64.go rename to internal/thirdparty/golang.org/x/sys/unix/zsyscall_netbsd_arm64.go diff --git a/third/golang.org/x/sys/unix/zsyscall_openbsd_386.go b/internal/thirdparty/golang.org/x/sys/unix/zsyscall_openbsd_386.go similarity index 100% rename from third/golang.org/x/sys/unix/zsyscall_openbsd_386.go rename to internal/thirdparty/golang.org/x/sys/unix/zsyscall_openbsd_386.go diff --git a/third/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go b/internal/thirdparty/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go similarity index 100% rename from third/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go rename to internal/thirdparty/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go diff --git a/third/golang.org/x/sys/unix/zsyscall_openbsd_arm.go b/internal/thirdparty/golang.org/x/sys/unix/zsyscall_openbsd_arm.go similarity index 100% rename from third/golang.org/x/sys/unix/zsyscall_openbsd_arm.go rename to internal/thirdparty/golang.org/x/sys/unix/zsyscall_openbsd_arm.go diff --git a/third/golang.org/x/sys/unix/zsyscall_solaris_amd64.go b/internal/thirdparty/golang.org/x/sys/unix/zsyscall_solaris_amd64.go similarity index 100% rename from third/golang.org/x/sys/unix/zsyscall_solaris_amd64.go rename to internal/thirdparty/golang.org/x/sys/unix/zsyscall_solaris_amd64.go diff --git a/third/golang.org/x/sys/unix/zsysctl_openbsd_386.go b/internal/thirdparty/golang.org/x/sys/unix/zsysctl_openbsd_386.go similarity index 100% rename from third/golang.org/x/sys/unix/zsysctl_openbsd_386.go rename to internal/thirdparty/golang.org/x/sys/unix/zsysctl_openbsd_386.go diff --git a/third/golang.org/x/sys/unix/zsysctl_openbsd_amd64.go b/internal/thirdparty/golang.org/x/sys/unix/zsysctl_openbsd_amd64.go similarity index 100% rename from third/golang.org/x/sys/unix/zsysctl_openbsd_amd64.go rename to internal/thirdparty/golang.org/x/sys/unix/zsysctl_openbsd_amd64.go diff --git a/third/golang.org/x/sys/unix/zsysctl_openbsd_arm.go b/internal/thirdparty/golang.org/x/sys/unix/zsysctl_openbsd_arm.go similarity index 100% rename from third/golang.org/x/sys/unix/zsysctl_openbsd_arm.go rename to internal/thirdparty/golang.org/x/sys/unix/zsysctl_openbsd_arm.go diff --git a/third/golang.org/x/sys/unix/zsysnum_darwin_386.go b/internal/thirdparty/golang.org/x/sys/unix/zsysnum_darwin_386.go similarity index 100% rename from third/golang.org/x/sys/unix/zsysnum_darwin_386.go rename to internal/thirdparty/golang.org/x/sys/unix/zsysnum_darwin_386.go diff --git a/third/golang.org/x/sys/unix/zsysnum_darwin_amd64.go b/internal/thirdparty/golang.org/x/sys/unix/zsysnum_darwin_amd64.go similarity index 100% rename from third/golang.org/x/sys/unix/zsysnum_darwin_amd64.go rename to internal/thirdparty/golang.org/x/sys/unix/zsysnum_darwin_amd64.go diff --git a/third/golang.org/x/sys/unix/zsysnum_darwin_arm.go b/internal/thirdparty/golang.org/x/sys/unix/zsysnum_darwin_arm.go similarity index 100% rename from third/golang.org/x/sys/unix/zsysnum_darwin_arm.go rename to internal/thirdparty/golang.org/x/sys/unix/zsysnum_darwin_arm.go diff --git a/third/golang.org/x/sys/unix/zsysnum_darwin_arm64.go b/internal/thirdparty/golang.org/x/sys/unix/zsysnum_darwin_arm64.go similarity index 100% rename from third/golang.org/x/sys/unix/zsysnum_darwin_arm64.go rename to internal/thirdparty/golang.org/x/sys/unix/zsysnum_darwin_arm64.go diff --git a/third/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go b/internal/thirdparty/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go similarity index 100% rename from third/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go rename to internal/thirdparty/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go diff --git a/third/golang.org/x/sys/unix/zsysnum_freebsd_386.go b/internal/thirdparty/golang.org/x/sys/unix/zsysnum_freebsd_386.go similarity index 100% rename from third/golang.org/x/sys/unix/zsysnum_freebsd_386.go rename to internal/thirdparty/golang.org/x/sys/unix/zsysnum_freebsd_386.go diff --git a/third/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go b/internal/thirdparty/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go similarity index 100% rename from third/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go rename to internal/thirdparty/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go diff --git a/third/golang.org/x/sys/unix/zsysnum_freebsd_arm.go b/internal/thirdparty/golang.org/x/sys/unix/zsysnum_freebsd_arm.go similarity index 100% rename from third/golang.org/x/sys/unix/zsysnum_freebsd_arm.go rename to internal/thirdparty/golang.org/x/sys/unix/zsysnum_freebsd_arm.go diff --git a/third/golang.org/x/sys/unix/zsysnum_freebsd_arm64.go b/internal/thirdparty/golang.org/x/sys/unix/zsysnum_freebsd_arm64.go similarity index 100% rename from third/golang.org/x/sys/unix/zsysnum_freebsd_arm64.go rename to internal/thirdparty/golang.org/x/sys/unix/zsysnum_freebsd_arm64.go diff --git a/third/golang.org/x/sys/unix/zsysnum_linux_386.go b/internal/thirdparty/golang.org/x/sys/unix/zsysnum_linux_386.go similarity index 100% rename from third/golang.org/x/sys/unix/zsysnum_linux_386.go rename to internal/thirdparty/golang.org/x/sys/unix/zsysnum_linux_386.go diff --git a/third/golang.org/x/sys/unix/zsysnum_linux_amd64.go b/internal/thirdparty/golang.org/x/sys/unix/zsysnum_linux_amd64.go similarity index 100% rename from third/golang.org/x/sys/unix/zsysnum_linux_amd64.go rename to internal/thirdparty/golang.org/x/sys/unix/zsysnum_linux_amd64.go diff --git a/third/golang.org/x/sys/unix/zsysnum_linux_arm.go b/internal/thirdparty/golang.org/x/sys/unix/zsysnum_linux_arm.go similarity index 100% rename from third/golang.org/x/sys/unix/zsysnum_linux_arm.go rename to internal/thirdparty/golang.org/x/sys/unix/zsysnum_linux_arm.go diff --git a/third/golang.org/x/sys/unix/zsysnum_linux_arm64.go b/internal/thirdparty/golang.org/x/sys/unix/zsysnum_linux_arm64.go similarity index 100% rename from third/golang.org/x/sys/unix/zsysnum_linux_arm64.go rename to internal/thirdparty/golang.org/x/sys/unix/zsysnum_linux_arm64.go diff --git a/third/golang.org/x/sys/unix/zsysnum_linux_mips.go b/internal/thirdparty/golang.org/x/sys/unix/zsysnum_linux_mips.go similarity index 100% rename from third/golang.org/x/sys/unix/zsysnum_linux_mips.go rename to internal/thirdparty/golang.org/x/sys/unix/zsysnum_linux_mips.go diff --git a/third/golang.org/x/sys/unix/zsysnum_linux_mips64.go b/internal/thirdparty/golang.org/x/sys/unix/zsysnum_linux_mips64.go similarity index 100% rename from third/golang.org/x/sys/unix/zsysnum_linux_mips64.go rename to internal/thirdparty/golang.org/x/sys/unix/zsysnum_linux_mips64.go diff --git a/third/golang.org/x/sys/unix/zsysnum_linux_mips64le.go b/internal/thirdparty/golang.org/x/sys/unix/zsysnum_linux_mips64le.go similarity index 100% rename from third/golang.org/x/sys/unix/zsysnum_linux_mips64le.go rename to internal/thirdparty/golang.org/x/sys/unix/zsysnum_linux_mips64le.go diff --git a/third/golang.org/x/sys/unix/zsysnum_linux_mipsle.go b/internal/thirdparty/golang.org/x/sys/unix/zsysnum_linux_mipsle.go similarity index 100% rename from third/golang.org/x/sys/unix/zsysnum_linux_mipsle.go rename to internal/thirdparty/golang.org/x/sys/unix/zsysnum_linux_mipsle.go diff --git a/third/golang.org/x/sys/unix/zsysnum_linux_ppc64.go b/internal/thirdparty/golang.org/x/sys/unix/zsysnum_linux_ppc64.go similarity index 100% rename from third/golang.org/x/sys/unix/zsysnum_linux_ppc64.go rename to internal/thirdparty/golang.org/x/sys/unix/zsysnum_linux_ppc64.go diff --git a/third/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go b/internal/thirdparty/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go similarity index 100% rename from third/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go rename to internal/thirdparty/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go diff --git a/third/golang.org/x/sys/unix/zsysnum_linux_riscv64.go b/internal/thirdparty/golang.org/x/sys/unix/zsysnum_linux_riscv64.go similarity index 100% rename from third/golang.org/x/sys/unix/zsysnum_linux_riscv64.go rename to internal/thirdparty/golang.org/x/sys/unix/zsysnum_linux_riscv64.go diff --git a/third/golang.org/x/sys/unix/zsysnum_linux_s390x.go b/internal/thirdparty/golang.org/x/sys/unix/zsysnum_linux_s390x.go similarity index 100% rename from third/golang.org/x/sys/unix/zsysnum_linux_s390x.go rename to internal/thirdparty/golang.org/x/sys/unix/zsysnum_linux_s390x.go diff --git a/third/golang.org/x/sys/unix/zsysnum_linux_sparc64.go b/internal/thirdparty/golang.org/x/sys/unix/zsysnum_linux_sparc64.go similarity index 100% rename from third/golang.org/x/sys/unix/zsysnum_linux_sparc64.go rename to internal/thirdparty/golang.org/x/sys/unix/zsysnum_linux_sparc64.go diff --git a/third/golang.org/x/sys/unix/zsysnum_netbsd_386.go b/internal/thirdparty/golang.org/x/sys/unix/zsysnum_netbsd_386.go similarity index 100% rename from third/golang.org/x/sys/unix/zsysnum_netbsd_386.go rename to internal/thirdparty/golang.org/x/sys/unix/zsysnum_netbsd_386.go diff --git a/third/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go b/internal/thirdparty/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go similarity index 100% rename from third/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go rename to internal/thirdparty/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go diff --git a/third/golang.org/x/sys/unix/zsysnum_netbsd_arm.go b/internal/thirdparty/golang.org/x/sys/unix/zsysnum_netbsd_arm.go similarity index 100% rename from third/golang.org/x/sys/unix/zsysnum_netbsd_arm.go rename to internal/thirdparty/golang.org/x/sys/unix/zsysnum_netbsd_arm.go diff --git a/third/golang.org/x/sys/unix/zsysnum_netbsd_arm64.go b/internal/thirdparty/golang.org/x/sys/unix/zsysnum_netbsd_arm64.go similarity index 100% rename from third/golang.org/x/sys/unix/zsysnum_netbsd_arm64.go rename to internal/thirdparty/golang.org/x/sys/unix/zsysnum_netbsd_arm64.go diff --git a/third/golang.org/x/sys/unix/zsysnum_openbsd_386.go b/internal/thirdparty/golang.org/x/sys/unix/zsysnum_openbsd_386.go similarity index 100% rename from third/golang.org/x/sys/unix/zsysnum_openbsd_386.go rename to internal/thirdparty/golang.org/x/sys/unix/zsysnum_openbsd_386.go diff --git a/third/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go b/internal/thirdparty/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go similarity index 100% rename from third/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go rename to internal/thirdparty/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go diff --git a/third/golang.org/x/sys/unix/zsysnum_openbsd_arm.go b/internal/thirdparty/golang.org/x/sys/unix/zsysnum_openbsd_arm.go similarity index 100% rename from third/golang.org/x/sys/unix/zsysnum_openbsd_arm.go rename to internal/thirdparty/golang.org/x/sys/unix/zsysnum_openbsd_arm.go diff --git a/third/golang.org/x/sys/unix/ztypes_aix_ppc.go b/internal/thirdparty/golang.org/x/sys/unix/ztypes_aix_ppc.go similarity index 100% rename from third/golang.org/x/sys/unix/ztypes_aix_ppc.go rename to internal/thirdparty/golang.org/x/sys/unix/ztypes_aix_ppc.go diff --git a/third/golang.org/x/sys/unix/ztypes_aix_ppc64.go b/internal/thirdparty/golang.org/x/sys/unix/ztypes_aix_ppc64.go similarity index 100% rename from third/golang.org/x/sys/unix/ztypes_aix_ppc64.go rename to internal/thirdparty/golang.org/x/sys/unix/ztypes_aix_ppc64.go diff --git a/third/golang.org/x/sys/unix/ztypes_darwin_386.go b/internal/thirdparty/golang.org/x/sys/unix/ztypes_darwin_386.go similarity index 100% rename from third/golang.org/x/sys/unix/ztypes_darwin_386.go rename to internal/thirdparty/golang.org/x/sys/unix/ztypes_darwin_386.go diff --git a/third/golang.org/x/sys/unix/ztypes_darwin_amd64.go b/internal/thirdparty/golang.org/x/sys/unix/ztypes_darwin_amd64.go similarity index 100% rename from third/golang.org/x/sys/unix/ztypes_darwin_amd64.go rename to internal/thirdparty/golang.org/x/sys/unix/ztypes_darwin_amd64.go diff --git a/third/golang.org/x/sys/unix/ztypes_darwin_arm.go b/internal/thirdparty/golang.org/x/sys/unix/ztypes_darwin_arm.go similarity index 100% rename from third/golang.org/x/sys/unix/ztypes_darwin_arm.go rename to internal/thirdparty/golang.org/x/sys/unix/ztypes_darwin_arm.go diff --git a/third/golang.org/x/sys/unix/ztypes_darwin_arm64.go b/internal/thirdparty/golang.org/x/sys/unix/ztypes_darwin_arm64.go similarity index 100% rename from third/golang.org/x/sys/unix/ztypes_darwin_arm64.go rename to internal/thirdparty/golang.org/x/sys/unix/ztypes_darwin_arm64.go diff --git a/third/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go b/internal/thirdparty/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go similarity index 100% rename from third/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go rename to internal/thirdparty/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go diff --git a/third/golang.org/x/sys/unix/ztypes_freebsd_386.go b/internal/thirdparty/golang.org/x/sys/unix/ztypes_freebsd_386.go similarity index 100% rename from third/golang.org/x/sys/unix/ztypes_freebsd_386.go rename to internal/thirdparty/golang.org/x/sys/unix/ztypes_freebsd_386.go diff --git a/third/golang.org/x/sys/unix/ztypes_freebsd_amd64.go b/internal/thirdparty/golang.org/x/sys/unix/ztypes_freebsd_amd64.go similarity index 100% rename from third/golang.org/x/sys/unix/ztypes_freebsd_amd64.go rename to internal/thirdparty/golang.org/x/sys/unix/ztypes_freebsd_amd64.go diff --git a/third/golang.org/x/sys/unix/ztypes_freebsd_arm.go b/internal/thirdparty/golang.org/x/sys/unix/ztypes_freebsd_arm.go similarity index 100% rename from third/golang.org/x/sys/unix/ztypes_freebsd_arm.go rename to internal/thirdparty/golang.org/x/sys/unix/ztypes_freebsd_arm.go diff --git a/third/golang.org/x/sys/unix/ztypes_freebsd_arm64.go b/internal/thirdparty/golang.org/x/sys/unix/ztypes_freebsd_arm64.go similarity index 100% rename from third/golang.org/x/sys/unix/ztypes_freebsd_arm64.go rename to internal/thirdparty/golang.org/x/sys/unix/ztypes_freebsd_arm64.go diff --git a/third/golang.org/x/sys/unix/ztypes_linux_386.go b/internal/thirdparty/golang.org/x/sys/unix/ztypes_linux_386.go similarity index 100% rename from third/golang.org/x/sys/unix/ztypes_linux_386.go rename to internal/thirdparty/golang.org/x/sys/unix/ztypes_linux_386.go diff --git a/third/golang.org/x/sys/unix/ztypes_linux_amd64.go b/internal/thirdparty/golang.org/x/sys/unix/ztypes_linux_amd64.go similarity index 100% rename from third/golang.org/x/sys/unix/ztypes_linux_amd64.go rename to internal/thirdparty/golang.org/x/sys/unix/ztypes_linux_amd64.go diff --git a/third/golang.org/x/sys/unix/ztypes_linux_arm.go b/internal/thirdparty/golang.org/x/sys/unix/ztypes_linux_arm.go similarity index 100% rename from third/golang.org/x/sys/unix/ztypes_linux_arm.go rename to internal/thirdparty/golang.org/x/sys/unix/ztypes_linux_arm.go diff --git a/third/golang.org/x/sys/unix/ztypes_linux_arm64.go b/internal/thirdparty/golang.org/x/sys/unix/ztypes_linux_arm64.go similarity index 100% rename from third/golang.org/x/sys/unix/ztypes_linux_arm64.go rename to internal/thirdparty/golang.org/x/sys/unix/ztypes_linux_arm64.go diff --git a/third/golang.org/x/sys/unix/ztypes_linux_mips.go b/internal/thirdparty/golang.org/x/sys/unix/ztypes_linux_mips.go similarity index 100% rename from third/golang.org/x/sys/unix/ztypes_linux_mips.go rename to internal/thirdparty/golang.org/x/sys/unix/ztypes_linux_mips.go diff --git a/third/golang.org/x/sys/unix/ztypes_linux_mips64.go b/internal/thirdparty/golang.org/x/sys/unix/ztypes_linux_mips64.go similarity index 100% rename from third/golang.org/x/sys/unix/ztypes_linux_mips64.go rename to internal/thirdparty/golang.org/x/sys/unix/ztypes_linux_mips64.go diff --git a/third/golang.org/x/sys/unix/ztypes_linux_mips64le.go b/internal/thirdparty/golang.org/x/sys/unix/ztypes_linux_mips64le.go similarity index 100% rename from third/golang.org/x/sys/unix/ztypes_linux_mips64le.go rename to internal/thirdparty/golang.org/x/sys/unix/ztypes_linux_mips64le.go diff --git a/third/golang.org/x/sys/unix/ztypes_linux_mipsle.go b/internal/thirdparty/golang.org/x/sys/unix/ztypes_linux_mipsle.go similarity index 100% rename from third/golang.org/x/sys/unix/ztypes_linux_mipsle.go rename to internal/thirdparty/golang.org/x/sys/unix/ztypes_linux_mipsle.go diff --git a/third/golang.org/x/sys/unix/ztypes_linux_ppc64.go b/internal/thirdparty/golang.org/x/sys/unix/ztypes_linux_ppc64.go similarity index 100% rename from third/golang.org/x/sys/unix/ztypes_linux_ppc64.go rename to internal/thirdparty/golang.org/x/sys/unix/ztypes_linux_ppc64.go diff --git a/third/golang.org/x/sys/unix/ztypes_linux_ppc64le.go b/internal/thirdparty/golang.org/x/sys/unix/ztypes_linux_ppc64le.go similarity index 100% rename from third/golang.org/x/sys/unix/ztypes_linux_ppc64le.go rename to internal/thirdparty/golang.org/x/sys/unix/ztypes_linux_ppc64le.go diff --git a/third/golang.org/x/sys/unix/ztypes_linux_riscv64.go b/internal/thirdparty/golang.org/x/sys/unix/ztypes_linux_riscv64.go similarity index 100% rename from third/golang.org/x/sys/unix/ztypes_linux_riscv64.go rename to internal/thirdparty/golang.org/x/sys/unix/ztypes_linux_riscv64.go diff --git a/third/golang.org/x/sys/unix/ztypes_linux_s390x.go b/internal/thirdparty/golang.org/x/sys/unix/ztypes_linux_s390x.go similarity index 100% rename from third/golang.org/x/sys/unix/ztypes_linux_s390x.go rename to internal/thirdparty/golang.org/x/sys/unix/ztypes_linux_s390x.go diff --git a/third/golang.org/x/sys/unix/ztypes_linux_sparc64.go b/internal/thirdparty/golang.org/x/sys/unix/ztypes_linux_sparc64.go similarity index 100% rename from third/golang.org/x/sys/unix/ztypes_linux_sparc64.go rename to internal/thirdparty/golang.org/x/sys/unix/ztypes_linux_sparc64.go diff --git a/third/golang.org/x/sys/unix/ztypes_netbsd_386.go b/internal/thirdparty/golang.org/x/sys/unix/ztypes_netbsd_386.go similarity index 100% rename from third/golang.org/x/sys/unix/ztypes_netbsd_386.go rename to internal/thirdparty/golang.org/x/sys/unix/ztypes_netbsd_386.go diff --git a/third/golang.org/x/sys/unix/ztypes_netbsd_amd64.go b/internal/thirdparty/golang.org/x/sys/unix/ztypes_netbsd_amd64.go similarity index 100% rename from third/golang.org/x/sys/unix/ztypes_netbsd_amd64.go rename to internal/thirdparty/golang.org/x/sys/unix/ztypes_netbsd_amd64.go diff --git a/third/golang.org/x/sys/unix/ztypes_netbsd_arm.go b/internal/thirdparty/golang.org/x/sys/unix/ztypes_netbsd_arm.go similarity index 100% rename from third/golang.org/x/sys/unix/ztypes_netbsd_arm.go rename to internal/thirdparty/golang.org/x/sys/unix/ztypes_netbsd_arm.go diff --git a/third/golang.org/x/sys/unix/ztypes_netbsd_arm64.go b/internal/thirdparty/golang.org/x/sys/unix/ztypes_netbsd_arm64.go similarity index 100% rename from third/golang.org/x/sys/unix/ztypes_netbsd_arm64.go rename to internal/thirdparty/golang.org/x/sys/unix/ztypes_netbsd_arm64.go diff --git a/third/golang.org/x/sys/unix/ztypes_openbsd_386.go b/internal/thirdparty/golang.org/x/sys/unix/ztypes_openbsd_386.go similarity index 100% rename from third/golang.org/x/sys/unix/ztypes_openbsd_386.go rename to internal/thirdparty/golang.org/x/sys/unix/ztypes_openbsd_386.go diff --git a/third/golang.org/x/sys/unix/ztypes_openbsd_amd64.go b/internal/thirdparty/golang.org/x/sys/unix/ztypes_openbsd_amd64.go similarity index 100% rename from third/golang.org/x/sys/unix/ztypes_openbsd_amd64.go rename to internal/thirdparty/golang.org/x/sys/unix/ztypes_openbsd_amd64.go diff --git a/third/golang.org/x/sys/unix/ztypes_openbsd_arm.go b/internal/thirdparty/golang.org/x/sys/unix/ztypes_openbsd_arm.go similarity index 100% rename from third/golang.org/x/sys/unix/ztypes_openbsd_arm.go rename to internal/thirdparty/golang.org/x/sys/unix/ztypes_openbsd_arm.go diff --git a/third/golang.org/x/sys/unix/ztypes_solaris_amd64.go b/internal/thirdparty/golang.org/x/sys/unix/ztypes_solaris_amd64.go similarity index 100% rename from third/golang.org/x/sys/unix/ztypes_solaris_amd64.go rename to internal/thirdparty/golang.org/x/sys/unix/ztypes_solaris_amd64.go diff --git a/third/golang.org/x/sys/windows/aliases.go b/internal/thirdparty/golang.org/x/sys/windows/aliases.go similarity index 100% rename from third/golang.org/x/sys/windows/aliases.go rename to internal/thirdparty/golang.org/x/sys/windows/aliases.go diff --git a/third/golang.org/x/sys/windows/asm_windows_386.s b/internal/thirdparty/golang.org/x/sys/windows/asm_windows_386.s similarity index 100% rename from third/golang.org/x/sys/windows/asm_windows_386.s rename to internal/thirdparty/golang.org/x/sys/windows/asm_windows_386.s diff --git a/third/golang.org/x/sys/windows/asm_windows_amd64.s b/internal/thirdparty/golang.org/x/sys/windows/asm_windows_amd64.s similarity index 100% rename from third/golang.org/x/sys/windows/asm_windows_amd64.s rename to internal/thirdparty/golang.org/x/sys/windows/asm_windows_amd64.s diff --git a/third/golang.org/x/sys/windows/asm_windows_arm.s b/internal/thirdparty/golang.org/x/sys/windows/asm_windows_arm.s similarity index 100% rename from third/golang.org/x/sys/windows/asm_windows_arm.s rename to internal/thirdparty/golang.org/x/sys/windows/asm_windows_arm.s diff --git a/third/golang.org/x/sys/windows/dll_windows.go b/internal/thirdparty/golang.org/x/sys/windows/dll_windows.go similarity index 100% rename from third/golang.org/x/sys/windows/dll_windows.go rename to internal/thirdparty/golang.org/x/sys/windows/dll_windows.go diff --git a/third/golang.org/x/sys/windows/env_windows.go b/internal/thirdparty/golang.org/x/sys/windows/env_windows.go similarity index 100% rename from third/golang.org/x/sys/windows/env_windows.go rename to internal/thirdparty/golang.org/x/sys/windows/env_windows.go diff --git a/third/golang.org/x/sys/windows/eventlog.go b/internal/thirdparty/golang.org/x/sys/windows/eventlog.go similarity index 100% rename from third/golang.org/x/sys/windows/eventlog.go rename to internal/thirdparty/golang.org/x/sys/windows/eventlog.go diff --git a/third/golang.org/x/sys/windows/exec_windows.go b/internal/thirdparty/golang.org/x/sys/windows/exec_windows.go similarity index 100% rename from third/golang.org/x/sys/windows/exec_windows.go rename to internal/thirdparty/golang.org/x/sys/windows/exec_windows.go diff --git a/third/golang.org/x/sys/windows/memory_windows.go b/internal/thirdparty/golang.org/x/sys/windows/memory_windows.go similarity index 100% rename from third/golang.org/x/sys/windows/memory_windows.go rename to internal/thirdparty/golang.org/x/sys/windows/memory_windows.go diff --git a/third/golang.org/x/sys/windows/mksyscall.go b/internal/thirdparty/golang.org/x/sys/windows/mksyscall.go similarity index 100% rename from third/golang.org/x/sys/windows/mksyscall.go rename to internal/thirdparty/golang.org/x/sys/windows/mksyscall.go diff --git a/third/golang.org/x/sys/windows/race.go b/internal/thirdparty/golang.org/x/sys/windows/race.go similarity index 100% rename from third/golang.org/x/sys/windows/race.go rename to internal/thirdparty/golang.org/x/sys/windows/race.go diff --git a/third/golang.org/x/sys/windows/race0.go b/internal/thirdparty/golang.org/x/sys/windows/race0.go similarity index 100% rename from third/golang.org/x/sys/windows/race0.go rename to internal/thirdparty/golang.org/x/sys/windows/race0.go diff --git a/third/golang.org/x/sys/windows/registry/export_test.go b/internal/thirdparty/golang.org/x/sys/windows/registry/export_test.go similarity index 100% rename from third/golang.org/x/sys/windows/registry/export_test.go rename to internal/thirdparty/golang.org/x/sys/windows/registry/export_test.go diff --git a/third/golang.org/x/sys/windows/registry/key.go b/internal/thirdparty/golang.org/x/sys/windows/registry/key.go similarity index 100% rename from third/golang.org/x/sys/windows/registry/key.go rename to internal/thirdparty/golang.org/x/sys/windows/registry/key.go diff --git a/third/golang.org/x/sys/windows/registry/mksyscall.go b/internal/thirdparty/golang.org/x/sys/windows/registry/mksyscall.go similarity index 100% rename from third/golang.org/x/sys/windows/registry/mksyscall.go rename to internal/thirdparty/golang.org/x/sys/windows/registry/mksyscall.go diff --git a/third/golang.org/x/sys/windows/registry/registry_test.go b/internal/thirdparty/golang.org/x/sys/windows/registry/registry_test.go similarity index 99% rename from third/golang.org/x/sys/windows/registry/registry_test.go rename to internal/thirdparty/golang.org/x/sys/windows/registry/registry_test.go index 98517f344..d5e0d3fe1 100644 --- a/third/golang.org/x/sys/windows/registry/registry_test.go +++ b/internal/thirdparty/golang.org/x/sys/windows/registry/registry_test.go @@ -15,7 +15,7 @@ import ( "time" "unsafe" - "github.com/gogf/gf/third/golang.org/x/sys/windows/registry" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/windows/registry" ) func randKeyName(prefix string) string { diff --git a/third/golang.org/x/sys/windows/registry/syscall.go b/internal/thirdparty/golang.org/x/sys/windows/registry/syscall.go similarity index 100% rename from third/golang.org/x/sys/windows/registry/syscall.go rename to internal/thirdparty/golang.org/x/sys/windows/registry/syscall.go diff --git a/third/golang.org/x/sys/windows/registry/value.go b/internal/thirdparty/golang.org/x/sys/windows/registry/value.go similarity index 100% rename from third/golang.org/x/sys/windows/registry/value.go rename to internal/thirdparty/golang.org/x/sys/windows/registry/value.go diff --git a/third/golang.org/x/sys/windows/registry/zsyscall_windows.go b/internal/thirdparty/golang.org/x/sys/windows/registry/zsyscall_windows.go similarity index 98% rename from third/golang.org/x/sys/windows/registry/zsyscall_windows.go rename to internal/thirdparty/golang.org/x/sys/windows/registry/zsyscall_windows.go index 9a178e25b..48d67c08b 100644 --- a/third/golang.org/x/sys/windows/registry/zsyscall_windows.go +++ b/internal/thirdparty/golang.org/x/sys/windows/registry/zsyscall_windows.go @@ -6,7 +6,7 @@ import ( "syscall" "unsafe" - "github.com/gogf/gf/third/golang.org/x/sys/windows" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/windows" ) var _ unsafe.Pointer diff --git a/third/golang.org/x/sys/windows/security_windows.go b/internal/thirdparty/golang.org/x/sys/windows/security_windows.go similarity index 100% rename from third/golang.org/x/sys/windows/security_windows.go rename to internal/thirdparty/golang.org/x/sys/windows/security_windows.go diff --git a/third/golang.org/x/sys/windows/service.go b/internal/thirdparty/golang.org/x/sys/windows/service.go similarity index 100% rename from third/golang.org/x/sys/windows/service.go rename to internal/thirdparty/golang.org/x/sys/windows/service.go diff --git a/third/golang.org/x/sys/windows/str.go b/internal/thirdparty/golang.org/x/sys/windows/str.go similarity index 100% rename from third/golang.org/x/sys/windows/str.go rename to internal/thirdparty/golang.org/x/sys/windows/str.go diff --git a/third/golang.org/x/sys/windows/svc/debug/log.go b/internal/thirdparty/golang.org/x/sys/windows/svc/debug/log.go similarity index 100% rename from third/golang.org/x/sys/windows/svc/debug/log.go rename to internal/thirdparty/golang.org/x/sys/windows/svc/debug/log.go diff --git a/third/golang.org/x/sys/windows/svc/debug/service.go b/internal/thirdparty/golang.org/x/sys/windows/svc/debug/service.go similarity index 93% rename from third/golang.org/x/sys/windows/svc/debug/service.go rename to internal/thirdparty/golang.org/x/sys/windows/svc/debug/service.go index e0f5e75bc..092c0ea2b 100644 --- a/third/golang.org/x/sys/windows/svc/debug/service.go +++ b/internal/thirdparty/golang.org/x/sys/windows/svc/debug/service.go @@ -13,7 +13,7 @@ import ( "os/signal" "syscall" - "github.com/gogf/gf/third/golang.org/x/sys/windows/svc" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/windows/svc" ) // Run executes service name by calling appropriate handler function. diff --git a/third/golang.org/x/sys/windows/svc/event.go b/internal/thirdparty/golang.org/x/sys/windows/svc/event.go similarity index 93% rename from third/golang.org/x/sys/windows/svc/event.go rename to internal/thirdparty/golang.org/x/sys/windows/svc/event.go index c47d9fa43..1daab15a7 100644 --- a/third/golang.org/x/sys/windows/svc/event.go +++ b/internal/thirdparty/golang.org/x/sys/windows/svc/event.go @@ -9,7 +9,7 @@ package svc import ( "errors" - "github.com/gogf/gf/third/golang.org/x/sys/windows" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/windows" ) // event represents auto-reset, initially non-signaled Windows event. diff --git a/third/golang.org/x/sys/windows/svc/eventlog/install.go b/internal/thirdparty/golang.org/x/sys/windows/svc/eventlog/install.go similarity index 94% rename from third/golang.org/x/sys/windows/svc/eventlog/install.go rename to internal/thirdparty/golang.org/x/sys/windows/svc/eventlog/install.go index 9ad5ac51e..7a3ad840a 100644 --- a/third/golang.org/x/sys/windows/svc/eventlog/install.go +++ b/internal/thirdparty/golang.org/x/sys/windows/svc/eventlog/install.go @@ -9,8 +9,8 @@ package eventlog import ( "errors" - "github.com/gogf/gf/third/golang.org/x/sys/windows" - "github.com/gogf/gf/third/golang.org/x/sys/windows/registry" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/windows" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/windows/registry" ) const ( diff --git a/third/golang.org/x/sys/windows/svc/eventlog/log.go b/internal/thirdparty/golang.org/x/sys/windows/svc/eventlog/log.go similarity index 96% rename from third/golang.org/x/sys/windows/svc/eventlog/log.go rename to internal/thirdparty/golang.org/x/sys/windows/svc/eventlog/log.go index cb4080231..9069327a9 100644 --- a/third/golang.org/x/sys/windows/svc/eventlog/log.go +++ b/internal/thirdparty/golang.org/x/sys/windows/svc/eventlog/log.go @@ -12,7 +12,7 @@ import ( "errors" "syscall" - "github.com/gogf/gf/third/golang.org/x/sys/windows" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/windows" ) // Log provides access to the system log. diff --git a/third/golang.org/x/sys/windows/svc/eventlog/log_test.go b/internal/thirdparty/golang.org/x/sys/windows/svc/eventlog/log_test.go similarity index 92% rename from third/golang.org/x/sys/windows/svc/eventlog/log_test.go rename to internal/thirdparty/golang.org/x/sys/windows/svc/eventlog/log_test.go index 4f10b360f..b120ce2f4 100644 --- a/third/golang.org/x/sys/windows/svc/eventlog/log_test.go +++ b/internal/thirdparty/golang.org/x/sys/windows/svc/eventlog/log_test.go @@ -9,7 +9,7 @@ package eventlog_test import ( "testing" - "github.com/gogf/gf/third/golang.org/x/sys/windows/svc/eventlog" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/windows/svc/eventlog" ) func TestLog(t *testing.T) { diff --git a/third/golang.org/x/sys/windows/svc/example/beep.go b/internal/thirdparty/golang.org/x/sys/windows/svc/example/beep.go similarity index 100% rename from third/golang.org/x/sys/windows/svc/example/beep.go rename to internal/thirdparty/golang.org/x/sys/windows/svc/example/beep.go diff --git a/third/golang.org/x/sys/windows/svc/example/install.go b/internal/thirdparty/golang.org/x/sys/windows/svc/example/install.go similarity index 91% rename from third/golang.org/x/sys/windows/svc/example/install.go rename to internal/thirdparty/golang.org/x/sys/windows/svc/example/install.go index ade7ae74a..eb903fa2f 100644 --- a/third/golang.org/x/sys/windows/svc/example/install.go +++ b/internal/thirdparty/golang.org/x/sys/windows/svc/example/install.go @@ -11,8 +11,8 @@ import ( "os" "path/filepath" - "github.com/gogf/gf/third/golang.org/x/sys/windows/svc/eventlog" - "github.com/gogf/gf/third/golang.org/x/sys/windows/svc/mgr" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/windows/svc/eventlog" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/windows/svc/mgr" ) func exePath() (string, error) { diff --git a/third/golang.org/x/sys/windows/svc/example/main.go b/internal/thirdparty/golang.org/x/sys/windows/svc/example/main.go similarity index 96% rename from third/golang.org/x/sys/windows/svc/example/main.go rename to internal/thirdparty/golang.org/x/sys/windows/svc/example/main.go index bf335bd60..2576dc71e 100644 --- a/third/golang.org/x/sys/windows/svc/example/main.go +++ b/internal/thirdparty/golang.org/x/sys/windows/svc/example/main.go @@ -20,7 +20,7 @@ import ( "os" "strings" - "github.com/gogf/gf/third/golang.org/x/sys/windows/svc" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/windows/svc" ) func usage(errmsg string) { diff --git a/third/golang.org/x/sys/windows/svc/example/manage.go b/internal/thirdparty/golang.org/x/sys/windows/svc/example/manage.go similarity index 90% rename from third/golang.org/x/sys/windows/svc/example/manage.go rename to internal/thirdparty/golang.org/x/sys/windows/svc/example/manage.go index c51a39b53..1daba0701 100644 --- a/third/golang.org/x/sys/windows/svc/example/manage.go +++ b/internal/thirdparty/golang.org/x/sys/windows/svc/example/manage.go @@ -10,8 +10,8 @@ import ( "fmt" "time" - "github.com/gogf/gf/third/golang.org/x/sys/windows/svc" - "github.com/gogf/gf/third/golang.org/x/sys/windows/svc/mgr" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/windows/svc" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/windows/svc/mgr" ) func startService(name string) error { diff --git a/third/golang.org/x/sys/windows/svc/example/service.go b/internal/thirdparty/golang.org/x/sys/windows/svc/example/service.go similarity index 89% rename from third/golang.org/x/sys/windows/svc/example/service.go rename to internal/thirdparty/golang.org/x/sys/windows/svc/example/service.go index 6b12aa825..1e0e559e0 100644 --- a/third/golang.org/x/sys/windows/svc/example/service.go +++ b/internal/thirdparty/golang.org/x/sys/windows/svc/example/service.go @@ -11,9 +11,9 @@ import ( "strings" "time" - "github.com/gogf/gf/third/golang.org/x/sys/windows/svc" - "github.com/gogf/gf/third/golang.org/x/sys/windows/svc/debug" - "github.com/gogf/gf/third/golang.org/x/sys/windows/svc/eventlog" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/windows/svc" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/windows/svc/debug" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/windows/svc/eventlog" ) var elog debug.Log diff --git a/third/golang.org/x/sys/windows/svc/go12.c b/internal/thirdparty/golang.org/x/sys/windows/svc/go12.c similarity index 100% rename from third/golang.org/x/sys/windows/svc/go12.c rename to internal/thirdparty/golang.org/x/sys/windows/svc/go12.c diff --git a/third/golang.org/x/sys/windows/svc/go12.go b/internal/thirdparty/golang.org/x/sys/windows/svc/go12.go similarity index 100% rename from third/golang.org/x/sys/windows/svc/go12.go rename to internal/thirdparty/golang.org/x/sys/windows/svc/go12.go diff --git a/third/golang.org/x/sys/windows/svc/go13.go b/internal/thirdparty/golang.org/x/sys/windows/svc/go13.go similarity index 100% rename from third/golang.org/x/sys/windows/svc/go13.go rename to internal/thirdparty/golang.org/x/sys/windows/svc/go13.go diff --git a/third/golang.org/x/sys/windows/svc/mgr/config.go b/internal/thirdparty/golang.org/x/sys/windows/svc/mgr/config.go similarity index 98% rename from third/golang.org/x/sys/windows/svc/mgr/config.go rename to internal/thirdparty/golang.org/x/sys/windows/svc/mgr/config.go index b4aa835fa..76daea5d1 100644 --- a/third/golang.org/x/sys/windows/svc/mgr/config.go +++ b/internal/thirdparty/golang.org/x/sys/windows/svc/mgr/config.go @@ -11,7 +11,7 @@ import ( "unicode/utf16" "unsafe" - "github.com/gogf/gf/third/golang.org/x/sys/windows" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/windows" ) const ( diff --git a/third/golang.org/x/sys/windows/svc/mgr/mgr.go b/internal/thirdparty/golang.org/x/sys/windows/svc/mgr/mgr.go similarity index 98% rename from third/golang.org/x/sys/windows/svc/mgr/mgr.go rename to internal/thirdparty/golang.org/x/sys/windows/svc/mgr/mgr.go index 0aca655d0..e4b6f06d2 100644 --- a/third/golang.org/x/sys/windows/svc/mgr/mgr.go +++ b/internal/thirdparty/golang.org/x/sys/windows/svc/mgr/mgr.go @@ -16,7 +16,7 @@ import ( "unicode/utf16" "unsafe" - "github.com/gogf/gf/third/golang.org/x/sys/windows" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/windows" ) // Mgr is used to manage Windows service. diff --git a/third/golang.org/x/sys/windows/svc/mgr/mgr_test.go b/internal/thirdparty/golang.org/x/sys/windows/svc/mgr/mgr_test.go similarity index 98% rename from third/golang.org/x/sys/windows/svc/mgr/mgr_test.go rename to internal/thirdparty/golang.org/x/sys/windows/svc/mgr/mgr_test.go index a9e16fc06..3b61df59b 100644 --- a/third/golang.org/x/sys/windows/svc/mgr/mgr_test.go +++ b/internal/thirdparty/golang.org/x/sys/windows/svc/mgr/mgr_test.go @@ -15,7 +15,7 @@ import ( "testing" "time" - "github.com/gogf/gf/third/golang.org/x/sys/windows/svc/mgr" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/windows/svc/mgr" ) func TestOpenLanManServer(t *testing.T) { diff --git a/third/golang.org/x/sys/windows/svc/mgr/recovery.go b/internal/thirdparty/golang.org/x/sys/windows/svc/mgr/recovery.go similarity index 98% rename from third/golang.org/x/sys/windows/svc/mgr/recovery.go rename to internal/thirdparty/golang.org/x/sys/windows/svc/mgr/recovery.go index ab3eed464..83335c84a 100644 --- a/third/golang.org/x/sys/windows/svc/mgr/recovery.go +++ b/internal/thirdparty/golang.org/x/sys/windows/svc/mgr/recovery.go @@ -12,7 +12,7 @@ import ( "time" "unsafe" - "github.com/gogf/gf/third/golang.org/x/sys/windows" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/windows" ) const ( diff --git a/third/golang.org/x/sys/windows/svc/mgr/service.go b/internal/thirdparty/golang.org/x/sys/windows/svc/mgr/service.go similarity index 92% rename from third/golang.org/x/sys/windows/svc/mgr/service.go rename to internal/thirdparty/golang.org/x/sys/windows/svc/mgr/service.go index f14a6b7a7..c89e6fa23 100644 --- a/third/golang.org/x/sys/windows/svc/mgr/service.go +++ b/internal/thirdparty/golang.org/x/sys/windows/svc/mgr/service.go @@ -9,8 +9,8 @@ package mgr import ( "syscall" - "github.com/gogf/gf/third/golang.org/x/sys/windows" - "github.com/gogf/gf/third/golang.org/x/sys/windows/svc" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/windows" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/windows/svc" ) // TODO(brainman): Use EnumDependentServices to enumerate dependent services. diff --git a/third/golang.org/x/sys/windows/svc/security.go b/internal/thirdparty/golang.org/x/sys/windows/svc/security.go similarity index 95% rename from third/golang.org/x/sys/windows/svc/security.go rename to internal/thirdparty/golang.org/x/sys/windows/svc/security.go index af9fbdafa..d6b45de72 100644 --- a/third/golang.org/x/sys/windows/svc/security.go +++ b/internal/thirdparty/golang.org/x/sys/windows/svc/security.go @@ -9,7 +9,7 @@ package svc import ( "unsafe" - "github.com/gogf/gf/third/golang.org/x/sys/windows" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/windows" ) func allocSid(subAuth0 uint32) (*windows.SID, error) { diff --git a/third/golang.org/x/sys/windows/svc/service.go b/internal/thirdparty/golang.org/x/sys/windows/svc/service.go similarity index 99% rename from third/golang.org/x/sys/windows/svc/service.go rename to internal/thirdparty/golang.org/x/sys/windows/svc/service.go index 67a0a06c8..716a90380 100644 --- a/third/golang.org/x/sys/windows/svc/service.go +++ b/internal/thirdparty/golang.org/x/sys/windows/svc/service.go @@ -14,7 +14,7 @@ import ( "syscall" "unsafe" - "github.com/gogf/gf/third/golang.org/x/sys/windows" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/windows" ) // State describes service execution state (Stopped, Running and so on). diff --git a/third/golang.org/x/sys/windows/svc/svc_test.go b/internal/thirdparty/golang.org/x/sys/windows/svc/svc_test.go similarity index 92% rename from third/golang.org/x/sys/windows/svc/svc_test.go rename to internal/thirdparty/golang.org/x/sys/windows/svc/svc_test.go index 3f27358cf..3ff72e6ac 100644 --- a/third/golang.org/x/sys/windows/svc/svc_test.go +++ b/internal/thirdparty/golang.org/x/sys/windows/svc/svc_test.go @@ -17,8 +17,8 @@ import ( "testing" "time" - "github.com/gogf/gf/third/golang.org/x/sys/windows/svc" - "github.com/gogf/gf/third/golang.org/x/sys/windows/svc/mgr" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/windows/svc" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/windows/svc/mgr" ) func getState(t *testing.T, s *mgr.Service) svc.State { @@ -69,7 +69,7 @@ func TestExample(t *testing.T) { defer os.RemoveAll(dir) exepath := filepath.Join(dir, "a.exe") - o, err := exec.Command("go", "build", "-o", exepath, "github.com/gogf/gf/third/golang.org/x/sys/windows/svc/example").CombinedOutput() + o, err := exec.Command("go", "build", "-o", exepath, "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/windows/svc/example").CombinedOutput() if err != nil { t.Fatalf("failed to build service program: %v\n%v", err, string(o)) } diff --git a/third/golang.org/x/sys/windows/svc/sys_386.s b/internal/thirdparty/golang.org/x/sys/windows/svc/sys_386.s similarity index 100% rename from third/golang.org/x/sys/windows/svc/sys_386.s rename to internal/thirdparty/golang.org/x/sys/windows/svc/sys_386.s diff --git a/third/golang.org/x/sys/windows/svc/sys_amd64.s b/internal/thirdparty/golang.org/x/sys/windows/svc/sys_amd64.s similarity index 100% rename from third/golang.org/x/sys/windows/svc/sys_amd64.s rename to internal/thirdparty/golang.org/x/sys/windows/svc/sys_amd64.s diff --git a/third/golang.org/x/sys/windows/svc/sys_arm.s b/internal/thirdparty/golang.org/x/sys/windows/svc/sys_arm.s similarity index 100% rename from third/golang.org/x/sys/windows/svc/sys_arm.s rename to internal/thirdparty/golang.org/x/sys/windows/svc/sys_arm.s diff --git a/third/golang.org/x/sys/windows/syscall.go b/internal/thirdparty/golang.org/x/sys/windows/syscall.go similarity index 96% rename from third/golang.org/x/sys/windows/syscall.go rename to internal/thirdparty/golang.org/x/sys/windows/syscall.go index 4467b51f2..966ffb11c 100644 --- a/third/golang.org/x/sys/windows/syscall.go +++ b/internal/thirdparty/golang.org/x/sys/windows/syscall.go @@ -22,7 +22,7 @@ // These calls return err == nil to indicate success; otherwise // err represents an operating system error describing the failure and // holds a value of type syscall.Errno. -package windows // import "github.com/gogf/gf/third/golang.org/x/sys/windows" +package windows // import "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/windows" import ( "syscall" diff --git a/third/golang.org/x/sys/windows/syscall_test.go b/internal/thirdparty/golang.org/x/sys/windows/syscall_test.go similarity index 95% rename from third/golang.org/x/sys/windows/syscall_test.go rename to internal/thirdparty/golang.org/x/sys/windows/syscall_test.go index a244d8d42..cd7b9d517 100644 --- a/third/golang.org/x/sys/windows/syscall_test.go +++ b/internal/thirdparty/golang.org/x/sys/windows/syscall_test.go @@ -10,7 +10,7 @@ import ( "syscall" "testing" - "github.com/gogf/gf/third/golang.org/x/sys/windows" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/windows" ) func testSetGetenv(t *testing.T, key, value string) { diff --git a/third/golang.org/x/sys/windows/syscall_windows.go b/internal/thirdparty/golang.org/x/sys/windows/syscall_windows.go similarity index 100% rename from third/golang.org/x/sys/windows/syscall_windows.go rename to internal/thirdparty/golang.org/x/sys/windows/syscall_windows.go diff --git a/third/golang.org/x/sys/windows/syscall_windows_test.go b/internal/thirdparty/golang.org/x/sys/windows/syscall_windows_test.go similarity index 97% rename from third/golang.org/x/sys/windows/syscall_windows_test.go rename to internal/thirdparty/golang.org/x/sys/windows/syscall_windows_test.go index 6777fdc8a..65cdb0a22 100644 --- a/third/golang.org/x/sys/windows/syscall_windows_test.go +++ b/internal/thirdparty/golang.org/x/sys/windows/syscall_windows_test.go @@ -11,7 +11,7 @@ import ( "syscall" "testing" - "github.com/gogf/gf/third/golang.org/x/sys/windows" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/sys/windows" ) func TestWin32finddata(t *testing.T) { diff --git a/third/golang.org/x/sys/windows/types_windows.go b/internal/thirdparty/golang.org/x/sys/windows/types_windows.go similarity index 100% rename from third/golang.org/x/sys/windows/types_windows.go rename to internal/thirdparty/golang.org/x/sys/windows/types_windows.go diff --git a/third/golang.org/x/sys/windows/types_windows_386.go b/internal/thirdparty/golang.org/x/sys/windows/types_windows_386.go similarity index 100% rename from third/golang.org/x/sys/windows/types_windows_386.go rename to internal/thirdparty/golang.org/x/sys/windows/types_windows_386.go diff --git a/third/golang.org/x/sys/windows/types_windows_amd64.go b/internal/thirdparty/golang.org/x/sys/windows/types_windows_amd64.go similarity index 100% rename from third/golang.org/x/sys/windows/types_windows_amd64.go rename to internal/thirdparty/golang.org/x/sys/windows/types_windows_amd64.go diff --git a/third/golang.org/x/sys/windows/types_windows_arm.go b/internal/thirdparty/golang.org/x/sys/windows/types_windows_arm.go similarity index 100% rename from third/golang.org/x/sys/windows/types_windows_arm.go rename to internal/thirdparty/golang.org/x/sys/windows/types_windows_arm.go diff --git a/third/golang.org/x/sys/windows/zsyscall_windows.go b/internal/thirdparty/golang.org/x/sys/windows/zsyscall_windows.go similarity index 100% rename from third/golang.org/x/sys/windows/zsyscall_windows.go rename to internal/thirdparty/golang.org/x/sys/windows/zsyscall_windows.go diff --git a/third/golang.org/x/text/encoding/charmap/charmap.go b/internal/thirdparty/golang.org/x/text/encoding/charmap/charmap.go similarity index 93% rename from third/golang.org/x/text/encoding/charmap/charmap.go rename to internal/thirdparty/golang.org/x/text/encoding/charmap/charmap.go index 7fc87c8f8..3aed87b5a 100644 --- a/third/golang.org/x/text/encoding/charmap/charmap.go +++ b/internal/thirdparty/golang.org/x/text/encoding/charmap/charmap.go @@ -6,15 +6,15 @@ // Package charmap provides simple character encodings such as IBM Code Page 437 // and Windows 1252. -package charmap // import "github.com/gogf/gf/third/golang.org/x/text/encoding/charmap" +package charmap // import "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/charmap" import ( "unicode/utf8" - "github.com/gogf/gf/third/golang.org/x/text/encoding" - "github.com/gogf/gf/third/golang.org/x/text/encoding/internal" - "github.com/gogf/gf/third/golang.org/x/text/encoding/internal/identifier" - "github.com/gogf/gf/third/golang.org/x/text/transform" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/internal" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/internal/identifier" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/transform" ) // These encodings vary only in the way clients should interpret them. Their diff --git a/third/golang.org/x/text/encoding/charmap/charmap_test.go b/internal/thirdparty/golang.org/x/text/encoding/charmap/charmap_test.go similarity index 95% rename from third/golang.org/x/text/encoding/charmap/charmap_test.go rename to internal/thirdparty/golang.org/x/text/encoding/charmap/charmap_test.go index 4e5fdd88a..669fff10a 100644 --- a/third/golang.org/x/text/encoding/charmap/charmap_test.go +++ b/internal/thirdparty/golang.org/x/text/encoding/charmap/charmap_test.go @@ -7,10 +7,10 @@ package charmap import ( "testing" - "github.com/gogf/gf/third/golang.org/x/text/encoding" - "github.com/gogf/gf/third/golang.org/x/text/encoding/internal" - "github.com/gogf/gf/third/golang.org/x/text/encoding/internal/enctest" - "github.com/gogf/gf/third/golang.org/x/text/transform" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/internal" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/internal/enctest" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/transform" ) func dec(e encoding.Encoding) (dir string, t transform.Transformer, err error) { diff --git a/third/golang.org/x/text/encoding/charmap/maketables.go b/internal/thirdparty/golang.org/x/text/encoding/charmap/maketables.go similarity index 97% rename from third/golang.org/x/text/encoding/charmap/maketables.go rename to internal/thirdparty/golang.org/x/text/encoding/charmap/maketables.go index 9e91552f1..0e1264531 100644 --- a/third/golang.org/x/text/encoding/charmap/maketables.go +++ b/internal/thirdparty/golang.org/x/text/encoding/charmap/maketables.go @@ -15,8 +15,8 @@ import ( "strings" "unicode/utf8" - "github.com/gogf/gf/third/golang.org/x/text/encoding" - "github.com/gogf/gf/third/golang.org/x/text/internal/gen" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/gen" ) const ascii = "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f" + @@ -467,8 +467,8 @@ func main() { printf := func(s string, a ...interface{}) { fmt.Fprintf(w, s, a...) } printf("import (\n") - printf("\t\"github.com/gogf/gf/third/golang.org/x/text/encoding\"\n") - printf("\t\"github.com/gogf/gf/third/golang.org/x/text/encoding/internal/identifier\"\n") + printf("\t\"github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding\"\n") + printf("\t\"github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/internal/identifier\"\n") printf(")\n\n") for _, e := range encodings { varNames := strings.Split(e.varName, ",") diff --git a/third/golang.org/x/text/encoding/charmap/tables.go b/internal/thirdparty/golang.org/x/text/encoding/charmap/tables.go similarity index 99% rename from third/golang.org/x/text/encoding/charmap/tables.go rename to internal/thirdparty/golang.org/x/text/encoding/charmap/tables.go index ebaeb928a..1cdffcf4e 100644 --- a/third/golang.org/x/text/encoding/charmap/tables.go +++ b/internal/thirdparty/golang.org/x/text/encoding/charmap/tables.go @@ -3,8 +3,8 @@ package charmap import ( - "github.com/gogf/gf/third/golang.org/x/text/encoding" - "github.com/gogf/gf/third/golang.org/x/text/encoding/internal/identifier" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/internal/identifier" ) // CodePage037 is the IBM Code Page 037 encoding. diff --git a/third/golang.org/x/text/encoding/encoding.go b/internal/thirdparty/golang.org/x/text/encoding/encoding.go similarity index 97% rename from third/golang.org/x/text/encoding/encoding.go rename to internal/thirdparty/golang.org/x/text/encoding/encoding.go index 38b9d80cf..a7ed66678 100644 --- a/third/golang.org/x/text/encoding/encoding.go +++ b/internal/thirdparty/golang.org/x/text/encoding/encoding.go @@ -8,7 +8,7 @@ // Encoding implementations are provided in other packages, such as // github.com/gogf/gf/third/golang.org/x/text/encoding/charmap and // github.com/gogf/gf/third/golang.org/x/text/encoding/japanese. -package encoding // import "github.com/gogf/gf/third/golang.org/x/text/encoding" +package encoding // import "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding" import ( "errors" @@ -16,8 +16,8 @@ import ( "strconv" "unicode/utf8" - "github.com/gogf/gf/third/golang.org/x/text/encoding/internal/identifier" - "github.com/gogf/gf/third/golang.org/x/text/transform" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/internal/identifier" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/transform" ) // TODO: diff --git a/third/golang.org/x/text/encoding/encoding_test.go b/internal/thirdparty/golang.org/x/text/encoding/encoding_test.go similarity index 96% rename from third/golang.org/x/text/encoding/encoding_test.go rename to internal/thirdparty/golang.org/x/text/encoding/encoding_test.go index 4d73f9fec..19c87e5c2 100644 --- a/third/golang.org/x/text/encoding/encoding_test.go +++ b/internal/thirdparty/golang.org/x/text/encoding/encoding_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" - "github.com/gogf/gf/third/golang.org/x/text/encoding" - "github.com/gogf/gf/third/golang.org/x/text/encoding/charmap" - "github.com/gogf/gf/third/golang.org/x/text/transform" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/charmap" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/transform" ) func TestEncodeInvalidUTF8(t *testing.T) { diff --git a/third/golang.org/x/text/encoding/example_test.go b/internal/thirdparty/golang.org/x/text/encoding/example_test.go similarity index 78% rename from third/golang.org/x/text/encoding/example_test.go rename to internal/thirdparty/golang.org/x/text/encoding/example_test.go index 2ef2613f4..4bd440d54 100644 --- a/third/golang.org/x/text/encoding/example_test.go +++ b/internal/thirdparty/golang.org/x/text/encoding/example_test.go @@ -10,10 +10,10 @@ import ( "os" "strings" - "github.com/gogf/gf/third/golang.org/x/text/encoding" - "github.com/gogf/gf/third/golang.org/x/text/encoding/charmap" - "github.com/gogf/gf/third/golang.org/x/text/encoding/unicode" - "github.com/gogf/gf/third/golang.org/x/text/transform" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/charmap" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/unicode" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/transform" ) func ExampleDecodeWindows1252() { diff --git a/third/golang.org/x/text/encoding/ianaindex/example_test.go b/internal/thirdparty/golang.org/x/text/encoding/ianaindex/example_test.go similarity index 78% rename from third/golang.org/x/text/encoding/ianaindex/example_test.go rename to internal/thirdparty/golang.org/x/text/encoding/ianaindex/example_test.go index 437228c6b..dec4d8e38 100644 --- a/third/golang.org/x/text/encoding/ianaindex/example_test.go +++ b/internal/thirdparty/golang.org/x/text/encoding/ianaindex/example_test.go @@ -7,8 +7,8 @@ package ianaindex_test import ( "fmt" - "github.com/gogf/gf/third/golang.org/x/text/encoding/charmap" - "github.com/gogf/gf/third/golang.org/x/text/encoding/ianaindex" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/charmap" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/ianaindex" ) func ExampleIndex() { diff --git a/third/golang.org/x/text/encoding/ianaindex/gen.go b/internal/thirdparty/golang.org/x/text/encoding/ianaindex/gen.go similarity index 94% rename from third/golang.org/x/text/encoding/ianaindex/gen.go rename to internal/thirdparty/golang.org/x/text/encoding/ianaindex/gen.go index 2c84c4be1..d387968ad 100644 --- a/third/golang.org/x/text/encoding/ianaindex/gen.go +++ b/internal/thirdparty/golang.org/x/text/encoding/ianaindex/gen.go @@ -15,8 +15,8 @@ import ( "strconv" "strings" - "github.com/gogf/gf/third/golang.org/x/text/encoding/internal/identifier" - "github.com/gogf/gf/third/golang.org/x/text/internal/gen" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/internal/identifier" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/gen" ) type registry struct { @@ -74,7 +74,7 @@ func main() { w := gen.NewCodeWriter() - fmt.Fprintln(w, `import "github.com/gogf/gf/third/golang.org/x/text/encoding/internal/identifier"`) + fmt.Fprintln(w, `import "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/internal/identifier"`) writeIndex(w, x) diff --git a/third/golang.org/x/text/encoding/ianaindex/ianaindex.go b/internal/thirdparty/golang.org/x/text/encoding/ianaindex/ianaindex.go similarity index 90% rename from third/golang.org/x/text/encoding/ianaindex/ianaindex.go rename to internal/thirdparty/golang.org/x/text/encoding/ianaindex/ianaindex.go index ae6ee005c..117345bfc 100644 --- a/third/golang.org/x/text/encoding/ianaindex/ianaindex.go +++ b/internal/thirdparty/golang.org/x/text/encoding/ianaindex/ianaindex.go @@ -16,14 +16,14 @@ import ( "sort" "strings" - "github.com/gogf/gf/third/golang.org/x/text/encoding" - "github.com/gogf/gf/third/golang.org/x/text/encoding/charmap" - "github.com/gogf/gf/third/golang.org/x/text/encoding/internal/identifier" - "github.com/gogf/gf/third/golang.org/x/text/encoding/japanese" - "github.com/gogf/gf/third/golang.org/x/text/encoding/korean" - "github.com/gogf/gf/third/golang.org/x/text/encoding/simplifiedchinese" - "github.com/gogf/gf/third/golang.org/x/text/encoding/traditionalchinese" - "github.com/gogf/gf/third/golang.org/x/text/encoding/unicode" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/charmap" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/internal/identifier" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/japanese" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/korean" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/simplifiedchinese" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/traditionalchinese" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/unicode" ) // TODO: remove the "Status... incomplete" in the package doc comment. diff --git a/third/golang.org/x/text/encoding/ianaindex/ianaindex_test.go b/internal/thirdparty/golang.org/x/text/encoding/ianaindex/ianaindex_test.go similarity index 87% rename from third/golang.org/x/text/encoding/ianaindex/ianaindex_test.go rename to internal/thirdparty/golang.org/x/text/encoding/ianaindex/ianaindex_test.go index d39c69e92..13ba146de 100644 --- a/third/golang.org/x/text/encoding/ianaindex/ianaindex_test.go +++ b/internal/thirdparty/golang.org/x/text/encoding/ianaindex/ianaindex_test.go @@ -7,14 +7,14 @@ package ianaindex import ( "testing" - "github.com/gogf/gf/third/golang.org/x/text/encoding" - "github.com/gogf/gf/third/golang.org/x/text/encoding/charmap" - "github.com/gogf/gf/third/golang.org/x/text/encoding/internal/identifier" - "github.com/gogf/gf/third/golang.org/x/text/encoding/japanese" - "github.com/gogf/gf/third/golang.org/x/text/encoding/korean" - "github.com/gogf/gf/third/golang.org/x/text/encoding/simplifiedchinese" - "github.com/gogf/gf/third/golang.org/x/text/encoding/traditionalchinese" - "github.com/gogf/gf/third/golang.org/x/text/encoding/unicode" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/charmap" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/internal/identifier" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/japanese" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/korean" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/simplifiedchinese" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/traditionalchinese" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/unicode" ) var All = [][]encoding.Encoding{ diff --git a/third/golang.org/x/text/encoding/ianaindex/tables.go b/internal/thirdparty/golang.org/x/text/encoding/ianaindex/tables.go similarity index 99% rename from third/golang.org/x/text/encoding/ianaindex/tables.go rename to internal/thirdparty/golang.org/x/text/encoding/ianaindex/tables.go index d3dc667c6..856c09573 100644 --- a/third/golang.org/x/text/encoding/ianaindex/tables.go +++ b/internal/thirdparty/golang.org/x/text/encoding/ianaindex/tables.go @@ -2,7 +2,7 @@ package ianaindex -import "github.com/gogf/gf/third/golang.org/x/text/encoding/internal/identifier" +import "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/internal/identifier" const ( enc3 = iota diff --git a/third/golang.org/x/text/encoding/internal/enctest/enctest.go b/internal/thirdparty/golang.org/x/text/encoding/internal/enctest/enctest.go similarity index 95% rename from third/golang.org/x/text/encoding/internal/enctest/enctest.go rename to internal/thirdparty/golang.org/x/text/encoding/internal/enctest/enctest.go index 88968cb37..60db351d7 100644 --- a/third/golang.org/x/text/encoding/internal/enctest/enctest.go +++ b/internal/thirdparty/golang.org/x/text/encoding/internal/enctest/enctest.go @@ -12,9 +12,9 @@ import ( "strings" "testing" - "github.com/gogf/gf/third/golang.org/x/text/encoding" - "github.com/gogf/gf/third/golang.org/x/text/encoding/internal/identifier" - "github.com/gogf/gf/third/golang.org/x/text/transform" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/internal/identifier" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/transform" ) // Encoder or Decoder diff --git a/third/golang.org/x/text/encoding/internal/identifier/gen.go b/internal/thirdparty/golang.org/x/text/encoding/internal/identifier/gen.go similarity index 97% rename from third/golang.org/x/text/encoding/internal/identifier/gen.go rename to internal/thirdparty/golang.org/x/text/encoding/internal/identifier/gen.go index 9bf85d730..11096d309 100644 --- a/third/golang.org/x/text/encoding/internal/identifier/gen.go +++ b/internal/thirdparty/golang.org/x/text/encoding/internal/identifier/gen.go @@ -14,7 +14,7 @@ import ( "log" "strings" - "github.com/gogf/gf/third/golang.org/x/text/internal/gen" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/gen" ) type registry struct { diff --git a/third/golang.org/x/text/encoding/internal/identifier/identifier.go b/internal/thirdparty/golang.org/x/text/encoding/internal/identifier/identifier.go similarity index 100% rename from third/golang.org/x/text/encoding/internal/identifier/identifier.go rename to internal/thirdparty/golang.org/x/text/encoding/internal/identifier/identifier.go diff --git a/third/golang.org/x/text/encoding/internal/identifier/mib.go b/internal/thirdparty/golang.org/x/text/encoding/internal/identifier/mib.go similarity index 100% rename from third/golang.org/x/text/encoding/internal/identifier/mib.go rename to internal/thirdparty/golang.org/x/text/encoding/internal/identifier/mib.go diff --git a/third/golang.org/x/text/encoding/internal/internal.go b/internal/thirdparty/golang.org/x/text/encoding/internal/internal.go similarity index 89% rename from third/golang.org/x/text/encoding/internal/internal.go rename to internal/thirdparty/golang.org/x/text/encoding/internal/internal.go index 5178c2668..096f13f2e 100644 --- a/third/golang.org/x/text/encoding/internal/internal.go +++ b/internal/thirdparty/golang.org/x/text/encoding/internal/internal.go @@ -6,9 +6,9 @@ package internal import ( - "github.com/gogf/gf/third/golang.org/x/text/encoding" - "github.com/gogf/gf/third/golang.org/x/text/encoding/internal/identifier" - "github.com/gogf/gf/third/golang.org/x/text/transform" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/internal/identifier" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/transform" ) // Encoding is an implementation of the Encoding interface that adds the String diff --git a/third/golang.org/x/text/encoding/japanese/all.go b/internal/thirdparty/golang.org/x/text/encoding/japanese/all.go similarity index 81% rename from third/golang.org/x/text/encoding/japanese/all.go rename to internal/thirdparty/golang.org/x/text/encoding/japanese/all.go index fe3406abb..6b074d754 100644 --- a/third/golang.org/x/text/encoding/japanese/all.go +++ b/internal/thirdparty/golang.org/x/text/encoding/japanese/all.go @@ -5,7 +5,7 @@ package japanese import ( - "github.com/gogf/gf/third/golang.org/x/text/encoding" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding" ) // All is a list of all defined encodings in this package. diff --git a/third/golang.org/x/text/encoding/japanese/all_test.go b/internal/thirdparty/golang.org/x/text/encoding/japanese/all_test.go similarity index 96% rename from third/golang.org/x/text/encoding/japanese/all_test.go rename to internal/thirdparty/golang.org/x/text/encoding/japanese/all_test.go index d140e0011..16a13aaef 100644 --- a/third/golang.org/x/text/encoding/japanese/all_test.go +++ b/internal/thirdparty/golang.org/x/text/encoding/japanese/all_test.go @@ -9,10 +9,10 @@ import ( "strings" "testing" - "github.com/gogf/gf/third/golang.org/x/text/encoding" - "github.com/gogf/gf/third/golang.org/x/text/encoding/internal" - "github.com/gogf/gf/third/golang.org/x/text/encoding/internal/enctest" - "github.com/gogf/gf/third/golang.org/x/text/transform" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/internal" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/internal/enctest" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/transform" ) func dec(e encoding.Encoding) (dir string, t transform.Transformer, err error) { diff --git a/third/golang.org/x/text/encoding/japanese/eucjp.go b/internal/thirdparty/golang.org/x/text/encoding/japanese/eucjp.go similarity index 94% rename from third/golang.org/x/text/encoding/japanese/eucjp.go rename to internal/thirdparty/golang.org/x/text/encoding/japanese/eucjp.go index 96603675f..f577bce42 100644 --- a/third/golang.org/x/text/encoding/japanese/eucjp.go +++ b/internal/thirdparty/golang.org/x/text/encoding/japanese/eucjp.go @@ -7,10 +7,10 @@ package japanese import ( "unicode/utf8" - "github.com/gogf/gf/third/golang.org/x/text/encoding" - "github.com/gogf/gf/third/golang.org/x/text/encoding/internal" - "github.com/gogf/gf/third/golang.org/x/text/encoding/internal/identifier" - "github.com/gogf/gf/third/golang.org/x/text/transform" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/internal" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/internal/identifier" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/transform" ) // EUCJP is the EUC-JP encoding. diff --git a/third/golang.org/x/text/encoding/japanese/iso2022jp.go b/internal/thirdparty/golang.org/x/text/encoding/japanese/iso2022jp.go similarity index 95% rename from third/golang.org/x/text/encoding/japanese/iso2022jp.go rename to internal/thirdparty/golang.org/x/text/encoding/japanese/iso2022jp.go index a36692c7d..513716f42 100644 --- a/third/golang.org/x/text/encoding/japanese/iso2022jp.go +++ b/internal/thirdparty/golang.org/x/text/encoding/japanese/iso2022jp.go @@ -7,10 +7,10 @@ package japanese import ( "unicode/utf8" - "github.com/gogf/gf/third/golang.org/x/text/encoding" - "github.com/gogf/gf/third/golang.org/x/text/encoding/internal" - "github.com/gogf/gf/third/golang.org/x/text/encoding/internal/identifier" - "github.com/gogf/gf/third/golang.org/x/text/transform" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/internal" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/internal/identifier" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/transform" ) // ISO2022JP is the ISO-2022-JP encoding. diff --git a/third/golang.org/x/text/encoding/japanese/maketables.go b/internal/thirdparty/golang.org/x/text/encoding/japanese/maketables.go similarity index 97% rename from third/golang.org/x/text/encoding/japanese/maketables.go rename to internal/thirdparty/golang.org/x/text/encoding/japanese/maketables.go index 4e622862d..510f07e59 100644 --- a/third/golang.org/x/text/encoding/japanese/maketables.go +++ b/internal/thirdparty/golang.org/x/text/encoding/japanese/maketables.go @@ -29,7 +29,7 @@ type entry struct { func main() { fmt.Printf("// generated by go run maketables.go; DO NOT EDIT\n\n") fmt.Printf("// Package japanese provides Japanese encodings such as EUC-JP and Shift JIS.\n") - fmt.Printf(`package japanese // import "github.com/gogf/gf/third/golang.org/x/text/encoding/japanese"` + "\n\n") + fmt.Printf(`package japanese // import "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/japanese"` + "\n\n") reverse := [65536]entry{} for i := range reverse { diff --git a/third/golang.org/x/text/encoding/japanese/shiftjis.go b/internal/thirdparty/golang.org/x/text/encoding/japanese/shiftjis.go similarity index 93% rename from third/golang.org/x/text/encoding/japanese/shiftjis.go rename to internal/thirdparty/golang.org/x/text/encoding/japanese/shiftjis.go index 4f0e21b42..c705df82b 100644 --- a/third/golang.org/x/text/encoding/japanese/shiftjis.go +++ b/internal/thirdparty/golang.org/x/text/encoding/japanese/shiftjis.go @@ -7,10 +7,10 @@ package japanese import ( "unicode/utf8" - "github.com/gogf/gf/third/golang.org/x/text/encoding" - "github.com/gogf/gf/third/golang.org/x/text/encoding/internal" - "github.com/gogf/gf/third/golang.org/x/text/encoding/internal/identifier" - "github.com/gogf/gf/third/golang.org/x/text/transform" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/internal" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/internal/identifier" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/transform" ) // ShiftJIS is the Shift JIS encoding, also known as Code Page 932 and diff --git a/third/golang.org/x/text/encoding/japanese/tables.go b/internal/thirdparty/golang.org/x/text/encoding/japanese/tables.go similarity index 99% rename from third/golang.org/x/text/encoding/japanese/tables.go rename to internal/thirdparty/golang.org/x/text/encoding/japanese/tables.go index 6d5d631a2..6d37698c0 100644 --- a/third/golang.org/x/text/encoding/japanese/tables.go +++ b/internal/thirdparty/golang.org/x/text/encoding/japanese/tables.go @@ -1,7 +1,7 @@ // generated by go run maketables.go; DO NOT EDIT // Package japanese provides Japanese encodings such as EUC-JP and Shift JIS. -package japanese // import "github.com/gogf/gf/third/golang.org/x/text/encoding/japanese" +package japanese // import "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/japanese" // jis0208Decode is the decoding table from JIS 0208 code to Unicode. // It is defined at http://encoding.spec.whatwg.org/index-jis0208.txt diff --git a/third/golang.org/x/text/encoding/korean/all_test.go b/internal/thirdparty/golang.org/x/text/encoding/korean/all_test.go similarity index 89% rename from third/golang.org/x/text/encoding/korean/all_test.go rename to internal/thirdparty/golang.org/x/text/encoding/korean/all_test.go index 441c3e042..c6a075c51 100644 --- a/third/golang.org/x/text/encoding/korean/all_test.go +++ b/internal/thirdparty/golang.org/x/text/encoding/korean/all_test.go @@ -8,10 +8,10 @@ import ( "strings" "testing" - "github.com/gogf/gf/third/golang.org/x/text/encoding" - "github.com/gogf/gf/third/golang.org/x/text/encoding/internal" - "github.com/gogf/gf/third/golang.org/x/text/encoding/internal/enctest" - "github.com/gogf/gf/third/golang.org/x/text/transform" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/internal" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/internal/enctest" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/transform" ) func dec(e encoding.Encoding) (dir string, t transform.Transformer, err error) { diff --git a/third/golang.org/x/text/encoding/korean/euckr.go b/internal/thirdparty/golang.org/x/text/encoding/korean/euckr.go similarity index 92% rename from third/golang.org/x/text/encoding/korean/euckr.go rename to internal/thirdparty/golang.org/x/text/encoding/korean/euckr.go index 8cb6117c6..c67ca5783 100644 --- a/third/golang.org/x/text/encoding/korean/euckr.go +++ b/internal/thirdparty/golang.org/x/text/encoding/korean/euckr.go @@ -7,10 +7,10 @@ package korean import ( "unicode/utf8" - "github.com/gogf/gf/third/golang.org/x/text/encoding" - "github.com/gogf/gf/third/golang.org/x/text/encoding/internal" - "github.com/gogf/gf/third/golang.org/x/text/encoding/internal/identifier" - "github.com/gogf/gf/third/golang.org/x/text/transform" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/internal" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/internal/identifier" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/transform" ) // All is a list of all defined encodings in this package. diff --git a/third/golang.org/x/text/encoding/korean/maketables.go b/internal/thirdparty/golang.org/x/text/encoding/korean/maketables.go similarity index 96% rename from third/golang.org/x/text/encoding/korean/maketables.go rename to internal/thirdparty/golang.org/x/text/encoding/korean/maketables.go index 87452cbce..154d64ed4 100644 --- a/third/golang.org/x/text/encoding/korean/maketables.go +++ b/internal/thirdparty/golang.org/x/text/encoding/korean/maketables.go @@ -21,7 +21,7 @@ import ( func main() { fmt.Printf("// generated by go run maketables.go; DO NOT EDIT\n\n") fmt.Printf("// Package korean provides Korean encodings such as EUC-KR.\n") - fmt.Printf(`package korean // import "github.com/gogf/gf/third/golang.org/x/text/encoding/korean"` + "\n\n") + fmt.Printf(`package korean // import "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/korean"` + "\n\n") res, err := http.Get("http://encoding.spec.whatwg.org/index-euc-kr.txt") if err != nil { diff --git a/third/golang.org/x/text/encoding/korean/tables.go b/internal/thirdparty/golang.org/x/text/encoding/korean/tables.go similarity index 99% rename from third/golang.org/x/text/encoding/korean/tables.go rename to internal/thirdparty/golang.org/x/text/encoding/korean/tables.go index 3671e16a1..6c3794d92 100644 --- a/third/golang.org/x/text/encoding/korean/tables.go +++ b/internal/thirdparty/golang.org/x/text/encoding/korean/tables.go @@ -1,7 +1,7 @@ // generated by go run maketables.go; DO NOT EDIT // Package korean provides Korean encodings such as EUC-KR. -package korean // import "github.com/gogf/gf/third/golang.org/x/text/encoding/korean" +package korean // import "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/korean" // decode is the decoding table from EUC-KR code to Unicode. // It is defined at http://encoding.spec.whatwg.org/index-euc-kr.txt diff --git a/third/golang.org/x/text/encoding/simplifiedchinese/all.go b/internal/thirdparty/golang.org/x/text/encoding/simplifiedchinese/all.go similarity index 81% rename from third/golang.org/x/text/encoding/simplifiedchinese/all.go rename to internal/thirdparty/golang.org/x/text/encoding/simplifiedchinese/all.go index 41812d546..ef4d05634 100644 --- a/third/golang.org/x/text/encoding/simplifiedchinese/all.go +++ b/internal/thirdparty/golang.org/x/text/encoding/simplifiedchinese/all.go @@ -5,7 +5,7 @@ package simplifiedchinese import ( - "github.com/gogf/gf/third/golang.org/x/text/encoding" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding" ) // All is a list of all defined encodings in this package. diff --git a/third/golang.org/x/text/encoding/simplifiedchinese/all_test.go b/internal/thirdparty/golang.org/x/text/encoding/simplifiedchinese/all_test.go similarity index 93% rename from third/golang.org/x/text/encoding/simplifiedchinese/all_test.go rename to internal/thirdparty/golang.org/x/text/encoding/simplifiedchinese/all_test.go index fbaf4f513..1f9d19b23 100644 --- a/third/golang.org/x/text/encoding/simplifiedchinese/all_test.go +++ b/internal/thirdparty/golang.org/x/text/encoding/simplifiedchinese/all_test.go @@ -8,10 +8,10 @@ import ( "strings" "testing" - "github.com/gogf/gf/third/golang.org/x/text/encoding" - "github.com/gogf/gf/third/golang.org/x/text/encoding/internal" - "github.com/gogf/gf/third/golang.org/x/text/encoding/internal/enctest" - "github.com/gogf/gf/third/golang.org/x/text/transform" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/internal" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/internal/enctest" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/transform" ) func dec(e encoding.Encoding) (dir string, t transform.Transformer, err error) { diff --git a/third/golang.org/x/text/encoding/simplifiedchinese/gbk.go b/internal/thirdparty/golang.org/x/text/encoding/simplifiedchinese/gbk.go similarity index 94% rename from third/golang.org/x/text/encoding/simplifiedchinese/gbk.go rename to internal/thirdparty/golang.org/x/text/encoding/simplifiedchinese/gbk.go index 44183545f..ad11f98c2 100644 --- a/third/golang.org/x/text/encoding/simplifiedchinese/gbk.go +++ b/internal/thirdparty/golang.org/x/text/encoding/simplifiedchinese/gbk.go @@ -7,10 +7,10 @@ package simplifiedchinese import ( "unicode/utf8" - "github.com/gogf/gf/third/golang.org/x/text/encoding" - "github.com/gogf/gf/third/golang.org/x/text/encoding/internal" - "github.com/gogf/gf/third/golang.org/x/text/encoding/internal/identifier" - "github.com/gogf/gf/third/golang.org/x/text/transform" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/internal" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/internal/identifier" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/transform" ) var ( diff --git a/third/golang.org/x/text/encoding/simplifiedchinese/hzgb2312.go b/internal/thirdparty/golang.org/x/text/encoding/simplifiedchinese/hzgb2312.go similarity index 94% rename from third/golang.org/x/text/encoding/simplifiedchinese/hzgb2312.go rename to internal/thirdparty/golang.org/x/text/encoding/simplifiedchinese/hzgb2312.go index e39f18af9..2574d49ad 100644 --- a/third/golang.org/x/text/encoding/simplifiedchinese/hzgb2312.go +++ b/internal/thirdparty/golang.org/x/text/encoding/simplifiedchinese/hzgb2312.go @@ -7,10 +7,10 @@ package simplifiedchinese import ( "unicode/utf8" - "github.com/gogf/gf/third/golang.org/x/text/encoding" - "github.com/gogf/gf/third/golang.org/x/text/encoding/internal" - "github.com/gogf/gf/third/golang.org/x/text/encoding/internal/identifier" - "github.com/gogf/gf/third/golang.org/x/text/transform" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/internal" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/internal/identifier" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/transform" ) // HZGB2312 is the HZ-GB2312 encoding. diff --git a/third/golang.org/x/text/encoding/simplifiedchinese/maketables.go b/internal/thirdparty/golang.org/x/text/encoding/simplifiedchinese/maketables.go similarity index 98% rename from third/golang.org/x/text/encoding/simplifiedchinese/maketables.go rename to internal/thirdparty/golang.org/x/text/encoding/simplifiedchinese/maketables.go index 98ecc6b31..d22442a1e 100644 --- a/third/golang.org/x/text/encoding/simplifiedchinese/maketables.go +++ b/internal/thirdparty/golang.org/x/text/encoding/simplifiedchinese/maketables.go @@ -21,7 +21,7 @@ import ( func main() { fmt.Printf("// generated by go run maketables.go; DO NOT EDIT\n\n") fmt.Printf("// Package simplifiedchinese provides Simplified Chinese encodings such as GBK.\n") - fmt.Printf(`package simplifiedchinese // import "github.com/gogf/gf/third/golang.org/x/text/encoding/simplifiedchinese"` + "\n\n") + fmt.Printf(`package simplifiedchinese // import "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/simplifiedchinese"` + "\n\n") printGB18030() printGBK() diff --git a/third/golang.org/x/text/encoding/simplifiedchinese/tables.go b/internal/thirdparty/golang.org/x/text/encoding/simplifiedchinese/tables.go similarity index 99% rename from third/golang.org/x/text/encoding/simplifiedchinese/tables.go rename to internal/thirdparty/golang.org/x/text/encoding/simplifiedchinese/tables.go index c3b4b59d4..3aa214ff6 100644 --- a/third/golang.org/x/text/encoding/simplifiedchinese/tables.go +++ b/internal/thirdparty/golang.org/x/text/encoding/simplifiedchinese/tables.go @@ -1,7 +1,7 @@ // generated by go run maketables.go; DO NOT EDIT // Package simplifiedchinese provides Simplified Chinese encodings such as GBK. -package simplifiedchinese // import "github.com/gogf/gf/third/golang.org/x/text/encoding/simplifiedchinese" +package simplifiedchinese // import "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/simplifiedchinese" // gb18030 is the table from http://encoding.spec.whatwg.org/index-gb18030.txt var gb18030 = [...][2]uint16{ diff --git a/third/golang.org/x/text/encoding/traditionalchinese/all_test.go b/internal/thirdparty/golang.org/x/text/encoding/traditionalchinese/all_test.go similarity index 91% rename from third/golang.org/x/text/encoding/traditionalchinese/all_test.go rename to internal/thirdparty/golang.org/x/text/encoding/traditionalchinese/all_test.go index f92409f3b..ab72d7f57 100644 --- a/third/golang.org/x/text/encoding/traditionalchinese/all_test.go +++ b/internal/thirdparty/golang.org/x/text/encoding/traditionalchinese/all_test.go @@ -10,10 +10,10 @@ import ( "strings" "testing" - "github.com/gogf/gf/third/golang.org/x/text/encoding" - "github.com/gogf/gf/third/golang.org/x/text/encoding/internal" - "github.com/gogf/gf/third/golang.org/x/text/encoding/internal/enctest" - "github.com/gogf/gf/third/golang.org/x/text/transform" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/internal" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/internal/enctest" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/transform" ) func dec(e encoding.Encoding) (dir string, t transform.Transformer, err error) { diff --git a/third/golang.org/x/text/encoding/traditionalchinese/big5.go b/internal/thirdparty/golang.org/x/text/encoding/traditionalchinese/big5.go similarity index 93% rename from third/golang.org/x/text/encoding/traditionalchinese/big5.go rename to internal/thirdparty/golang.org/x/text/encoding/traditionalchinese/big5.go index 4391486e0..f19105d8a 100644 --- a/third/golang.org/x/text/encoding/traditionalchinese/big5.go +++ b/internal/thirdparty/golang.org/x/text/encoding/traditionalchinese/big5.go @@ -7,10 +7,10 @@ package traditionalchinese import ( "unicode/utf8" - "github.com/gogf/gf/third/golang.org/x/text/encoding" - "github.com/gogf/gf/third/golang.org/x/text/encoding/internal" - "github.com/gogf/gf/third/golang.org/x/text/encoding/internal/identifier" - "github.com/gogf/gf/third/golang.org/x/text/transform" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/internal" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/internal/identifier" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/transform" ) // All is a list of all defined encodings in this package. diff --git a/third/golang.org/x/text/encoding/traditionalchinese/maketables.go b/internal/thirdparty/golang.org/x/text/encoding/traditionalchinese/maketables.go similarity index 97% rename from third/golang.org/x/text/encoding/traditionalchinese/maketables.go rename to internal/thirdparty/golang.org/x/text/encoding/traditionalchinese/maketables.go index bc2064bbb..037f65408 100644 --- a/third/golang.org/x/text/encoding/traditionalchinese/maketables.go +++ b/internal/thirdparty/golang.org/x/text/encoding/traditionalchinese/maketables.go @@ -21,7 +21,7 @@ import ( func main() { fmt.Printf("// generated by go run maketables.go; DO NOT EDIT\n\n") fmt.Printf("// Package traditionalchinese provides Traditional Chinese encodings such as Big5.\n") - fmt.Printf(`package traditionalchinese // import "github.com/gogf/gf/third/golang.org/x/text/encoding/traditionalchinese"` + "\n\n") + fmt.Printf(`package traditionalchinese // import "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/traditionalchinese"` + "\n\n") res, err := http.Get("http://encoding.spec.whatwg.org/index-big5.txt") if err != nil { diff --git a/third/golang.org/x/text/encoding/traditionalchinese/tables.go b/internal/thirdparty/golang.org/x/text/encoding/traditionalchinese/tables.go similarity index 99% rename from third/golang.org/x/text/encoding/traditionalchinese/tables.go rename to internal/thirdparty/golang.org/x/text/encoding/traditionalchinese/tables.go index 80cfaeac9..59889677c 100644 --- a/third/golang.org/x/text/encoding/traditionalchinese/tables.go +++ b/internal/thirdparty/golang.org/x/text/encoding/traditionalchinese/tables.go @@ -1,7 +1,7 @@ // generated by go run maketables.go; DO NOT EDIT // Package traditionalchinese provides Traditional Chinese encodings such as Big5. -package traditionalchinese // import "github.com/gogf/gf/third/golang.org/x/text/encoding/traditionalchinese" +package traditionalchinese // import "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/traditionalchinese" // decode is the decoding table from Big5 code to Unicode. // It is defined at http://encoding.spec.whatwg.org/index-big5.txt diff --git a/third/golang.org/x/text/encoding/unicode/override.go b/internal/thirdparty/golang.org/x/text/encoding/unicode/override.go similarity index 97% rename from third/golang.org/x/text/encoding/unicode/override.go rename to internal/thirdparty/golang.org/x/text/encoding/unicode/override.go index 5159433ed..168b72bc1 100644 --- a/third/golang.org/x/text/encoding/unicode/override.go +++ b/internal/thirdparty/golang.org/x/text/encoding/unicode/override.go @@ -5,7 +5,7 @@ package unicode import ( - "github.com/gogf/gf/third/golang.org/x/text/transform" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/transform" ) // BOMOverride returns a new decoder transformer that is identical to fallback, diff --git a/third/golang.org/x/text/encoding/unicode/unicode.go b/internal/thirdparty/golang.org/x/text/encoding/unicode/unicode.go similarity index 95% rename from third/golang.org/x/text/encoding/unicode/unicode.go rename to internal/thirdparty/golang.org/x/text/encoding/unicode/unicode.go index 4bf1bd44a..3335204df 100644 --- a/third/golang.org/x/text/encoding/unicode/unicode.go +++ b/internal/thirdparty/golang.org/x/text/encoding/unicode/unicode.go @@ -3,19 +3,19 @@ // license that can be found in the LICENSE file. // Package unicode provides Unicode encodings such as UTF-16. -package unicode // import "github.com/gogf/gf/third/golang.org/x/text/encoding/unicode" +package unicode // import "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/unicode" import ( "errors" "unicode/utf16" "unicode/utf8" - "github.com/gogf/gf/third/golang.org/x/text/encoding" - "github.com/gogf/gf/third/golang.org/x/text/encoding/internal" - "github.com/gogf/gf/third/golang.org/x/text/encoding/internal/identifier" - "github.com/gogf/gf/third/golang.org/x/text/internal/utf8internal" - "github.com/gogf/gf/third/golang.org/x/text/runes" - "github.com/gogf/gf/third/golang.org/x/text/transform" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/internal" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/internal/identifier" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/utf8internal" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/runes" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/transform" ) // TODO: I think the Transformers really should return errors on unmatched diff --git a/third/golang.org/x/text/encoding/unicode/unicode_test.go b/internal/thirdparty/golang.org/x/text/encoding/unicode/unicode_test.go similarity index 97% rename from third/golang.org/x/text/encoding/unicode/unicode_test.go rename to internal/thirdparty/golang.org/x/text/encoding/unicode/unicode_test.go index aa2c8c0f7..bd3cd74f6 100644 --- a/third/golang.org/x/text/encoding/unicode/unicode_test.go +++ b/internal/thirdparty/golang.org/x/text/encoding/unicode/unicode_test.go @@ -7,10 +7,10 @@ package unicode import ( "testing" - "github.com/gogf/gf/third/golang.org/x/text/encoding" - "github.com/gogf/gf/third/golang.org/x/text/encoding/charmap" - "github.com/gogf/gf/third/golang.org/x/text/encoding/internal/enctest" - "github.com/gogf/gf/third/golang.org/x/text/transform" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/charmap" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/internal/enctest" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/transform" ) func TestBasics(t *testing.T) { diff --git a/third/golang.org/x/text/encoding/unicode/utf32/utf32.go b/internal/thirdparty/golang.org/x/text/encoding/unicode/utf32/utf32.go similarity index 96% rename from third/golang.org/x/text/encoding/unicode/utf32/utf32.go rename to internal/thirdparty/golang.org/x/text/encoding/unicode/utf32/utf32.go index 2fb8a0f76..a9ffddc82 100644 --- a/third/golang.org/x/text/encoding/unicode/utf32/utf32.go +++ b/internal/thirdparty/golang.org/x/text/encoding/unicode/utf32/utf32.go @@ -10,15 +10,15 @@ // (https://www.w3.org/TR/html5/document-metadata.html#charset) // while WHATWG directly prohibits supporting it // (https://html.spec.whatwg.org/multipage/syntax.html#character-encodings). -package utf32 // import "github.com/gogf/gf/third/golang.org/x/text/encoding/unicode/utf32" +package utf32 // import "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/unicode/utf32" import ( "errors" "unicode/utf8" - "github.com/gogf/gf/third/golang.org/x/text/encoding" - "github.com/gogf/gf/third/golang.org/x/text/encoding/internal/identifier" - "github.com/gogf/gf/third/golang.org/x/text/transform" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/internal/identifier" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/transform" ) // All lists a configuration for each IANA-defined UTF-32 variant. diff --git a/third/golang.org/x/text/encoding/unicode/utf32/utf32_test.go b/internal/thirdparty/golang.org/x/text/encoding/unicode/utf32/utf32_test.go similarity index 97% rename from third/golang.org/x/text/encoding/unicode/utf32/utf32_test.go rename to internal/thirdparty/golang.org/x/text/encoding/unicode/utf32/utf32_test.go index e50ff554a..184e1d450 100644 --- a/third/golang.org/x/text/encoding/unicode/utf32/utf32_test.go +++ b/internal/thirdparty/golang.org/x/text/encoding/unicode/utf32/utf32_test.go @@ -7,9 +7,9 @@ package utf32 import ( "testing" - "github.com/gogf/gf/third/golang.org/x/text/encoding" - "github.com/gogf/gf/third/golang.org/x/text/encoding/internal/enctest" - "github.com/gogf/gf/third/golang.org/x/text/transform" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/encoding/internal/enctest" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/transform" ) var ( diff --git a/third/golang.org/x/text/internal/catmsg/catmsg.go b/internal/thirdparty/golang.org/x/text/internal/catmsg/catmsg.go similarity index 98% rename from third/golang.org/x/text/internal/catmsg/catmsg.go rename to internal/thirdparty/golang.org/x/text/internal/catmsg/catmsg.go index 05c510d6a..97a160e64 100644 --- a/third/golang.org/x/text/internal/catmsg/catmsg.go +++ b/internal/thirdparty/golang.org/x/text/internal/catmsg/catmsg.go @@ -68,7 +68,7 @@ import ( "strings" "sync" - "github.com/gogf/gf/third/golang.org/x/text/language" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/language" ) // A Handle refers to a registered message type. @@ -114,7 +114,7 @@ const ( numFixed ) -const prefix = "github.com/gogf/gf/third/golang.org/x/text/internal/catmsg." +const prefix = "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/catmsg." var ( mutex sync.Mutex diff --git a/third/golang.org/x/text/internal/catmsg/catmsg_test.go b/internal/thirdparty/golang.org/x/text/internal/catmsg/catmsg_test.go similarity index 96% rename from third/golang.org/x/text/internal/catmsg/catmsg_test.go rename to internal/thirdparty/golang.org/x/text/internal/catmsg/catmsg_test.go index e2d56e8dd..8c578ca0e 100644 --- a/third/golang.org/x/text/internal/catmsg/catmsg_test.go +++ b/internal/thirdparty/golang.org/x/text/internal/catmsg/catmsg_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "github.com/gogf/gf/third/golang.org/x/text/language" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/language" ) type renderer struct { @@ -260,7 +260,7 @@ type empty struct{} func (empty) Compile(e *Encoder) (err error) { return nil } var msgIncomplete = Register( - "github.com/gogf/gf/third/golang.org/x/text/internal/catmsg.incomplete", + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/catmsg.incomplete", func(d *Decoder) bool { return false }) type incomplete struct{} @@ -271,7 +271,7 @@ func (incomplete) Compile(e *Encoder) (err error) { } var msgNested = Register( - "github.com/gogf/gf/third/golang.org/x/text/internal/catmsg.nested", + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/catmsg.nested", func(d *Decoder) bool { d.Render(d.DecodeString()) d.ExecuteMessage() diff --git a/third/golang.org/x/text/internal/catmsg/codec.go b/internal/thirdparty/golang.org/x/text/internal/catmsg/codec.go similarity index 99% rename from third/golang.org/x/text/internal/catmsg/codec.go rename to internal/thirdparty/golang.org/x/text/internal/catmsg/codec.go index 207367d65..ae78696d7 100644 --- a/third/golang.org/x/text/internal/catmsg/codec.go +++ b/internal/thirdparty/golang.org/x/text/internal/catmsg/codec.go @@ -8,7 +8,7 @@ import ( "errors" "fmt" - "github.com/gogf/gf/third/golang.org/x/text/language" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/language" ) // A Renderer renders a Message. diff --git a/third/golang.org/x/text/internal/catmsg/varint.go b/internal/thirdparty/golang.org/x/text/internal/catmsg/varint.go similarity index 100% rename from third/golang.org/x/text/internal/catmsg/varint.go rename to internal/thirdparty/golang.org/x/text/internal/catmsg/varint.go diff --git a/third/golang.org/x/text/internal/catmsg/varint_test.go b/internal/thirdparty/golang.org/x/text/internal/catmsg/varint_test.go similarity index 100% rename from third/golang.org/x/text/internal/catmsg/varint_test.go rename to internal/thirdparty/golang.org/x/text/internal/catmsg/varint_test.go diff --git a/third/golang.org/x/text/internal/cldrtree/cldrtree.go b/internal/thirdparty/golang.org/x/text/internal/cldrtree/cldrtree.go similarity index 97% rename from third/golang.org/x/text/internal/cldrtree/cldrtree.go rename to internal/thirdparty/golang.org/x/text/internal/cldrtree/cldrtree.go index 4a8783d00..ad2b0dc43 100644 --- a/third/golang.org/x/text/internal/cldrtree/cldrtree.go +++ b/internal/thirdparty/golang.org/x/text/internal/cldrtree/cldrtree.go @@ -71,9 +71,9 @@ import ( "strings" "unicode/utf8" - "github.com/gogf/gf/third/golang.org/x/text/internal/gen" - "github.com/gogf/gf/third/golang.org/x/text/language" - "github.com/gogf/gf/third/golang.org/x/text/unicode/cldr" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/gen" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/language" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/unicode/cldr" ) // TODO: diff --git a/third/golang.org/x/text/internal/cldrtree/cldrtree_test.go b/internal/thirdparty/golang.org/x/text/internal/cldrtree/cldrtree_test.go similarity index 98% rename from third/golang.org/x/text/internal/cldrtree/cldrtree_test.go rename to internal/thirdparty/golang.org/x/text/internal/cldrtree/cldrtree_test.go index 93c1e8353..8cb4a58dc 100644 --- a/third/golang.org/x/text/internal/cldrtree/cldrtree_test.go +++ b/internal/thirdparty/golang.org/x/text/internal/cldrtree/cldrtree_test.go @@ -17,9 +17,9 @@ import ( "strings" "testing" - "github.com/gogf/gf/third/golang.org/x/text/internal/gen" - "github.com/gogf/gf/third/golang.org/x/text/language" - "github.com/gogf/gf/third/golang.org/x/text/unicode/cldr" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/gen" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/language" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/unicode/cldr" ) var genOutput = flag.Bool("gen", false, "generate output files") diff --git a/third/golang.org/x/text/internal/cldrtree/generate.go b/internal/thirdparty/golang.org/x/text/internal/cldrtree/generate.go similarity index 96% rename from third/golang.org/x/text/internal/cldrtree/generate.go rename to internal/thirdparty/golang.org/x/text/internal/cldrtree/generate.go index 8cb187fb8..bdc04338a 100644 --- a/third/golang.org/x/text/internal/cldrtree/generate.go +++ b/internal/thirdparty/golang.org/x/text/internal/cldrtree/generate.go @@ -12,11 +12,11 @@ import ( "strconv" "strings" - "github.com/gogf/gf/third/golang.org/x/text/internal/gen" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/gen" ) func generate(b *Builder, t *Tree, w *gen.CodeWriter) error { - fmt.Fprintln(w, `import "github.com/gogf/gf/third/golang.org/x/text/internal/cldrtree"`) + fmt.Fprintln(w, `import "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/cldrtree"`) fmt.Fprintln(w) fmt.Fprintf(w, "var tree = &cldrtree.Tree{locales, indices, buckets}\n\n") diff --git a/third/golang.org/x/text/internal/cldrtree/option.go b/internal/thirdparty/golang.org/x/text/internal/cldrtree/option.go similarity index 96% rename from third/golang.org/x/text/internal/cldrtree/option.go rename to internal/thirdparty/golang.org/x/text/internal/cldrtree/option.go index 5233673b2..05c6e8282 100644 --- a/third/golang.org/x/text/internal/cldrtree/option.go +++ b/internal/thirdparty/golang.org/x/text/internal/cldrtree/option.go @@ -7,7 +7,7 @@ package cldrtree import ( "reflect" - "github.com/gogf/gf/third/golang.org/x/text/unicode/cldr" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/unicode/cldr" ) // An Option configures an Index. diff --git a/third/golang.org/x/text/internal/cldrtree/testdata/test1/common/main/root.xml b/internal/thirdparty/golang.org/x/text/internal/cldrtree/testdata/test1/common/main/root.xml similarity index 100% rename from third/golang.org/x/text/internal/cldrtree/testdata/test1/common/main/root.xml rename to internal/thirdparty/golang.org/x/text/internal/cldrtree/testdata/test1/common/main/root.xml diff --git a/third/golang.org/x/text/internal/cldrtree/testdata/test1/output.go b/internal/thirdparty/golang.org/x/text/internal/cldrtree/testdata/test1/output.go similarity index 99% rename from third/golang.org/x/text/internal/cldrtree/testdata/test1/output.go rename to internal/thirdparty/golang.org/x/text/internal/cldrtree/testdata/test1/output.go index 287dd7137..0b67fd931 100644 --- a/third/golang.org/x/text/internal/cldrtree/testdata/test1/output.go +++ b/internal/thirdparty/golang.org/x/text/internal/cldrtree/testdata/test1/output.go @@ -2,7 +2,7 @@ package test -import "github.com/gogf/gf/third/golang.org/x/text/internal/cldrtree" +import "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/cldrtree" var tree = &cldrtree.Tree{locales, indices, buckets} diff --git a/third/golang.org/x/text/internal/cldrtree/testdata/test2/common/main/en.xml b/internal/thirdparty/golang.org/x/text/internal/cldrtree/testdata/test2/common/main/en.xml similarity index 100% rename from third/golang.org/x/text/internal/cldrtree/testdata/test2/common/main/en.xml rename to internal/thirdparty/golang.org/x/text/internal/cldrtree/testdata/test2/common/main/en.xml diff --git a/third/golang.org/x/text/internal/cldrtree/testdata/test2/common/main/en_001.xml b/internal/thirdparty/golang.org/x/text/internal/cldrtree/testdata/test2/common/main/en_001.xml similarity index 100% rename from third/golang.org/x/text/internal/cldrtree/testdata/test2/common/main/en_001.xml rename to internal/thirdparty/golang.org/x/text/internal/cldrtree/testdata/test2/common/main/en_001.xml diff --git a/third/golang.org/x/text/internal/cldrtree/testdata/test2/common/main/en_GB.xml b/internal/thirdparty/golang.org/x/text/internal/cldrtree/testdata/test2/common/main/en_GB.xml similarity index 100% rename from third/golang.org/x/text/internal/cldrtree/testdata/test2/common/main/en_GB.xml rename to internal/thirdparty/golang.org/x/text/internal/cldrtree/testdata/test2/common/main/en_GB.xml diff --git a/third/golang.org/x/text/internal/cldrtree/testdata/test2/common/main/root.xml b/internal/thirdparty/golang.org/x/text/internal/cldrtree/testdata/test2/common/main/root.xml similarity index 100% rename from third/golang.org/x/text/internal/cldrtree/testdata/test2/common/main/root.xml rename to internal/thirdparty/golang.org/x/text/internal/cldrtree/testdata/test2/common/main/root.xml diff --git a/third/golang.org/x/text/internal/cldrtree/testdata/test2/output.go b/internal/thirdparty/golang.org/x/text/internal/cldrtree/testdata/test2/output.go similarity index 99% rename from third/golang.org/x/text/internal/cldrtree/testdata/test2/output.go rename to internal/thirdparty/golang.org/x/text/internal/cldrtree/testdata/test2/output.go index fbee7e5da..5f0e5ee51 100644 --- a/third/golang.org/x/text/internal/cldrtree/testdata/test2/output.go +++ b/internal/thirdparty/golang.org/x/text/internal/cldrtree/testdata/test2/output.go @@ -2,7 +2,7 @@ package test -import "github.com/gogf/gf/third/golang.org/x/text/internal/cldrtree" +import "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/cldrtree" var tree = &cldrtree.Tree{locales, indices, buckets} diff --git a/third/golang.org/x/text/internal/cldrtree/tree.go b/internal/thirdparty/golang.org/x/text/internal/cldrtree/tree.go similarity index 96% rename from third/golang.org/x/text/internal/cldrtree/tree.go rename to internal/thirdparty/golang.org/x/text/internal/cldrtree/tree.go index 87b0ff7e6..3585c3b14 100644 --- a/third/golang.org/x/text/internal/cldrtree/tree.go +++ b/internal/thirdparty/golang.org/x/text/internal/cldrtree/tree.go @@ -5,8 +5,8 @@ package cldrtree import ( - "github.com/gogf/gf/third/golang.org/x/text/internal" - "github.com/gogf/gf/third/golang.org/x/text/language" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/language" ) const ( diff --git a/third/golang.org/x/text/internal/cldrtree/type.go b/internal/thirdparty/golang.org/x/text/internal/cldrtree/type.go similarity index 100% rename from third/golang.org/x/text/internal/cldrtree/type.go rename to internal/thirdparty/golang.org/x/text/internal/cldrtree/type.go diff --git a/third/golang.org/x/text/internal/colltab/collate_test.go b/internal/thirdparty/golang.org/x/text/internal/colltab/collate_test.go similarity index 93% rename from third/golang.org/x/text/internal/colltab/collate_test.go rename to internal/thirdparty/golang.org/x/text/internal/colltab/collate_test.go index 135174efd..35df588f7 100644 --- a/third/golang.org/x/text/internal/colltab/collate_test.go +++ b/internal/thirdparty/golang.org/x/text/internal/colltab/collate_test.go @@ -12,9 +12,9 @@ import ( "testing" "unicode" - "github.com/gogf/gf/third/golang.org/x/text/collate" - "github.com/gogf/gf/third/golang.org/x/text/language" - "github.com/gogf/gf/third/golang.org/x/text/unicode/rangetable" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/collate" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/language" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/unicode/rangetable" ) // assigned is used to only test runes that are inside the scope of the Unicode diff --git a/third/golang.org/x/text/internal/colltab/collelem.go b/internal/thirdparty/golang.org/x/text/internal/colltab/collelem.go similarity index 100% rename from third/golang.org/x/text/internal/colltab/collelem.go rename to internal/thirdparty/golang.org/x/text/internal/colltab/collelem.go diff --git a/third/golang.org/x/text/internal/colltab/collelem_test.go b/internal/thirdparty/golang.org/x/text/internal/colltab/collelem_test.go similarity index 100% rename from third/golang.org/x/text/internal/colltab/collelem_test.go rename to internal/thirdparty/golang.org/x/text/internal/colltab/collelem_test.go diff --git a/third/golang.org/x/text/internal/colltab/colltab.go b/internal/thirdparty/golang.org/x/text/internal/colltab/colltab.go similarity index 95% rename from third/golang.org/x/text/internal/colltab/colltab.go rename to internal/thirdparty/golang.org/x/text/internal/colltab/colltab.go index cfd6d79db..24a13f58a 100644 --- a/third/golang.org/x/text/internal/colltab/colltab.go +++ b/internal/thirdparty/golang.org/x/text/internal/colltab/colltab.go @@ -4,12 +4,12 @@ // Package colltab contains functionality related to collation tables. // It is only to be used by the collate and search packages. -package colltab // import "github.com/gogf/gf/third/golang.org/x/text/internal/colltab" +package colltab // import "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/colltab" import ( "sort" - "github.com/gogf/gf/third/golang.org/x/text/language" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/language" ) // MatchLang finds the index of t in tags, using a matching algorithm used for diff --git a/third/golang.org/x/text/internal/colltab/colltab_test.go b/internal/thirdparty/golang.org/x/text/internal/colltab/colltab_test.go similarity index 97% rename from third/golang.org/x/text/internal/colltab/colltab_test.go rename to internal/thirdparty/golang.org/x/text/internal/colltab/colltab_test.go index 37fb5a8a2..530b346da 100644 --- a/third/golang.org/x/text/internal/colltab/colltab_test.go +++ b/internal/thirdparty/golang.org/x/text/internal/colltab/colltab_test.go @@ -3,7 +3,7 @@ package colltab import ( "testing" - "github.com/gogf/gf/third/golang.org/x/text/language" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/language" ) func TestMatchLang(t *testing.T) { diff --git a/third/golang.org/x/text/internal/colltab/contract.go b/internal/thirdparty/golang.org/x/text/internal/colltab/contract.go similarity index 100% rename from third/golang.org/x/text/internal/colltab/contract.go rename to internal/thirdparty/golang.org/x/text/internal/colltab/contract.go diff --git a/third/golang.org/x/text/internal/colltab/contract_test.go b/internal/thirdparty/golang.org/x/text/internal/colltab/contract_test.go similarity index 100% rename from third/golang.org/x/text/internal/colltab/contract_test.go rename to internal/thirdparty/golang.org/x/text/internal/colltab/contract_test.go diff --git a/third/golang.org/x/text/internal/colltab/iter.go b/internal/thirdparty/golang.org/x/text/internal/colltab/iter.go similarity index 100% rename from third/golang.org/x/text/internal/colltab/iter.go rename to internal/thirdparty/golang.org/x/text/internal/colltab/iter.go diff --git a/third/golang.org/x/text/internal/colltab/iter_test.go b/internal/thirdparty/golang.org/x/text/internal/colltab/iter_test.go similarity index 100% rename from third/golang.org/x/text/internal/colltab/iter_test.go rename to internal/thirdparty/golang.org/x/text/internal/colltab/iter_test.go diff --git a/third/golang.org/x/text/internal/colltab/numeric.go b/internal/thirdparty/golang.org/x/text/internal/colltab/numeric.go similarity index 100% rename from third/golang.org/x/text/internal/colltab/numeric.go rename to internal/thirdparty/golang.org/x/text/internal/colltab/numeric.go diff --git a/third/golang.org/x/text/internal/colltab/numeric_test.go b/internal/thirdparty/golang.org/x/text/internal/colltab/numeric_test.go similarity index 98% rename from third/golang.org/x/text/internal/colltab/numeric_test.go rename to internal/thirdparty/golang.org/x/text/internal/colltab/numeric_test.go index 55b0fcd03..51cd980e8 100644 --- a/third/golang.org/x/text/internal/colltab/numeric_test.go +++ b/internal/thirdparty/golang.org/x/text/internal/colltab/numeric_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "github.com/gogf/gf/third/golang.org/x/text/internal/testtext" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/testtext" ) const ( diff --git a/third/golang.org/x/text/internal/colltab/table.go b/internal/thirdparty/golang.org/x/text/internal/colltab/table.go similarity index 99% rename from third/golang.org/x/text/internal/colltab/table.go rename to internal/thirdparty/golang.org/x/text/internal/colltab/table.go index 76ebbbbbf..a52c5a651 100644 --- a/third/golang.org/x/text/internal/colltab/table.go +++ b/internal/thirdparty/golang.org/x/text/internal/colltab/table.go @@ -7,7 +7,7 @@ package colltab import ( "unicode/utf8" - "github.com/gogf/gf/third/golang.org/x/text/unicode/norm" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/unicode/norm" ) // Table holds all collation data for a given collation ordering. diff --git a/third/golang.org/x/text/internal/colltab/trie.go b/internal/thirdparty/golang.org/x/text/internal/colltab/trie.go similarity index 100% rename from third/golang.org/x/text/internal/colltab/trie.go rename to internal/thirdparty/golang.org/x/text/internal/colltab/trie.go diff --git a/third/golang.org/x/text/internal/colltab/trie_test.go b/internal/thirdparty/golang.org/x/text/internal/colltab/trie_test.go similarity index 100% rename from third/golang.org/x/text/internal/colltab/trie_test.go rename to internal/thirdparty/golang.org/x/text/internal/colltab/trie_test.go diff --git a/third/golang.org/x/text/internal/colltab/weighter.go b/internal/thirdparty/golang.org/x/text/internal/colltab/weighter.go similarity index 92% rename from third/golang.org/x/text/internal/colltab/weighter.go rename to internal/thirdparty/golang.org/x/text/internal/colltab/weighter.go index a2efc17ea..5e21bdb72 100644 --- a/third/golang.org/x/text/internal/colltab/weighter.go +++ b/internal/thirdparty/golang.org/x/text/internal/colltab/weighter.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -package colltab // import "github.com/gogf/gf/third/golang.org/x/text/internal/colltab" +package colltab // import "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/colltab" // A Weighter can be used as a source for Collator and Searcher. type Weighter interface { diff --git a/third/golang.org/x/text/internal/colltab/weighter_test.go b/internal/thirdparty/golang.org/x/text/internal/colltab/weighter_test.go similarity index 100% rename from third/golang.org/x/text/internal/colltab/weighter_test.go rename to internal/thirdparty/golang.org/x/text/internal/colltab/weighter_test.go diff --git a/third/golang.org/x/text/internal/export/README b/internal/thirdparty/golang.org/x/text/internal/export/README similarity index 100% rename from third/golang.org/x/text/internal/export/README rename to internal/thirdparty/golang.org/x/text/internal/export/README diff --git a/third/golang.org/x/text/internal/export/idna/common_test.go b/internal/thirdparty/golang.org/x/text/internal/export/idna/common_test.go similarity index 93% rename from third/golang.org/x/text/internal/export/idna/common_test.go rename to internal/thirdparty/golang.org/x/text/internal/export/idna/common_test.go index bd916d07e..0b30529bb 100644 --- a/third/golang.org/x/text/internal/export/idna/common_test.go +++ b/internal/thirdparty/golang.org/x/text/internal/export/idna/common_test.go @@ -8,7 +8,7 @@ package idna import ( "log" - "github.com/gogf/gf/third/golang.org/x/text/internal/ucd" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/ucd" ) func catFromEntry(p *ucd.Parser) (cat category) { diff --git a/third/golang.org/x/text/internal/export/idna/example_test.go b/internal/thirdparty/golang.org/x/text/internal/export/idna/example_test.go similarity index 95% rename from third/golang.org/x/text/internal/export/idna/example_test.go rename to internal/thirdparty/golang.org/x/text/internal/export/idna/example_test.go index b2a2d4a80..064b317f9 100644 --- a/third/golang.org/x/text/internal/export/idna/example_test.go +++ b/internal/thirdparty/golang.org/x/text/internal/export/idna/example_test.go @@ -7,7 +7,7 @@ package idna_test import ( "fmt" - "github.com/gogf/gf/third/golang.org/x/text/internal/export/idna" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/export/idna" ) func ExampleProfile() { diff --git a/third/golang.org/x/text/internal/export/idna/gen.go b/internal/thirdparty/golang.org/x/text/internal/export/idna/gen.go similarity index 96% rename from third/golang.org/x/text/internal/export/idna/gen.go rename to internal/thirdparty/golang.org/x/text/internal/export/idna/gen.go index 2bf59f67c..bbb562ba8 100644 --- a/third/golang.org/x/text/internal/export/idna/gen.go +++ b/internal/thirdparty/golang.org/x/text/internal/export/idna/gen.go @@ -18,10 +18,10 @@ import ( "unicode" "unicode/utf8" - "github.com/gogf/gf/third/golang.org/x/text/internal/gen" - "github.com/gogf/gf/third/golang.org/x/text/internal/triegen" - "github.com/gogf/gf/third/golang.org/x/text/internal/ucd" - "github.com/gogf/gf/third/golang.org/x/text/unicode/bidi" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/gen" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/triegen" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/ucd" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/unicode/bidi" ) func main() { diff --git a/third/golang.org/x/text/internal/export/idna/gen_common.go b/internal/thirdparty/golang.org/x/text/internal/export/idna/gen_common.go similarity index 94% rename from third/golang.org/x/text/internal/export/idna/gen_common.go rename to internal/thirdparty/golang.org/x/text/internal/export/idna/gen_common.go index 0e36e586b..a37bc3422 100644 --- a/third/golang.org/x/text/internal/export/idna/gen_common.go +++ b/internal/thirdparty/golang.org/x/text/internal/export/idna/gen_common.go @@ -12,7 +12,7 @@ package main import ( "log" - "github.com/gogf/gf/third/golang.org/x/text/internal/ucd" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/ucd" ) func catFromEntry(p *ucd.Parser) (cat category) { diff --git a/third/golang.org/x/text/internal/export/idna/gen_test.go b/internal/thirdparty/golang.org/x/text/internal/export/idna/gen_test.go similarity index 90% rename from third/golang.org/x/text/internal/export/idna/gen_test.go rename to internal/thirdparty/golang.org/x/text/internal/export/idna/gen_test.go index 300266e87..7da6a63dd 100644 --- a/third/golang.org/x/text/internal/export/idna/gen_test.go +++ b/internal/thirdparty/golang.org/x/text/internal/export/idna/gen_test.go @@ -8,9 +8,9 @@ import ( "testing" "unicode" - "github.com/gogf/gf/third/golang.org/x/text/internal/gen" - "github.com/gogf/gf/third/golang.org/x/text/internal/testtext" - "github.com/gogf/gf/third/golang.org/x/text/internal/ucd" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/gen" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/testtext" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/ucd" ) func TestTables(t *testing.T) { diff --git a/third/golang.org/x/text/internal/export/idna/gen_trieval.go b/internal/thirdparty/golang.org/x/text/internal/export/idna/gen_trieval.go similarity index 100% rename from third/golang.org/x/text/internal/export/idna/gen_trieval.go rename to internal/thirdparty/golang.org/x/text/internal/export/idna/gen_trieval.go diff --git a/third/golang.org/x/text/internal/export/idna/idna.go b/internal/thirdparty/golang.org/x/text/internal/export/idna/idna.go similarity index 98% rename from third/golang.org/x/text/internal/export/idna/idna.go rename to internal/thirdparty/golang.org/x/text/internal/export/idna/idna.go index 471d8f70a..9b339ee01 100644 --- a/third/golang.org/x/text/internal/export/idna/idna.go +++ b/internal/thirdparty/golang.org/x/text/internal/export/idna/idna.go @@ -13,16 +13,16 @@ // UTS #46 is defined in http://www.unicode.org/reports/tr46. // See http://unicode.org/cldr/utility/idna.jsp for a visualization of the // differences between these two standards. -package idna // import "github.com/gogf/gf/third/golang.org/x/text/internal/export/idna" +package idna // import "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/export/idna" import ( "fmt" "strings" "unicode/utf8" - "github.com/gogf/gf/third/golang.org/x/text/secure/bidirule" - "github.com/gogf/gf/third/golang.org/x/text/unicode/bidi" - "github.com/gogf/gf/third/golang.org/x/text/unicode/norm" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/secure/bidirule" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/unicode/bidi" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/unicode/norm" ) // NOTE: Unlike common practice in Go APIs, the functions will return a diff --git a/third/golang.org/x/text/internal/export/idna/idna_test.go b/internal/thirdparty/golang.org/x/text/internal/export/idna/idna_test.go similarity index 97% rename from third/golang.org/x/text/internal/export/idna/idna_test.go rename to internal/thirdparty/golang.org/x/text/internal/export/idna/idna_test.go index 301098641..c1426f8f3 100644 --- a/third/golang.org/x/text/internal/export/idna/idna_test.go +++ b/internal/thirdparty/golang.org/x/text/internal/export/idna/idna_test.go @@ -10,9 +10,9 @@ import ( "strings" "testing" - "github.com/gogf/gf/third/golang.org/x/text/internal/gen" - "github.com/gogf/gf/third/golang.org/x/text/internal/testtext" - "github.com/gogf/gf/third/golang.org/x/text/internal/ucd" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/gen" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/testtext" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/ucd" ) func TestAllocToUnicode(t *testing.T) { diff --git a/third/golang.org/x/text/internal/export/idna/punycode.go b/internal/thirdparty/golang.org/x/text/internal/export/idna/punycode.go similarity index 100% rename from third/golang.org/x/text/internal/export/idna/punycode.go rename to internal/thirdparty/golang.org/x/text/internal/export/idna/punycode.go diff --git a/third/golang.org/x/text/internal/export/idna/punycode_test.go b/internal/thirdparty/golang.org/x/text/internal/export/idna/punycode_test.go similarity index 100% rename from third/golang.org/x/text/internal/export/idna/punycode_test.go rename to internal/thirdparty/golang.org/x/text/internal/export/idna/punycode_test.go diff --git a/third/golang.org/x/text/internal/export/idna/tables.go b/internal/thirdparty/golang.org/x/text/internal/export/idna/tables.go similarity index 100% rename from third/golang.org/x/text/internal/export/idna/tables.go rename to internal/thirdparty/golang.org/x/text/internal/export/idna/tables.go diff --git a/third/golang.org/x/text/internal/export/idna/trie.go b/internal/thirdparty/golang.org/x/text/internal/export/idna/trie.go similarity index 100% rename from third/golang.org/x/text/internal/export/idna/trie.go rename to internal/thirdparty/golang.org/x/text/internal/export/idna/trie.go diff --git a/third/golang.org/x/text/internal/export/idna/trieval.go b/internal/thirdparty/golang.org/x/text/internal/export/idna/trieval.go similarity index 100% rename from third/golang.org/x/text/internal/export/idna/trieval.go rename to internal/thirdparty/golang.org/x/text/internal/export/idna/trieval.go diff --git a/third/golang.org/x/text/internal/format/format.go b/internal/thirdparty/golang.org/x/text/internal/format/format.go similarity index 86% rename from third/golang.org/x/text/internal/format/format.go rename to internal/thirdparty/golang.org/x/text/internal/format/format.go index a12ff51c3..470e3eef5 100644 --- a/third/golang.org/x/text/internal/format/format.go +++ b/internal/thirdparty/golang.org/x/text/internal/format/format.go @@ -7,12 +7,12 @@ // // This package is internal now, but will eventually be exposed after the API // settles. -package format // import "github.com/gogf/gf/third/golang.org/x/text/internal/format" +package format // import "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/format" import ( "fmt" - "github.com/gogf/gf/third/golang.org/x/text/language" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/language" ) // State represents the printer state passed to custom formatters. It provides diff --git a/third/golang.org/x/text/internal/gen.go b/internal/thirdparty/golang.org/x/text/internal/gen.go similarity index 82% rename from third/golang.org/x/text/internal/gen.go rename to internal/thirdparty/golang.org/x/text/internal/gen.go index 50d1c656b..018912e5f 100644 --- a/third/golang.org/x/text/internal/gen.go +++ b/internal/thirdparty/golang.org/x/text/internal/gen.go @@ -9,9 +9,9 @@ package main import ( "log" - "github.com/gogf/gf/third/golang.org/x/text/internal/gen" - "github.com/gogf/gf/third/golang.org/x/text/language" - "github.com/gogf/gf/third/golang.org/x/text/unicode/cldr" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/gen" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/language" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/unicode/cldr" ) func main() { diff --git a/third/golang.org/x/text/internal/gen/code.go b/internal/thirdparty/golang.org/x/text/internal/gen/code.go similarity index 100% rename from third/golang.org/x/text/internal/gen/code.go rename to internal/thirdparty/golang.org/x/text/internal/gen/code.go diff --git a/third/golang.org/x/text/internal/gen/gen.go b/internal/thirdparty/golang.org/x/text/internal/gen/gen.go similarity index 96% rename from third/golang.org/x/text/internal/gen/gen.go rename to internal/thirdparty/golang.org/x/text/internal/gen/gen.go index 2b08ae23a..cf874f553 100644 --- a/third/golang.org/x/text/internal/gen/gen.go +++ b/internal/thirdparty/golang.org/x/text/internal/gen/gen.go @@ -16,7 +16,7 @@ // IANA data can also optionally be mirrored by putting it in the iana directory // rooted at the top of the local mirror. Beware, though, that IANA data is not // versioned. So it is up to the developer to use the right version. -package gen // import "github.com/gogf/gf/third/golang.org/x/text/internal/gen" +package gen // import "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/gen" import ( "bytes" @@ -34,7 +34,7 @@ import ( "sync" "unicode" - "github.com/gogf/gf/third/golang.org/x/text/unicode/cldr" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/unicode/cldr" ) var ( @@ -135,7 +135,7 @@ var ( const permissions = 0755 func localReadmeFile() (string, error) { - p, err := build.Import("github.com/gogf/gf/third/golang.org/x/text", "", build.FindOnly) + p, err := build.Import("github.com/gogf/gf/internal/thirdparty/golang.org/x/text", "", build.FindOnly) if err != nil { return "", fmt.Errorf("Could not locate package: %v", err) } diff --git a/third/golang.org/x/text/internal/gen_test.go b/internal/thirdparty/golang.org/x/text/internal/gen_test.go similarity index 92% rename from third/golang.org/x/text/internal/gen_test.go rename to internal/thirdparty/golang.org/x/text/internal/gen_test.go index 4ceb578b3..da677679a 100644 --- a/third/golang.org/x/text/internal/gen_test.go +++ b/internal/thirdparty/golang.org/x/text/internal/gen_test.go @@ -7,7 +7,7 @@ package internal import ( "testing" - "github.com/gogf/gf/third/golang.org/x/text/language" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/language" ) func TestParents(t *testing.T) { diff --git a/third/golang.org/x/text/internal/internal.go b/internal/thirdparty/golang.org/x/text/internal/internal.go similarity index 85% rename from third/golang.org/x/text/internal/internal.go rename to internal/thirdparty/golang.org/x/text/internal/internal.go index e4ad3d299..74f67eb1c 100644 --- a/third/golang.org/x/text/internal/internal.go +++ b/internal/thirdparty/golang.org/x/text/internal/internal.go @@ -6,12 +6,12 @@ // Package internal contains non-exported functionality that are used by // packages in the text repository. -package internal // import "github.com/gogf/gf/third/golang.org/x/text/internal" +package internal // import "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal" import ( "sort" - "github.com/gogf/gf/third/golang.org/x/text/language" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/language" ) // SortTags sorts tags in place. diff --git a/third/golang.org/x/text/internal/internal_test.go b/internal/thirdparty/golang.org/x/text/internal/internal_test.go similarity index 91% rename from third/golang.org/x/text/internal/internal_test.go rename to internal/thirdparty/golang.org/x/text/internal/internal_test.go index d4c7cfd06..66b1a32b1 100644 --- a/third/golang.org/x/text/internal/internal_test.go +++ b/internal/thirdparty/golang.org/x/text/internal/internal_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "github.com/gogf/gf/third/golang.org/x/text/language" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/language" ) func TestUnique(t *testing.T) { diff --git a/third/golang.org/x/text/internal/match.go b/internal/thirdparty/golang.org/x/text/internal/match.go similarity index 96% rename from third/golang.org/x/text/internal/match.go rename to internal/thirdparty/golang.org/x/text/internal/match.go index 4f38acd39..d0c91853c 100644 --- a/third/golang.org/x/text/internal/match.go +++ b/internal/thirdparty/golang.org/x/text/internal/match.go @@ -12,7 +12,7 @@ package internal // the cldr package. import ( - "github.com/gogf/gf/third/golang.org/x/text/language" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/language" ) // TODO: consider if (some of the) matching algorithm needs to be public after diff --git a/third/golang.org/x/text/internal/match_test.go b/internal/thirdparty/golang.org/x/text/internal/match_test.go similarity index 96% rename from third/golang.org/x/text/internal/match_test.go rename to internal/thirdparty/golang.org/x/text/internal/match_test.go index ac8ae0d2d..4349eba1a 100644 --- a/third/golang.org/x/text/internal/match_test.go +++ b/internal/thirdparty/golang.org/x/text/internal/match_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/gogf/gf/third/golang.org/x/text/language" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/language" ) func TestInheritanceMatcher(t *testing.T) { diff --git a/third/golang.org/x/text/internal/number/common.go b/internal/thirdparty/golang.org/x/text/internal/number/common.go similarity index 100% rename from third/golang.org/x/text/internal/number/common.go rename to internal/thirdparty/golang.org/x/text/internal/number/common.go diff --git a/third/golang.org/x/text/internal/number/decimal.go b/internal/thirdparty/golang.org/x/text/internal/number/decimal.go similarity index 100% rename from third/golang.org/x/text/internal/number/decimal.go rename to internal/thirdparty/golang.org/x/text/internal/number/decimal.go diff --git a/third/golang.org/x/text/internal/number/decimal_test.go b/internal/thirdparty/golang.org/x/text/internal/number/decimal_test.go similarity index 100% rename from third/golang.org/x/text/internal/number/decimal_test.go rename to internal/thirdparty/golang.org/x/text/internal/number/decimal_test.go diff --git a/third/golang.org/x/text/internal/number/format.go b/internal/thirdparty/golang.org/x/text/internal/number/format.go similarity index 99% rename from third/golang.org/x/text/internal/number/format.go rename to internal/thirdparty/golang.org/x/text/internal/number/format.go index b418825fc..041128ff5 100644 --- a/third/golang.org/x/text/internal/number/format.go +++ b/internal/thirdparty/golang.org/x/text/internal/number/format.go @@ -8,7 +8,7 @@ import ( "strconv" "unicode/utf8" - "github.com/gogf/gf/third/golang.org/x/text/language" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/language" ) // TODO: diff --git a/third/golang.org/x/text/internal/number/format_test.go b/internal/thirdparty/golang.org/x/text/internal/number/format_test.go similarity index 99% rename from third/golang.org/x/text/internal/number/format_test.go rename to internal/thirdparty/golang.org/x/text/internal/number/format_test.go index 5f850337c..3a7a262da 100644 --- a/third/golang.org/x/text/internal/number/format_test.go +++ b/internal/thirdparty/golang.org/x/text/internal/number/format_test.go @@ -9,7 +9,7 @@ import ( "log" "testing" - "github.com/gogf/gf/third/golang.org/x/text/language" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/language" ) func TestAppendDecimal(t *testing.T) { diff --git a/third/golang.org/x/text/internal/number/gen.go b/internal/thirdparty/golang.org/x/text/internal/number/gen.go similarity index 95% rename from third/golang.org/x/text/internal/number/gen.go rename to internal/thirdparty/golang.org/x/text/internal/number/gen.go index 8c58c8e72..d14fd77ca 100644 --- a/third/golang.org/x/text/internal/number/gen.go +++ b/internal/thirdparty/golang.org/x/text/internal/number/gen.go @@ -14,12 +14,12 @@ import ( "strings" "unicode/utf8" - "github.com/gogf/gf/third/golang.org/x/text/internal" - "github.com/gogf/gf/third/golang.org/x/text/internal/gen" - "github.com/gogf/gf/third/golang.org/x/text/internal/number" - "github.com/gogf/gf/third/golang.org/x/text/internal/stringset" - "github.com/gogf/gf/third/golang.org/x/text/language" - "github.com/gogf/gf/third/golang.org/x/text/unicode/cldr" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/gen" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/number" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/stringset" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/language" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/unicode/cldr" ) var ( @@ -54,7 +54,7 @@ func main() { w := gen.NewCodeWriter() defer w.WriteGoFile(*outputFile, pkg) - fmt.Fprintln(w, `import "github.com/gogf/gf/third/golang.org/x/text/internal/stringset"`) + fmt.Fprintln(w, `import "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/stringset"`) gen.WriteCLDRVersion(w) diff --git a/third/golang.org/x/text/internal/number/gen_common.go b/internal/thirdparty/golang.org/x/text/internal/number/gen_common.go similarity index 100% rename from third/golang.org/x/text/internal/number/gen_common.go rename to internal/thirdparty/golang.org/x/text/internal/number/gen_common.go diff --git a/third/golang.org/x/text/internal/number/number.go b/internal/thirdparty/golang.org/x/text/internal/number/number.go similarity index 97% rename from third/golang.org/x/text/internal/number/number.go rename to internal/thirdparty/golang.org/x/text/internal/number/number.go index 6f8440ad7..f9b832524 100644 --- a/third/golang.org/x/text/internal/number/number.go +++ b/internal/thirdparty/golang.org/x/text/internal/number/number.go @@ -10,8 +10,8 @@ package number import ( "unicode/utf8" - "github.com/gogf/gf/third/golang.org/x/text/internal" - "github.com/gogf/gf/third/golang.org/x/text/language" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/language" ) // Info holds number formatting configuration data. diff --git a/third/golang.org/x/text/internal/number/number_test.go b/internal/thirdparty/golang.org/x/text/internal/number/number_test.go similarity index 96% rename from third/golang.org/x/text/internal/number/number_test.go rename to internal/thirdparty/golang.org/x/text/internal/number/number_test.go index 855ddc332..ec1f9ad78 100644 --- a/third/golang.org/x/text/internal/number/number_test.go +++ b/internal/thirdparty/golang.org/x/text/internal/number/number_test.go @@ -8,8 +8,8 @@ import ( "fmt" "testing" - "github.com/gogf/gf/third/golang.org/x/text/internal/testtext" - "github.com/gogf/gf/third/golang.org/x/text/language" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/testtext" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/language" ) func TestInfo(t *testing.T) { diff --git a/third/golang.org/x/text/internal/number/pattern.go b/internal/thirdparty/golang.org/x/text/internal/number/pattern.go similarity index 100% rename from third/golang.org/x/text/internal/number/pattern.go rename to internal/thirdparty/golang.org/x/text/internal/number/pattern.go diff --git a/third/golang.org/x/text/internal/number/pattern_test.go b/internal/thirdparty/golang.org/x/text/internal/number/pattern_test.go similarity index 100% rename from third/golang.org/x/text/internal/number/pattern_test.go rename to internal/thirdparty/golang.org/x/text/internal/number/pattern_test.go diff --git a/third/golang.org/x/text/internal/number/roundingmode_string.go b/internal/thirdparty/golang.org/x/text/internal/number/roundingmode_string.go similarity index 100% rename from third/golang.org/x/text/internal/number/roundingmode_string.go rename to internal/thirdparty/golang.org/x/text/internal/number/roundingmode_string.go diff --git a/third/golang.org/x/text/internal/number/tables.go b/internal/thirdparty/golang.org/x/text/internal/number/tables.go similarity index 99% rename from third/golang.org/x/text/internal/number/tables.go rename to internal/thirdparty/golang.org/x/text/internal/number/tables.go index fff0c7b8c..3cdb284f4 100644 --- a/third/golang.org/x/text/internal/number/tables.go +++ b/internal/thirdparty/golang.org/x/text/internal/number/tables.go @@ -2,7 +2,7 @@ package number -import "github.com/gogf/gf/third/golang.org/x/text/internal/stringset" +import "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/stringset" // CLDRVersion is the CLDR version from which the tables in this package are derived. const CLDRVersion = "31" diff --git a/third/golang.org/x/text/internal/number/tables_test.go b/internal/thirdparty/golang.org/x/text/internal/number/tables_test.go similarity index 91% rename from third/golang.org/x/text/internal/number/tables_test.go rename to internal/thirdparty/golang.org/x/text/internal/number/tables_test.go index 22d5be89a..ec38f764a 100644 --- a/third/golang.org/x/text/internal/number/tables_test.go +++ b/internal/thirdparty/golang.org/x/text/internal/number/tables_test.go @@ -10,10 +10,10 @@ import ( "reflect" "testing" - "github.com/gogf/gf/third/golang.org/x/text/internal/gen" - "github.com/gogf/gf/third/golang.org/x/text/internal/testtext" - "github.com/gogf/gf/third/golang.org/x/text/language" - "github.com/gogf/gf/third/golang.org/x/text/unicode/cldr" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/gen" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/testtext" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/language" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/unicode/cldr" ) var draft = flag.String("draft", diff --git a/third/golang.org/x/text/internal/stringset/set.go b/internal/thirdparty/golang.org/x/text/internal/stringset/set.go similarity index 100% rename from third/golang.org/x/text/internal/stringset/set.go rename to internal/thirdparty/golang.org/x/text/internal/stringset/set.go diff --git a/third/golang.org/x/text/internal/stringset/set_test.go b/internal/thirdparty/golang.org/x/text/internal/stringset/set_test.go similarity index 100% rename from third/golang.org/x/text/internal/stringset/set_test.go rename to internal/thirdparty/golang.org/x/text/internal/stringset/set_test.go diff --git a/third/golang.org/x/text/internal/tables.go b/internal/thirdparty/golang.org/x/text/internal/tables.go similarity index 100% rename from third/golang.org/x/text/internal/tables.go rename to internal/thirdparty/golang.org/x/text/internal/tables.go diff --git a/third/golang.org/x/text/internal/tag/tag.go b/internal/thirdparty/golang.org/x/text/internal/tag/tag.go similarity index 96% rename from third/golang.org/x/text/internal/tag/tag.go rename to internal/thirdparty/golang.org/x/text/internal/tag/tag.go index 896f7d1a7..9aac6f1d8 100644 --- a/third/golang.org/x/text/internal/tag/tag.go +++ b/internal/thirdparty/golang.org/x/text/internal/tag/tag.go @@ -3,7 +3,7 @@ // license that can be found in the LICENSE file. // Package tag contains functionality handling tags and related data. -package tag // import "github.com/gogf/gf/third/golang.org/x/text/internal/tag" +package tag // import "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/tag" import "sort" diff --git a/third/golang.org/x/text/internal/tag/tag_test.go b/internal/thirdparty/golang.org/x/text/internal/tag/tag_test.go similarity index 100% rename from third/golang.org/x/text/internal/tag/tag_test.go rename to internal/thirdparty/golang.org/x/text/internal/tag/tag_test.go diff --git a/third/golang.org/x/text/internal/testtext/codesize.go b/internal/thirdparty/golang.org/x/text/internal/testtext/codesize.go similarity index 94% rename from third/golang.org/x/text/internal/testtext/codesize.go rename to internal/thirdparty/golang.org/x/text/internal/testtext/codesize.go index e8876e586..764b426b5 100644 --- a/third/golang.org/x/text/internal/testtext/codesize.go +++ b/internal/thirdparty/golang.org/x/text/internal/testtext/codesize.go @@ -17,7 +17,7 @@ import ( // CodeSize builds the given code sample and returns the binary size or en error // if an error occurred. The code sample typically will look like this: // package main -// import "github.com/gogf/gf/third/golang.org/x/text/somepackage" +// import "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/somepackage" // func main() { // somepackage.Func() // reference Func to cause it to be linked in. // } diff --git a/third/golang.org/x/text/internal/testtext/flag.go b/internal/thirdparty/golang.org/x/text/internal/testtext/flag.go similarity index 88% rename from third/golang.org/x/text/internal/testtext/flag.go rename to internal/thirdparty/golang.org/x/text/internal/testtext/flag.go index c5ef8cf22..37a9d67d8 100644 --- a/third/golang.org/x/text/internal/testtext/flag.go +++ b/internal/thirdparty/golang.org/x/text/internal/testtext/flag.go @@ -8,7 +8,7 @@ import ( "flag" "testing" - "github.com/gogf/gf/third/golang.org/x/text/internal/gen" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/gen" ) var long = flag.Bool("long", false, diff --git a/third/golang.org/x/text/internal/testtext/gc.go b/internal/thirdparty/golang.org/x/text/internal/testtext/gc.go similarity index 100% rename from third/golang.org/x/text/internal/testtext/gc.go rename to internal/thirdparty/golang.org/x/text/internal/testtext/gc.go diff --git a/third/golang.org/x/text/internal/testtext/gccgo.go b/internal/thirdparty/golang.org/x/text/internal/testtext/gccgo.go similarity index 100% rename from third/golang.org/x/text/internal/testtext/gccgo.go rename to internal/thirdparty/golang.org/x/text/internal/testtext/gccgo.go diff --git a/third/golang.org/x/text/internal/testtext/go1_6.go b/internal/thirdparty/golang.org/x/text/internal/testtext/go1_6.go similarity index 100% rename from third/golang.org/x/text/internal/testtext/go1_6.go rename to internal/thirdparty/golang.org/x/text/internal/testtext/go1_6.go diff --git a/third/golang.org/x/text/internal/testtext/go1_7.go b/internal/thirdparty/golang.org/x/text/internal/testtext/go1_7.go similarity index 100% rename from third/golang.org/x/text/internal/testtext/go1_7.go rename to internal/thirdparty/golang.org/x/text/internal/testtext/go1_7.go diff --git a/third/golang.org/x/text/internal/testtext/text.go b/internal/thirdparty/golang.org/x/text/internal/testtext/text.go similarity index 98% rename from third/golang.org/x/text/internal/testtext/text.go rename to internal/thirdparty/golang.org/x/text/internal/testtext/text.go index 4992d4fd4..f2ea95c27 100644 --- a/third/golang.org/x/text/internal/testtext/text.go +++ b/internal/thirdparty/golang.org/x/text/internal/testtext/text.go @@ -4,7 +4,7 @@ // Package testtext contains test data that is of common use to the text // repository. -package testtext // import "github.com/gogf/gf/third/golang.org/x/text/internal/testtext" +package testtext // import "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/testtext" const ( diff --git a/third/golang.org/x/text/internal/triegen/compact.go b/internal/thirdparty/golang.org/x/text/internal/triegen/compact.go similarity index 100% rename from third/golang.org/x/text/internal/triegen/compact.go rename to internal/thirdparty/golang.org/x/text/internal/triegen/compact.go diff --git a/third/golang.org/x/text/internal/triegen/data_test.go b/internal/thirdparty/golang.org/x/text/internal/triegen/data_test.go similarity index 100% rename from third/golang.org/x/text/internal/triegen/data_test.go rename to internal/thirdparty/golang.org/x/text/internal/triegen/data_test.go diff --git a/third/golang.org/x/text/internal/triegen/example_compact_test.go b/internal/thirdparty/golang.org/x/text/internal/triegen/example_compact_test.go similarity index 95% rename from third/golang.org/x/text/internal/triegen/example_compact_test.go rename to internal/thirdparty/golang.org/x/text/internal/triegen/example_compact_test.go index cd7918012..9cb1b1215 100644 --- a/third/golang.org/x/text/internal/triegen/example_compact_test.go +++ b/internal/thirdparty/golang.org/x/text/internal/triegen/example_compact_test.go @@ -9,7 +9,7 @@ import ( "io" "io/ioutil" - "github.com/gogf/gf/third/golang.org/x/text/internal/triegen" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/triegen" ) func ExampleCompacter() { diff --git a/third/golang.org/x/text/internal/triegen/example_test.go b/internal/thirdparty/golang.org/x/text/internal/triegen/example_test.go similarity index 97% rename from third/golang.org/x/text/internal/triegen/example_test.go rename to internal/thirdparty/golang.org/x/text/internal/triegen/example_test.go index ee9da3a6b..7f5b62629 100644 --- a/third/golang.org/x/text/internal/triegen/example_test.go +++ b/internal/thirdparty/golang.org/x/text/internal/triegen/example_test.go @@ -10,7 +10,7 @@ import ( "math/rand" "unicode" - "github.com/gogf/gf/third/golang.org/x/text/internal/triegen" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/triegen" ) const seed = 0x12345 diff --git a/third/golang.org/x/text/internal/triegen/gen_test.go b/internal/thirdparty/golang.org/x/text/internal/triegen/gen_test.go similarity index 100% rename from third/golang.org/x/text/internal/triegen/gen_test.go rename to internal/thirdparty/golang.org/x/text/internal/triegen/gen_test.go diff --git a/third/golang.org/x/text/internal/triegen/print.go b/internal/thirdparty/golang.org/x/text/internal/triegen/print.go similarity index 100% rename from third/golang.org/x/text/internal/triegen/print.go rename to internal/thirdparty/golang.org/x/text/internal/triegen/print.go diff --git a/third/golang.org/x/text/internal/triegen/triegen.go b/internal/thirdparty/golang.org/x/text/internal/triegen/triegen.go similarity index 99% rename from third/golang.org/x/text/internal/triegen/triegen.go rename to internal/thirdparty/golang.org/x/text/internal/triegen/triegen.go index 1a8bac8ed..be1925a8b 100644 --- a/third/golang.org/x/text/internal/triegen/triegen.go +++ b/internal/thirdparty/golang.org/x/text/internal/triegen/triegen.go @@ -55,7 +55,7 @@ // It is recommended that users test the generated trie by checking the returned // value for every rune. Such exhaustive tests are possible as the the number of // runes in Unicode is limited. -package triegen // import "github.com/gogf/gf/third/golang.org/x/text/internal/triegen" +package triegen // import "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/triegen" // TODO: Arguably, the internally optimized data types would not have to be // exposed in the generated API. We could also investigate not generating the diff --git a/third/golang.org/x/text/internal/ucd/example_test.go b/internal/thirdparty/golang.org/x/text/internal/ucd/example_test.go similarity index 97% rename from third/golang.org/x/text/internal/ucd/example_test.go rename to internal/thirdparty/golang.org/x/text/internal/ucd/example_test.go index 132b63d9f..eee0cbba8 100644 --- a/third/golang.org/x/text/internal/ucd/example_test.go +++ b/internal/thirdparty/golang.org/x/text/internal/ucd/example_test.go @@ -8,7 +8,7 @@ import ( "fmt" "strings" - "github.com/gogf/gf/third/golang.org/x/text/internal/ucd" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/ucd" ) func Example() { diff --git a/third/golang.org/x/text/internal/ucd/ucd.go b/internal/thirdparty/golang.org/x/text/internal/ucd/ucd.go similarity index 98% rename from third/golang.org/x/text/internal/ucd/ucd.go rename to internal/thirdparty/golang.org/x/text/internal/ucd/ucd.go index b76d7e950..9d07da45a 100644 --- a/third/golang.org/x/text/internal/ucd/ucd.go +++ b/internal/thirdparty/golang.org/x/text/internal/ucd/ucd.go @@ -7,7 +7,7 @@ // http://www.unicode.org/Public/UCD/latest/ucd/ for example files. // // It currently does not support substitutions of missing fields. -package ucd // import "github.com/gogf/gf/third/golang.org/x/text/internal/ucd" +package ucd // import "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/ucd" import ( "bufio" diff --git a/third/golang.org/x/text/internal/ucd/ucd_test.go b/internal/thirdparty/golang.org/x/text/internal/ucd/ucd_test.go similarity index 100% rename from third/golang.org/x/text/internal/ucd/ucd_test.go rename to internal/thirdparty/golang.org/x/text/internal/ucd/ucd_test.go diff --git a/third/golang.org/x/text/internal/utf8internal/utf8internal.go b/internal/thirdparty/golang.org/x/text/internal/utf8internal/utf8internal.go similarity index 100% rename from third/golang.org/x/text/internal/utf8internal/utf8internal.go rename to internal/thirdparty/golang.org/x/text/internal/utf8internal/utf8internal.go diff --git a/third/golang.org/x/text/runes/cond.go b/internal/thirdparty/golang.org/x/text/runes/cond.go similarity index 98% rename from third/golang.org/x/text/runes/cond.go rename to internal/thirdparty/golang.org/x/text/runes/cond.go index b0b7e85cd..523c9d322 100644 --- a/third/golang.org/x/text/runes/cond.go +++ b/internal/thirdparty/golang.org/x/text/runes/cond.go @@ -7,7 +7,7 @@ package runes import ( "unicode/utf8" - "github.com/gogf/gf/third/golang.org/x/text/transform" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/transform" ) // Note: below we pass invalid UTF-8 to the tIn and tNotIn transformers as is. diff --git a/third/golang.org/x/text/runes/runes.go b/internal/thirdparty/golang.org/x/text/runes/runes.go similarity index 98% rename from third/golang.org/x/text/runes/runes.go rename to internal/thirdparty/golang.org/x/text/runes/runes.go index 987f4d224..bce0cd9d1 100644 --- a/third/golang.org/x/text/runes/runes.go +++ b/internal/thirdparty/golang.org/x/text/runes/runes.go @@ -3,13 +3,13 @@ // license that can be found in the LICENSE file. // Package runes provide transforms for UTF-8 encoded text. -package runes // import "github.com/gogf/gf/third/golang.org/x/text/runes" +package runes // import "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/runes" import ( "unicode" "unicode/utf8" - "github.com/gogf/gf/third/golang.org/x/text/transform" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/transform" ) // A Set is a collection of runes. diff --git a/third/golang.org/x/text/transform/examples_test.go b/internal/thirdparty/golang.org/x/text/transform/examples_test.go similarity index 84% rename from third/golang.org/x/text/transform/examples_test.go rename to internal/thirdparty/golang.org/x/text/transform/examples_test.go index 89b3a24e6..34b92d216 100644 --- a/third/golang.org/x/text/transform/examples_test.go +++ b/internal/thirdparty/golang.org/x/text/transform/examples_test.go @@ -8,8 +8,8 @@ import ( "fmt" "unicode" - "github.com/gogf/gf/third/golang.org/x/text/transform" - "github.com/gogf/gf/third/golang.org/x/text/unicode/norm" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/transform" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/unicode/norm" ) func ExampleRemoveFunc() { diff --git a/third/golang.org/x/text/transform/transform.go b/internal/thirdparty/golang.org/x/text/transform/transform.go similarity index 99% rename from third/golang.org/x/text/transform/transform.go rename to internal/thirdparty/golang.org/x/text/transform/transform.go index 8323fce64..3bb903a41 100644 --- a/third/golang.org/x/text/transform/transform.go +++ b/internal/thirdparty/golang.org/x/text/transform/transform.go @@ -6,7 +6,7 @@ // bytes passing through as well as various transformations. Example // transformations provided by other packages include normalization and // conversion between character sets. -package transform // import "github.com/gogf/gf/third/golang.org/x/text/transform" +package transform // import "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/transform" import ( "bytes" diff --git a/third/golang.org/x/text/transform/transform_test.go b/internal/thirdparty/golang.org/x/text/transform/transform_test.go similarity index 99% rename from third/golang.org/x/text/transform/transform_test.go rename to internal/thirdparty/golang.org/x/text/transform/transform_test.go index ef28af74f..2b8f4f9a5 100644 --- a/third/golang.org/x/text/transform/transform_test.go +++ b/internal/thirdparty/golang.org/x/text/transform/transform_test.go @@ -15,7 +15,7 @@ import ( "time" "unicode/utf8" - "github.com/gogf/gf/third/golang.org/x/text/internal/testtext" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/testtext" ) type lowerCaseASCII struct{ NopResetter } diff --git a/third/golang.org/x/text/unicode/bidi/bidi.go b/internal/thirdparty/golang.org/x/text/unicode/bidi/bidi.go similarity index 98% rename from third/golang.org/x/text/unicode/bidi/bidi.go rename to internal/thirdparty/golang.org/x/text/unicode/bidi/bidi.go index 3000a2571..80f8a8398 100644 --- a/third/golang.org/x/text/unicode/bidi/bidi.go +++ b/internal/thirdparty/golang.org/x/text/unicode/bidi/bidi.go @@ -10,7 +10,7 @@ // // NOTE: UNDER CONSTRUCTION. This API may change in backwards incompatible ways // and without notice. -package bidi // import "github.com/gogf/gf/third/golang.org/x/text/unicode/bidi" +package bidi // import "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/unicode/bidi" // TODO: // The following functionality would not be hard to implement, but hinges on diff --git a/third/golang.org/x/text/unicode/bidi/bracket.go b/internal/thirdparty/golang.org/x/text/unicode/bidi/bracket.go similarity index 100% rename from third/golang.org/x/text/unicode/bidi/bracket.go rename to internal/thirdparty/golang.org/x/text/unicode/bidi/bracket.go diff --git a/third/golang.org/x/text/unicode/bidi/core.go b/internal/thirdparty/golang.org/x/text/unicode/bidi/core.go similarity index 100% rename from third/golang.org/x/text/unicode/bidi/core.go rename to internal/thirdparty/golang.org/x/text/unicode/bidi/core.go diff --git a/third/golang.org/x/text/unicode/bidi/core_test.go b/internal/thirdparty/golang.org/x/text/unicode/bidi/core_test.go similarity index 95% rename from third/golang.org/x/text/unicode/bidi/core_test.go rename to internal/thirdparty/golang.org/x/text/unicode/bidi/core_test.go index 3a04d6ee1..02f0b8d13 100644 --- a/third/golang.org/x/text/unicode/bidi/core_test.go +++ b/internal/thirdparty/golang.org/x/text/unicode/bidi/core_test.go @@ -12,10 +12,10 @@ import ( "strings" "testing" - "github.com/gogf/gf/third/golang.org/x/text/internal/gen" - "github.com/gogf/gf/third/golang.org/x/text/internal/testtext" - "github.com/gogf/gf/third/golang.org/x/text/internal/ucd" - "github.com/gogf/gf/third/golang.org/x/text/unicode/norm" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/gen" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/testtext" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/ucd" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/unicode/norm" ) var testLevels = flag.Bool("levels", false, "enable testing of levels") diff --git a/third/golang.org/x/text/unicode/bidi/gen.go b/internal/thirdparty/golang.org/x/text/unicode/bidi/gen.go similarity index 92% rename from third/golang.org/x/text/unicode/bidi/gen.go rename to internal/thirdparty/golang.org/x/text/unicode/bidi/gen.go index 7f0a9ea07..2987e07a7 100644 --- a/third/golang.org/x/text/unicode/bidi/gen.go +++ b/internal/thirdparty/golang.org/x/text/unicode/bidi/gen.go @@ -10,9 +10,9 @@ import ( "flag" "log" - "github.com/gogf/gf/third/golang.org/x/text/internal/gen" - "github.com/gogf/gf/third/golang.org/x/text/internal/triegen" - "github.com/gogf/gf/third/golang.org/x/text/internal/ucd" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/gen" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/triegen" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/ucd" ) var outputFile = flag.String("out", "tables.go", "output file") diff --git a/third/golang.org/x/text/unicode/bidi/gen_ranges.go b/internal/thirdparty/golang.org/x/text/unicode/bidi/gen_ranges.go similarity index 86% rename from third/golang.org/x/text/unicode/bidi/gen_ranges.go rename to internal/thirdparty/golang.org/x/text/unicode/bidi/gen_ranges.go index b25e7f0df..2016019a2 100644 --- a/third/golang.org/x/text/unicode/bidi/gen_ranges.go +++ b/internal/thirdparty/golang.org/x/text/unicode/bidi/gen_ranges.go @@ -9,9 +9,9 @@ package main import ( "unicode" - "github.com/gogf/gf/third/golang.org/x/text/internal/gen" - "github.com/gogf/gf/third/golang.org/x/text/internal/ucd" - "github.com/gogf/gf/third/golang.org/x/text/unicode/rangetable" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/gen" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/ucd" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/unicode/rangetable" ) // These tables are hand-extracted from: diff --git a/third/golang.org/x/text/unicode/bidi/gen_trieval.go b/internal/thirdparty/golang.org/x/text/unicode/bidi/gen_trieval.go similarity index 100% rename from third/golang.org/x/text/unicode/bidi/gen_trieval.go rename to internal/thirdparty/golang.org/x/text/unicode/bidi/gen_trieval.go diff --git a/third/golang.org/x/text/unicode/bidi/prop.go b/internal/thirdparty/golang.org/x/text/unicode/bidi/prop.go similarity index 100% rename from third/golang.org/x/text/unicode/bidi/prop.go rename to internal/thirdparty/golang.org/x/text/unicode/bidi/prop.go diff --git a/third/golang.org/x/text/unicode/bidi/ranges_test.go b/internal/thirdparty/golang.org/x/text/unicode/bidi/ranges_test.go similarity index 85% rename from third/golang.org/x/text/unicode/bidi/ranges_test.go rename to internal/thirdparty/golang.org/x/text/unicode/bidi/ranges_test.go index 2a866b217..c2ff2b961 100644 --- a/third/golang.org/x/text/unicode/bidi/ranges_test.go +++ b/internal/thirdparty/golang.org/x/text/unicode/bidi/ranges_test.go @@ -5,9 +5,9 @@ package bidi import ( "unicode" - "github.com/gogf/gf/third/golang.org/x/text/internal/gen" - "github.com/gogf/gf/third/golang.org/x/text/internal/ucd" - "github.com/gogf/gf/third/golang.org/x/text/unicode/rangetable" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/gen" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/ucd" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/unicode/rangetable" ) // These tables are hand-extracted from: diff --git a/third/golang.org/x/text/unicode/bidi/tables.go b/internal/thirdparty/golang.org/x/text/unicode/bidi/tables.go similarity index 100% rename from third/golang.org/x/text/unicode/bidi/tables.go rename to internal/thirdparty/golang.org/x/text/unicode/bidi/tables.go diff --git a/third/golang.org/x/text/unicode/bidi/tables_test.go b/internal/thirdparty/golang.org/x/text/unicode/bidi/tables_test.go similarity index 87% rename from third/golang.org/x/text/unicode/bidi/tables_test.go rename to internal/thirdparty/golang.org/x/text/unicode/bidi/tables_test.go index f20cd2c8e..7b945b5db 100644 --- a/third/golang.org/x/text/unicode/bidi/tables_test.go +++ b/internal/thirdparty/golang.org/x/text/unicode/bidi/tables_test.go @@ -7,9 +7,9 @@ package bidi import ( "testing" - "github.com/gogf/gf/third/golang.org/x/text/internal/gen" - "github.com/gogf/gf/third/golang.org/x/text/internal/testtext" - "github.com/gogf/gf/third/golang.org/x/text/internal/ucd" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/gen" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/testtext" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/ucd" ) var labels = []string{ diff --git a/third/golang.org/x/text/unicode/bidi/trieval.go b/internal/thirdparty/golang.org/x/text/unicode/bidi/trieval.go similarity index 100% rename from third/golang.org/x/text/unicode/bidi/trieval.go rename to internal/thirdparty/golang.org/x/text/unicode/bidi/trieval.go diff --git a/third/golang.org/x/text/unicode/cldr/base.go b/internal/thirdparty/golang.org/x/text/unicode/cldr/base.go similarity index 100% rename from third/golang.org/x/text/unicode/cldr/base.go rename to internal/thirdparty/golang.org/x/text/unicode/cldr/base.go diff --git a/third/golang.org/x/text/unicode/cldr/cldr.go b/internal/thirdparty/golang.org/x/text/unicode/cldr/cldr.go similarity index 97% rename from third/golang.org/x/text/unicode/cldr/cldr.go rename to internal/thirdparty/golang.org/x/text/unicode/cldr/cldr.go index 473258c3e..e7079223a 100644 --- a/third/golang.org/x/text/unicode/cldr/cldr.go +++ b/internal/thirdparty/golang.org/x/text/unicode/cldr/cldr.go @@ -14,7 +14,7 @@ // may have moved or changed. // CLDR version 22 is the first version supported by this package. // Older versions may not work. -package cldr // import "github.com/gogf/gf/third/golang.org/x/text/unicode/cldr" +package cldr // import "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/unicode/cldr" import ( "fmt" diff --git a/third/golang.org/x/text/unicode/cldr/cldr_test.go b/internal/thirdparty/golang.org/x/text/unicode/cldr/cldr_test.go similarity index 100% rename from third/golang.org/x/text/unicode/cldr/cldr_test.go rename to internal/thirdparty/golang.org/x/text/unicode/cldr/cldr_test.go diff --git a/third/golang.org/x/text/unicode/cldr/collate.go b/internal/thirdparty/golang.org/x/text/unicode/cldr/collate.go similarity index 100% rename from third/golang.org/x/text/unicode/cldr/collate.go rename to internal/thirdparty/golang.org/x/text/unicode/cldr/collate.go diff --git a/third/golang.org/x/text/unicode/cldr/collate_test.go b/internal/thirdparty/golang.org/x/text/unicode/cldr/collate_test.go similarity index 100% rename from third/golang.org/x/text/unicode/cldr/collate_test.go rename to internal/thirdparty/golang.org/x/text/unicode/cldr/collate_test.go diff --git a/third/golang.org/x/text/unicode/cldr/data_test.go b/internal/thirdparty/golang.org/x/text/unicode/cldr/data_test.go similarity index 100% rename from third/golang.org/x/text/unicode/cldr/data_test.go rename to internal/thirdparty/golang.org/x/text/unicode/cldr/data_test.go diff --git a/third/golang.org/x/text/unicode/cldr/decode.go b/internal/thirdparty/golang.org/x/text/unicode/cldr/decode.go similarity index 100% rename from third/golang.org/x/text/unicode/cldr/decode.go rename to internal/thirdparty/golang.org/x/text/unicode/cldr/decode.go diff --git a/third/golang.org/x/text/unicode/cldr/examples_test.go b/internal/thirdparty/golang.org/x/text/unicode/cldr/examples_test.go similarity index 83% rename from third/golang.org/x/text/unicode/cldr/examples_test.go rename to internal/thirdparty/golang.org/x/text/unicode/cldr/examples_test.go index 834e1602e..6dd57e288 100644 --- a/third/golang.org/x/text/unicode/cldr/examples_test.go +++ b/internal/thirdparty/golang.org/x/text/unicode/cldr/examples_test.go @@ -3,7 +3,7 @@ package cldr_test import ( "fmt" - "github.com/gogf/gf/third/golang.org/x/text/unicode/cldr" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/unicode/cldr" ) func ExampleSlice() { diff --git a/third/golang.org/x/text/unicode/cldr/makexml.go b/internal/thirdparty/golang.org/x/text/unicode/cldr/makexml.go similarity index 99% rename from third/golang.org/x/text/unicode/cldr/makexml.go rename to internal/thirdparty/golang.org/x/text/unicode/cldr/makexml.go index 033698b1f..9d5b5b980 100644 --- a/third/golang.org/x/text/unicode/cldr/makexml.go +++ b/internal/thirdparty/golang.org/x/text/unicode/cldr/makexml.go @@ -20,7 +20,7 @@ import ( "regexp" "strings" - "github.com/gogf/gf/third/golang.org/x/text/internal/gen" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/gen" ) var outputFile = flag.String("output", "xml.go", "output file name") diff --git a/third/golang.org/x/text/unicode/cldr/resolve.go b/internal/thirdparty/golang.org/x/text/unicode/cldr/resolve.go similarity index 100% rename from third/golang.org/x/text/unicode/cldr/resolve.go rename to internal/thirdparty/golang.org/x/text/unicode/cldr/resolve.go diff --git a/third/golang.org/x/text/unicode/cldr/resolve_test.go b/internal/thirdparty/golang.org/x/text/unicode/cldr/resolve_test.go similarity index 100% rename from third/golang.org/x/text/unicode/cldr/resolve_test.go rename to internal/thirdparty/golang.org/x/text/unicode/cldr/resolve_test.go diff --git a/third/golang.org/x/text/unicode/cldr/slice.go b/internal/thirdparty/golang.org/x/text/unicode/cldr/slice.go similarity index 100% rename from third/golang.org/x/text/unicode/cldr/slice.go rename to internal/thirdparty/golang.org/x/text/unicode/cldr/slice.go diff --git a/third/golang.org/x/text/unicode/cldr/slice_test.go b/internal/thirdparty/golang.org/x/text/unicode/cldr/slice_test.go similarity index 100% rename from third/golang.org/x/text/unicode/cldr/slice_test.go rename to internal/thirdparty/golang.org/x/text/unicode/cldr/slice_test.go diff --git a/third/golang.org/x/text/unicode/cldr/xml.go b/internal/thirdparty/golang.org/x/text/unicode/cldr/xml.go similarity index 100% rename from third/golang.org/x/text/unicode/cldr/xml.go rename to internal/thirdparty/golang.org/x/text/unicode/cldr/xml.go diff --git a/third/golang.org/x/text/unicode/doc.go b/internal/thirdparty/golang.org/x/text/unicode/doc.go similarity index 100% rename from third/golang.org/x/text/unicode/doc.go rename to internal/thirdparty/golang.org/x/text/unicode/doc.go diff --git a/third/golang.org/x/text/unicode/norm/composition.go b/internal/thirdparty/golang.org/x/text/unicode/norm/composition.go similarity index 100% rename from third/golang.org/x/text/unicode/norm/composition.go rename to internal/thirdparty/golang.org/x/text/unicode/norm/composition.go diff --git a/third/golang.org/x/text/unicode/norm/composition_test.go b/internal/thirdparty/golang.org/x/text/unicode/norm/composition_test.go similarity index 100% rename from third/golang.org/x/text/unicode/norm/composition_test.go rename to internal/thirdparty/golang.org/x/text/unicode/norm/composition_test.go diff --git a/third/golang.org/x/text/unicode/norm/example_iter_test.go b/internal/thirdparty/golang.org/x/text/unicode/norm/example_iter_test.go similarity index 96% rename from third/golang.org/x/text/unicode/norm/example_iter_test.go rename to internal/thirdparty/golang.org/x/text/unicode/norm/example_iter_test.go index e15c7c158..eb3c8aa9e 100644 --- a/third/golang.org/x/text/unicode/norm/example_iter_test.go +++ b/internal/thirdparty/golang.org/x/text/unicode/norm/example_iter_test.go @@ -9,7 +9,7 @@ import ( "fmt" "unicode/utf8" - "github.com/gogf/gf/third/golang.org/x/text/unicode/norm" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/unicode/norm" ) // EqualSimple uses a norm.Iter to compare two non-normalized diff --git a/third/golang.org/x/text/unicode/norm/example_test.go b/internal/thirdparty/golang.org/x/text/unicode/norm/example_test.go similarity index 86% rename from third/golang.org/x/text/unicode/norm/example_test.go rename to internal/thirdparty/golang.org/x/text/unicode/norm/example_test.go index 106609ab0..a4c8d43cf 100644 --- a/third/golang.org/x/text/unicode/norm/example_test.go +++ b/internal/thirdparty/golang.org/x/text/unicode/norm/example_test.go @@ -7,7 +7,7 @@ package norm_test import ( "fmt" - "github.com/gogf/gf/third/golang.org/x/text/unicode/norm" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/unicode/norm" ) func ExampleForm_NextBoundary() { diff --git a/third/golang.org/x/text/unicode/norm/forminfo.go b/internal/thirdparty/golang.org/x/text/unicode/norm/forminfo.go similarity index 100% rename from third/golang.org/x/text/unicode/norm/forminfo.go rename to internal/thirdparty/golang.org/x/text/unicode/norm/forminfo.go diff --git a/third/golang.org/x/text/unicode/norm/forminfo_test.go b/internal/thirdparty/golang.org/x/text/unicode/norm/forminfo_test.go similarity index 100% rename from third/golang.org/x/text/unicode/norm/forminfo_test.go rename to internal/thirdparty/golang.org/x/text/unicode/norm/forminfo_test.go diff --git a/third/golang.org/x/text/unicode/norm/input.go b/internal/thirdparty/golang.org/x/text/unicode/norm/input.go similarity index 100% rename from third/golang.org/x/text/unicode/norm/input.go rename to internal/thirdparty/golang.org/x/text/unicode/norm/input.go diff --git a/third/golang.org/x/text/unicode/norm/iter.go b/internal/thirdparty/golang.org/x/text/unicode/norm/iter.go similarity index 100% rename from third/golang.org/x/text/unicode/norm/iter.go rename to internal/thirdparty/golang.org/x/text/unicode/norm/iter.go diff --git a/third/golang.org/x/text/unicode/norm/iter_test.go b/internal/thirdparty/golang.org/x/text/unicode/norm/iter_test.go similarity index 100% rename from third/golang.org/x/text/unicode/norm/iter_test.go rename to internal/thirdparty/golang.org/x/text/unicode/norm/iter_test.go diff --git a/third/golang.org/x/text/unicode/norm/maketables.go b/internal/thirdparty/golang.org/x/text/unicode/norm/maketables.go similarity index 99% rename from third/golang.org/x/text/unicode/norm/maketables.go rename to internal/thirdparty/golang.org/x/text/unicode/norm/maketables.go index 302056fee..ea655f77f 100644 --- a/third/golang.org/x/text/unicode/norm/maketables.go +++ b/internal/thirdparty/golang.org/x/text/unicode/norm/maketables.go @@ -20,9 +20,9 @@ import ( "strconv" "strings" - "github.com/gogf/gf/third/golang.org/x/text/internal/gen" - "github.com/gogf/gf/third/golang.org/x/text/internal/triegen" - "github.com/gogf/gf/third/golang.org/x/text/internal/ucd" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/gen" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/triegen" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/ucd" ) func main() { diff --git a/third/golang.org/x/text/unicode/norm/normalize.go b/internal/thirdparty/golang.org/x/text/unicode/norm/normalize.go similarity index 98% rename from third/golang.org/x/text/unicode/norm/normalize.go rename to internal/thirdparty/golang.org/x/text/unicode/norm/normalize.go index 861459e69..e806d6129 100644 --- a/third/golang.org/x/text/unicode/norm/normalize.go +++ b/internal/thirdparty/golang.org/x/text/unicode/norm/normalize.go @@ -7,12 +7,12 @@ //go:generate go test -tags test // Package norm contains types and functions for normalizing Unicode strings. -package norm // import "github.com/gogf/gf/third/golang.org/x/text/unicode/norm" +package norm // import "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/unicode/norm" import ( "unicode/utf8" - "github.com/gogf/gf/third/golang.org/x/text/transform" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/transform" ) // A Form denotes a canonical representation of Unicode code points. diff --git a/third/golang.org/x/text/unicode/norm/normalize_test.go b/internal/thirdparty/golang.org/x/text/unicode/norm/normalize_test.go similarity index 99% rename from third/golang.org/x/text/unicode/norm/normalize_test.go rename to internal/thirdparty/golang.org/x/text/unicode/norm/normalize_test.go index d9a0714f5..527d82546 100644 --- a/third/golang.org/x/text/unicode/norm/normalize_test.go +++ b/internal/thirdparty/golang.org/x/text/unicode/norm/normalize_test.go @@ -14,8 +14,8 @@ import ( "testing" "unicode/utf8" - "github.com/gogf/gf/third/golang.org/x/text/internal/testtext" - "github.com/gogf/gf/third/golang.org/x/text/transform" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/testtext" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/transform" ) var ( @@ -924,7 +924,7 @@ func TestLinking(t *testing.T) { const prog = ` package main import "fmt" - import "github.com/gogf/gf/third/golang.org/x/text/unicode/norm" + import "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/unicode/norm" func main() { fmt.Println(norm.%s) } ` baseline, errB := testtext.CodeSize(fmt.Sprintf(prog, "MaxSegmentSize")) diff --git a/third/golang.org/x/text/unicode/norm/readwriter.go b/internal/thirdparty/golang.org/x/text/unicode/norm/readwriter.go similarity index 100% rename from third/golang.org/x/text/unicode/norm/readwriter.go rename to internal/thirdparty/golang.org/x/text/unicode/norm/readwriter.go diff --git a/third/golang.org/x/text/unicode/norm/readwriter_test.go b/internal/thirdparty/golang.org/x/text/unicode/norm/readwriter_test.go similarity index 100% rename from third/golang.org/x/text/unicode/norm/readwriter_test.go rename to internal/thirdparty/golang.org/x/text/unicode/norm/readwriter_test.go diff --git a/third/golang.org/x/text/unicode/norm/tables.go b/internal/thirdparty/golang.org/x/text/unicode/norm/tables.go similarity index 100% rename from third/golang.org/x/text/unicode/norm/tables.go rename to internal/thirdparty/golang.org/x/text/unicode/norm/tables.go diff --git a/third/golang.org/x/text/unicode/norm/transform.go b/internal/thirdparty/golang.org/x/text/unicode/norm/transform.go similarity index 97% rename from third/golang.org/x/text/unicode/norm/transform.go rename to internal/thirdparty/golang.org/x/text/unicode/norm/transform.go index be60fdb7e..a4b1c6228 100644 --- a/third/golang.org/x/text/unicode/norm/transform.go +++ b/internal/thirdparty/golang.org/x/text/unicode/norm/transform.go @@ -7,7 +7,7 @@ package norm import ( "unicode/utf8" - "github.com/gogf/gf/third/golang.org/x/text/transform" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/transform" ) // Reset implements the Reset method of the transform.Transformer interface. diff --git a/third/golang.org/x/text/unicode/norm/transform_test.go b/internal/thirdparty/golang.org/x/text/unicode/norm/transform_test.go similarity index 97% rename from third/golang.org/x/text/unicode/norm/transform_test.go rename to internal/thirdparty/golang.org/x/text/unicode/norm/transform_test.go index 27a167362..edb2134e7 100644 --- a/third/golang.org/x/text/unicode/norm/transform_test.go +++ b/internal/thirdparty/golang.org/x/text/unicode/norm/transform_test.go @@ -8,7 +8,7 @@ import ( "fmt" "testing" - "github.com/gogf/gf/third/golang.org/x/text/transform" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/transform" ) func TestTransform(t *testing.T) { diff --git a/third/golang.org/x/text/unicode/norm/trie.go b/internal/thirdparty/golang.org/x/text/unicode/norm/trie.go similarity index 100% rename from third/golang.org/x/text/unicode/norm/trie.go rename to internal/thirdparty/golang.org/x/text/unicode/norm/trie.go diff --git a/third/golang.org/x/text/unicode/norm/triegen.go b/internal/thirdparty/golang.org/x/text/unicode/norm/triegen.go similarity index 100% rename from third/golang.org/x/text/unicode/norm/triegen.go rename to internal/thirdparty/golang.org/x/text/unicode/norm/triegen.go diff --git a/third/golang.org/x/text/unicode/norm/ucd_test.go b/internal/thirdparty/golang.org/x/text/unicode/norm/ucd_test.go similarity index 97% rename from third/golang.org/x/text/unicode/norm/ucd_test.go rename to internal/thirdparty/golang.org/x/text/unicode/norm/ucd_test.go index 56da6f014..346ffe5c9 100644 --- a/third/golang.org/x/text/unicode/norm/ucd_test.go +++ b/internal/thirdparty/golang.org/x/text/unicode/norm/ucd_test.go @@ -17,8 +17,8 @@ import ( "time" "unicode/utf8" - "github.com/gogf/gf/third/golang.org/x/text/internal/gen" - "github.com/gogf/gf/third/golang.org/x/text/internal/testtext" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/gen" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/testtext" ) var once sync.Once diff --git a/third/golang.org/x/text/unicode/rangetable/gen.go b/internal/thirdparty/golang.org/x/text/unicode/rangetable/gen.go similarity index 88% rename from third/golang.org/x/text/unicode/rangetable/gen.go rename to internal/thirdparty/golang.org/x/text/unicode/rangetable/gen.go index 12153632f..eb61ba412 100644 --- a/third/golang.org/x/text/unicode/rangetable/gen.go +++ b/internal/thirdparty/golang.org/x/text/unicode/rangetable/gen.go @@ -16,11 +16,11 @@ import ( "strings" "unicode" - "github.com/gogf/gf/third/golang.org/x/text/collate" - "github.com/gogf/gf/third/golang.org/x/text/internal/gen" - "github.com/gogf/gf/third/golang.org/x/text/internal/ucd" - "github.com/gogf/gf/third/golang.org/x/text/language" - "github.com/gogf/gf/third/golang.org/x/text/unicode/rangetable" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/collate" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/gen" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/ucd" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/language" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/unicode/rangetable" ) var versionList = flag.String("versions", "", diff --git a/third/golang.org/x/text/unicode/rangetable/merge.go b/internal/thirdparty/golang.org/x/text/unicode/rangetable/merge.go similarity index 100% rename from third/golang.org/x/text/unicode/rangetable/merge.go rename to internal/thirdparty/golang.org/x/text/unicode/rangetable/merge.go diff --git a/third/golang.org/x/text/unicode/rangetable/merge_test.go b/internal/thirdparty/golang.org/x/text/unicode/rangetable/merge_test.go similarity index 100% rename from third/golang.org/x/text/unicode/rangetable/merge_test.go rename to internal/thirdparty/golang.org/x/text/unicode/rangetable/merge_test.go diff --git a/third/golang.org/x/text/unicode/rangetable/rangetable.go b/internal/thirdparty/golang.org/x/text/unicode/rangetable/rangetable.go similarity index 100% rename from third/golang.org/x/text/unicode/rangetable/rangetable.go rename to internal/thirdparty/golang.org/x/text/unicode/rangetable/rangetable.go diff --git a/third/golang.org/x/text/unicode/rangetable/rangetable_test.go b/internal/thirdparty/golang.org/x/text/unicode/rangetable/rangetable_test.go similarity index 100% rename from third/golang.org/x/text/unicode/rangetable/rangetable_test.go rename to internal/thirdparty/golang.org/x/text/unicode/rangetable/rangetable_test.go diff --git a/third/golang.org/x/text/unicode/rangetable/tables.go b/internal/thirdparty/golang.org/x/text/unicode/rangetable/tables.go similarity index 100% rename from third/golang.org/x/text/unicode/rangetable/tables.go rename to internal/thirdparty/golang.org/x/text/unicode/rangetable/tables.go diff --git a/third/golang.org/x/text/unicode/runenames/bits.go b/internal/thirdparty/golang.org/x/text/unicode/runenames/bits.go similarity index 100% rename from third/golang.org/x/text/unicode/runenames/bits.go rename to internal/thirdparty/golang.org/x/text/unicode/runenames/bits.go diff --git a/third/golang.org/x/text/unicode/runenames/example_test.go b/internal/thirdparty/golang.org/x/text/unicode/runenames/example_test.go similarity index 96% rename from third/golang.org/x/text/unicode/runenames/example_test.go rename to internal/thirdparty/golang.org/x/text/unicode/runenames/example_test.go index 2b8248eee..f8dd5ebc5 100644 --- a/third/golang.org/x/text/unicode/runenames/example_test.go +++ b/internal/thirdparty/golang.org/x/text/unicode/runenames/example_test.go @@ -7,7 +7,7 @@ package runenames_test import ( "fmt" - "github.com/gogf/gf/third/golang.org/x/text/unicode/runenames" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/unicode/runenames" ) func Example() { diff --git a/third/golang.org/x/text/unicode/runenames/gen.go b/internal/thirdparty/golang.org/x/text/unicode/runenames/gen.go similarity index 96% rename from third/golang.org/x/text/unicode/runenames/gen.go rename to internal/thirdparty/golang.org/x/text/unicode/runenames/gen.go index 8a40f22d1..ca9c7bdf5 100644 --- a/third/golang.org/x/text/unicode/runenames/gen.go +++ b/internal/thirdparty/golang.org/x/text/unicode/runenames/gen.go @@ -11,8 +11,8 @@ import ( "strings" "unicode" - "github.com/gogf/gf/third/golang.org/x/text/internal/gen" - "github.com/gogf/gf/third/golang.org/x/text/internal/ucd" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/gen" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/ucd" ) // snippet is a slice of data; data is the concatenation of all of the names. diff --git a/third/golang.org/x/text/unicode/runenames/gen_bits.go b/internal/thirdparty/golang.org/x/text/unicode/runenames/gen_bits.go similarity index 100% rename from third/golang.org/x/text/unicode/runenames/gen_bits.go rename to internal/thirdparty/golang.org/x/text/unicode/runenames/gen_bits.go diff --git a/third/golang.org/x/text/unicode/runenames/runenames.go b/internal/thirdparty/golang.org/x/text/unicode/runenames/runenames.go similarity index 100% rename from third/golang.org/x/text/unicode/runenames/runenames.go rename to internal/thirdparty/golang.org/x/text/unicode/runenames/runenames.go diff --git a/third/golang.org/x/text/unicode/runenames/runenames_test.go b/internal/thirdparty/golang.org/x/text/unicode/runenames/runenames_test.go similarity index 78% rename from third/golang.org/x/text/unicode/runenames/runenames_test.go rename to internal/thirdparty/golang.org/x/text/unicode/runenames/runenames_test.go index 32881c346..bc2259ef0 100644 --- a/third/golang.org/x/text/unicode/runenames/runenames_test.go +++ b/internal/thirdparty/golang.org/x/text/unicode/runenames/runenames_test.go @@ -9,9 +9,9 @@ import ( "testing" "unicode" - "github.com/gogf/gf/third/golang.org/x/text/internal/gen" - "github.com/gogf/gf/third/golang.org/x/text/internal/testtext" - "github.com/gogf/gf/third/golang.org/x/text/internal/ucd" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/gen" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/testtext" + "github.com/gogf/gf/internal/thirdparty/golang.org/x/text/internal/ucd" ) func TestName(t *testing.T) { diff --git a/third/golang.org/x/text/unicode/runenames/tables.go b/internal/thirdparty/golang.org/x/text/unicode/runenames/tables.go similarity index 100% rename from third/golang.org/x/text/unicode/runenames/tables.go rename to internal/thirdparty/golang.org/x/text/unicode/runenames/tables.go diff --git a/third/gopkg.in/yaml.v2/.travis.yml b/internal/thirdparty/gopkg.in/yaml.v2/.travis.yml similarity index 100% rename from third/gopkg.in/yaml.v2/.travis.yml rename to internal/thirdparty/gopkg.in/yaml.v2/.travis.yml diff --git a/third/gopkg.in/yaml.v2/LICENSE b/internal/thirdparty/gopkg.in/yaml.v2/LICENSE similarity index 100% rename from third/gopkg.in/yaml.v2/LICENSE rename to internal/thirdparty/gopkg.in/yaml.v2/LICENSE diff --git a/third/gopkg.in/yaml.v2/LICENSE.libyaml b/internal/thirdparty/gopkg.in/yaml.v2/LICENSE.libyaml similarity index 100% rename from third/gopkg.in/yaml.v2/LICENSE.libyaml rename to internal/thirdparty/gopkg.in/yaml.v2/LICENSE.libyaml diff --git a/third/gopkg.in/yaml.v2/README.md b/internal/thirdparty/gopkg.in/yaml.v2/README.md similarity index 97% rename from third/gopkg.in/yaml.v2/README.md rename to internal/thirdparty/gopkg.in/yaml.v2/README.md index d27f63aaa..74ab87181 100755 --- a/third/gopkg.in/yaml.v2/README.md +++ b/internal/thirdparty/gopkg.in/yaml.v2/README.md @@ -57,7 +57,7 @@ import ( "fmt" "log" - "github.com/gogf/gf/third/gopkg.in/yaml.v2" + "github.com/gogf/gf/internal/thirdparty/gopkg.in/yaml.v2" ) var data = ` diff --git a/third/gopkg.in/yaml.v2/apic.go b/internal/thirdparty/gopkg.in/yaml.v2/apic.go similarity index 100% rename from third/gopkg.in/yaml.v2/apic.go rename to internal/thirdparty/gopkg.in/yaml.v2/apic.go diff --git a/third/gopkg.in/yaml.v2/decode.go b/internal/thirdparty/gopkg.in/yaml.v2/decode.go similarity index 100% rename from third/gopkg.in/yaml.v2/decode.go rename to internal/thirdparty/gopkg.in/yaml.v2/decode.go diff --git a/third/gopkg.in/yaml.v2/emitterc.go b/internal/thirdparty/gopkg.in/yaml.v2/emitterc.go similarity index 100% rename from third/gopkg.in/yaml.v2/emitterc.go rename to internal/thirdparty/gopkg.in/yaml.v2/emitterc.go diff --git a/third/gopkg.in/yaml.v2/encode.go b/internal/thirdparty/gopkg.in/yaml.v2/encode.go similarity index 100% rename from third/gopkg.in/yaml.v2/encode.go rename to internal/thirdparty/gopkg.in/yaml.v2/encode.go diff --git a/third/gopkg.in/yaml.v2/parserc.go b/internal/thirdparty/gopkg.in/yaml.v2/parserc.go similarity index 100% rename from third/gopkg.in/yaml.v2/parserc.go rename to internal/thirdparty/gopkg.in/yaml.v2/parserc.go diff --git a/third/gopkg.in/yaml.v2/readerc.go b/internal/thirdparty/gopkg.in/yaml.v2/readerc.go similarity index 100% rename from third/gopkg.in/yaml.v2/readerc.go rename to internal/thirdparty/gopkg.in/yaml.v2/readerc.go diff --git a/third/gopkg.in/yaml.v2/resolve.go b/internal/thirdparty/gopkg.in/yaml.v2/resolve.go similarity index 100% rename from third/gopkg.in/yaml.v2/resolve.go rename to internal/thirdparty/gopkg.in/yaml.v2/resolve.go diff --git a/third/gopkg.in/yaml.v2/scannerc.go b/internal/thirdparty/gopkg.in/yaml.v2/scannerc.go similarity index 100% rename from third/gopkg.in/yaml.v2/scannerc.go rename to internal/thirdparty/gopkg.in/yaml.v2/scannerc.go diff --git a/third/gopkg.in/yaml.v2/sorter.go b/internal/thirdparty/gopkg.in/yaml.v2/sorter.go similarity index 100% rename from third/gopkg.in/yaml.v2/sorter.go rename to internal/thirdparty/gopkg.in/yaml.v2/sorter.go diff --git a/third/gopkg.in/yaml.v2/writerc.go b/internal/thirdparty/gopkg.in/yaml.v2/writerc.go similarity index 100% rename from third/gopkg.in/yaml.v2/writerc.go rename to internal/thirdparty/gopkg.in/yaml.v2/writerc.go diff --git a/third/gopkg.in/yaml.v2/yaml.go b/internal/thirdparty/gopkg.in/yaml.v2/yaml.go similarity index 100% rename from third/gopkg.in/yaml.v2/yaml.go rename to internal/thirdparty/gopkg.in/yaml.v2/yaml.go diff --git a/third/gopkg.in/yaml.v2/yamlh.go b/internal/thirdparty/gopkg.in/yaml.v2/yamlh.go similarity index 100% rename from third/gopkg.in/yaml.v2/yamlh.go rename to internal/thirdparty/gopkg.in/yaml.v2/yamlh.go diff --git a/third/gopkg.in/yaml.v2/yamlprivateh.go b/internal/thirdparty/gopkg.in/yaml.v2/yamlprivateh.go similarity index 100% rename from third/gopkg.in/yaml.v2/yamlprivateh.go rename to internal/thirdparty/gopkg.in/yaml.v2/yamlprivateh.go diff --git a/g/net/ghttp/ghttp.go b/net/ghttp/ghttp.go similarity index 100% rename from g/net/ghttp/ghttp.go rename to net/ghttp/ghttp.go diff --git a/g/net/ghttp/ghttp_client_api.go b/net/ghttp/ghttp_client_api.go similarity index 100% rename from g/net/ghttp/ghttp_client_api.go rename to net/ghttp/ghttp_client_api.go diff --git a/g/net/ghttp/ghttp_client_bytes.go b/net/ghttp/ghttp_client_bytes.go similarity index 100% rename from g/net/ghttp/ghttp_client_bytes.go rename to net/ghttp/ghttp_client_bytes.go diff --git a/g/net/ghttp/ghttp_client_config.go b/net/ghttp/ghttp_client_config.go similarity index 98% rename from g/net/ghttp/ghttp_client_config.go rename to net/ghttp/ghttp_client_config.go index b78e70653..82bcaa671 100644 --- a/g/net/ghttp/ghttp_client_config.go +++ b/net/ghttp/ghttp_client_config.go @@ -9,9 +9,10 @@ package ghttp import ( - "github.com/gogf/gf/g/text/gregex" "strings" "time" + + "github.com/gogf/gf/text/gregex" ) // 是否模拟浏览器模式(自动保存提交COOKIE) diff --git a/g/net/ghttp/ghttp_client_content.go b/net/ghttp/ghttp_client_content.go similarity index 100% rename from g/net/ghttp/ghttp_client_content.go rename to net/ghttp/ghttp_client_content.go diff --git a/g/net/ghttp/ghttp_client_request.go b/net/ghttp/ghttp_client_request.go similarity index 99% rename from g/net/ghttp/ghttp_client_request.go rename to net/ghttp/ghttp_client_request.go index 2f26bbb99..cee7abd84 100644 --- a/g/net/ghttp/ghttp_client_request.go +++ b/net/ghttp/ghttp_client_request.go @@ -21,7 +21,7 @@ import ( "strings" "time" - "github.com/gogf/gf/g/os/gfile" + "github.com/gogf/gf/os/gfile" ) // http客户端 diff --git a/g/net/ghttp/ghttp_client_response.go b/net/ghttp/ghttp_client_response.go similarity index 100% rename from g/net/ghttp/ghttp_client_response.go rename to net/ghttp/ghttp_client_response.go diff --git a/g/net/ghttp/ghttp_controller.go b/net/ghttp/ghttp_controller.go similarity index 100% rename from g/net/ghttp/ghttp_controller.go rename to net/ghttp/ghttp_controller.go diff --git a/g/net/ghttp/ghttp_func.go b/net/ghttp/ghttp_func.go similarity index 93% rename from g/net/ghttp/ghttp_func.go rename to net/ghttp/ghttp_func.go index a4474ed90..827af61b3 100644 --- a/g/net/ghttp/ghttp_func.go +++ b/net/ghttp/ghttp_func.go @@ -9,8 +9,8 @@ package ghttp import ( "strings" - "github.com/gogf/gf/g/encoding/gurl" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/encoding/gurl" + "github.com/gogf/gf/util/gconv" ) // 构建请求参数，参数支持任意数据类型，常见参数类型为string/map。 diff --git a/g/net/ghttp/ghttp_request.go b/net/ghttp/ghttp_request.go similarity index 97% rename from g/net/ghttp/ghttp_request.go rename to net/ghttp/ghttp_request.go index 590b47669..1cee1c4b3 100644 --- a/g/net/ghttp/ghttp_request.go +++ b/net/ghttp/ghttp_request.go @@ -12,10 +12,10 @@ import ( "net/http" "strings" - "github.com/gogf/gf/g/container/gvar" - "github.com/gogf/gf/g/encoding/gjson" - "github.com/gogf/gf/g/os/gtime" - "github.com/gogf/gf/g/text/gregex" + "github.com/gogf/gf/container/gvar" + "github.com/gogf/gf/encoding/gjson" + "github.com/gogf/gf/os/gtime" + "github.com/gogf/gf/text/gregex" ) // 请求对象 diff --git a/g/net/ghttp/ghttp_request_auth.go b/net/ghttp/ghttp_request_auth.go similarity index 97% rename from g/net/ghttp/ghttp_request_auth.go rename to net/ghttp/ghttp_request_auth.go index a097f4327..cce9009af 100644 --- a/g/net/ghttp/ghttp_request_auth.go +++ b/net/ghttp/ghttp_request_auth.go @@ -11,7 +11,7 @@ import ( "net/http" "strings" - "github.com/gogf/gf/g/encoding/gbase64" + "github.com/gogf/gf/encoding/gbase64" ) // 设置Basic Auth校验提示 diff --git a/g/net/ghttp/ghttp_request_log.go b/net/ghttp/ghttp_request_log.go similarity index 100% rename from g/net/ghttp/ghttp_request_log.go rename to net/ghttp/ghttp_request_log.go diff --git a/g/net/ghttp/ghttp_request_params.go b/net/ghttp/ghttp_request_params.go similarity index 94% rename from g/net/ghttp/ghttp_request_params.go rename to net/ghttp/ghttp_request_params.go index c2f80beff..9cbdc41d3 100644 --- a/g/net/ghttp/ghttp_request_params.go +++ b/net/ghttp/ghttp_request_params.go @@ -6,7 +6,7 @@ package ghttp -import "github.com/gogf/gf/g/container/gvar" +import "github.com/gogf/gf/container/gvar" // 设置请求流程共享变量 func (r *Request) SetParam(key string, value interface{}) { diff --git a/g/net/ghttp/ghttp_request_post.go b/net/ghttp/ghttp_request_post.go similarity index 97% rename from g/net/ghttp/ghttp_request_post.go rename to net/ghttp/ghttp_request_post.go index 9103a4b50..d740ef76d 100644 --- a/g/net/ghttp/ghttp_request_post.go +++ b/net/ghttp/ghttp_request_post.go @@ -7,9 +7,9 @@ package ghttp import ( - "github.com/gogf/gf/g/container/gvar" - "github.com/gogf/gf/g/internal/structs" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/container/gvar" + "github.com/gogf/gf/internal/structs" + "github.com/gogf/gf/util/gconv" ) // 初始化POST请求参数 diff --git a/g/net/ghttp/ghttp_request_query.go b/net/ghttp/ghttp_request_query.go similarity index 97% rename from g/net/ghttp/ghttp_request_query.go rename to net/ghttp/ghttp_request_query.go index 099af9016..53e08eaab 100644 --- a/g/net/ghttp/ghttp_request_query.go +++ b/net/ghttp/ghttp_request_query.go @@ -9,10 +9,10 @@ package ghttp import ( "strings" - "github.com/gogf/gf/g/container/gvar" + "github.com/gogf/gf/container/gvar" - "github.com/gogf/gf/g/internal/structs" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/internal/structs" + "github.com/gogf/gf/util/gconv" ) // 初始化GET请求参数 diff --git a/g/net/ghttp/ghttp_request_request.go b/net/ghttp/ghttp_request_request.go similarity index 97% rename from g/net/ghttp/ghttp_request_request.go rename to net/ghttp/ghttp_request_request.go index 1ce6c03c9..050d97858 100644 --- a/g/net/ghttp/ghttp_request_request.go +++ b/net/ghttp/ghttp_request_request.go @@ -7,9 +7,9 @@ package ghttp import ( - "github.com/gogf/gf/g/container/gvar" - "github.com/gogf/gf/g/internal/structs" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/container/gvar" + "github.com/gogf/gf/internal/structs" + "github.com/gogf/gf/util/gconv" ) // 获得router、post或者get提交的参数，如果有同名参数，那么按照router->get->post优先级进行覆盖 diff --git a/g/net/ghttp/ghttp_request_router.go b/net/ghttp/ghttp_request_router.go similarity index 100% rename from g/net/ghttp/ghttp_request_router.go rename to net/ghttp/ghttp_request_router.go diff --git a/g/net/ghttp/ghttp_response.go b/net/ghttp/ghttp_response.go similarity index 98% rename from g/net/ghttp/ghttp_response.go rename to net/ghttp/ghttp_response.go index 29d0eb43a..bc88400ab 100644 --- a/g/net/ghttp/ghttp_response.go +++ b/net/ghttp/ghttp_response.go @@ -13,9 +13,9 @@ import ( "net/http" "strconv" - "github.com/gogf/gf/g/encoding/gparser" - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/encoding/gparser" + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/util/gconv" ) // 服务端请求返回对象。 diff --git a/g/net/ghttp/ghttp_response_cors.go b/net/ghttp/ghttp_response_cors.go similarity index 98% rename from g/net/ghttp/ghttp_response_cors.go rename to net/ghttp/ghttp_response_cors.go index d5dcc9d36..b2df3f5d0 100644 --- a/g/net/ghttp/ghttp_response_cors.go +++ b/net/ghttp/ghttp_response_cors.go @@ -8,7 +8,7 @@ package ghttp import ( - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/util/gconv" ) // See https://www.w3.org/TR/cors/ . diff --git a/g/net/ghttp/ghttp_response_gzip.go b/net/ghttp/ghttp_response_gzip.go similarity index 100% rename from g/net/ghttp/ghttp_response_gzip.go rename to net/ghttp/ghttp_response_gzip.go diff --git a/g/net/ghttp/ghttp_response_view.go b/net/ghttp/ghttp_response_view.go similarity index 96% rename from g/net/ghttp/ghttp_response_view.go rename to net/ghttp/ghttp_response_view.go index 39185b9c8..8af360cc4 100644 --- a/g/net/ghttp/ghttp_response_view.go +++ b/net/ghttp/ghttp_response_view.go @@ -8,8 +8,8 @@ package ghttp import ( - "github.com/gogf/gf/g/frame/gins" - "github.com/gogf/gf/g/os/gview" + "github.com/gogf/gf/frame/gins" + "github.com/gogf/gf/os/gview" ) // 展示模板，可以给定模板参数，及临时的自定义模板函数 diff --git a/g/net/ghttp/ghttp_response_writer.go b/net/ghttp/ghttp_response_writer.go similarity index 100% rename from g/net/ghttp/ghttp_response_writer.go rename to net/ghttp/ghttp_response_writer.go diff --git a/g/net/ghttp/ghttp_server.go b/net/ghttp/ghttp_server.go similarity index 96% rename from g/net/ghttp/ghttp_server.go rename to net/ghttp/ghttp_server.go index afba81842..bf8a95d34 100644 --- a/g/net/ghttp/ghttp_server.go +++ b/net/ghttp/ghttp_server.go @@ -18,19 +18,19 @@ import ( "sync" "time" - "github.com/gogf/gf/g/container/garray" - "github.com/gogf/gf/g/container/gmap" - "github.com/gogf/gf/g/container/gtype" - "github.com/gogf/gf/g/os/gcache" - "github.com/gogf/gf/g/os/genv" - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/os/gproc" - "github.com/gogf/gf/g/os/gtimer" - "github.com/gogf/gf/g/text/gregex" - "github.com/gogf/gf/g/util/gconv" - "github.com/gogf/gf/third/github.com/gorilla/websocket" - "github.com/gogf/gf/third/github.com/olekukonko/tablewriter" + "github.com/gogf/gf/container/garray" + "github.com/gogf/gf/container/gmap" + "github.com/gogf/gf/container/gtype" + "github.com/gogf/gf/internal/thirdparty/github.com/gorilla/websocket" + "github.com/gogf/gf/internal/thirdparty/github.com/olekukonko/tablewriter" + "github.com/gogf/gf/os/gcache" + "github.com/gogf/gf/os/genv" + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/os/gproc" + "github.com/gogf/gf/os/gtimer" + "github.com/gogf/gf/text/gregex" + "github.com/gogf/gf/util/gconv" ) type ( diff --git a/g/net/ghttp/ghttp_server_admin.go b/net/ghttp/ghttp_server_admin.go similarity index 95% rename from g/net/ghttp/ghttp_server_admin.go rename to net/ghttp/ghttp_server_admin.go index 903b55629..9752d3b57 100644 --- a/g/net/ghttp/ghttp_server_admin.go +++ b/net/ghttp/ghttp_server_admin.go @@ -8,12 +8,13 @@ package ghttp import ( - "github.com/gogf/gf/g/os/gproc" - "github.com/gogf/gf/g/os/gtimer" - "github.com/gogf/gf/g/os/gview" "os" "strings" "time" + + "github.com/gogf/gf/os/gproc" + "github.com/gogf/gf/os/gtimer" + "github.com/gogf/gf/os/gview" ) // 服务管理首页 diff --git a/g/net/ghttp/ghttp_server_admin_process.go b/net/ghttp/ghttp_server_admin_process.go similarity index 96% rename from g/net/ghttp/ghttp_server_admin_process.go rename to net/ghttp/ghttp_server_admin_process.go index 0be7f4eb9..6520625f1 100644 --- a/g/net/ghttp/ghttp_server_admin_process.go +++ b/net/ghttp/ghttp_server_admin_process.go @@ -11,18 +11,19 @@ import ( "bytes" "errors" "fmt" - "github.com/gogf/gf/g/container/gtype" - "github.com/gogf/gf/g/encoding/gjson" - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/os/gproc" - "github.com/gogf/gf/g/os/gtime" - "github.com/gogf/gf/g/os/gtimer" - "github.com/gogf/gf/g/util/gconv" "os" "runtime" "strings" "sync" "time" + + "github.com/gogf/gf/container/gtype" + "github.com/gogf/gf/encoding/gjson" + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/os/gproc" + "github.com/gogf/gf/os/gtime" + "github.com/gogf/gf/os/gtimer" + "github.com/gogf/gf/util/gconv" ) const ( diff --git a/g/net/ghttp/ghttp_server_admin_unix.go b/net/ghttp/ghttp_server_admin_unix.go similarity index 100% rename from g/net/ghttp/ghttp_server_admin_unix.go rename to net/ghttp/ghttp_server_admin_unix.go diff --git a/g/net/ghttp/ghttp_server_admin_windows.go b/net/ghttp/ghttp_server_admin_windows.go similarity index 100% rename from g/net/ghttp/ghttp_server_admin_windows.go rename to net/ghttp/ghttp_server_admin_windows.go diff --git a/g/net/ghttp/ghttp_server_config.go b/net/ghttp/ghttp_server_config.go similarity index 99% rename from g/net/ghttp/ghttp_server_config.go rename to net/ghttp/ghttp_server_config.go index cb8fee3b5..5c9177904 100644 --- a/g/net/ghttp/ghttp_server_config.go +++ b/net/ghttp/ghttp_server_config.go @@ -13,8 +13,8 @@ import ( "strconv" "time" - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/os/glog" + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/os/glog" ) const ( diff --git a/g/net/ghttp/ghttp_server_config_cookie.go b/net/ghttp/ghttp_server_config_cookie.go similarity index 97% rename from g/net/ghttp/ghttp_server_config_cookie.go rename to net/ghttp/ghttp_server_config_cookie.go index 5db0b079e..a353d85f8 100644 --- a/g/net/ghttp/ghttp_server_config_cookie.go +++ b/net/ghttp/ghttp_server_config_cookie.go @@ -7,7 +7,7 @@ package ghttp import ( - "github.com/gogf/gf/g/os/glog" + "github.com/gogf/gf/os/glog" ) // 设置http server参数 - CookieMaxAge diff --git a/g/net/ghttp/ghttp_server_config_logger.go b/net/ghttp/ghttp_server_config_logger.go similarity index 98% rename from g/net/ghttp/ghttp_server_config_logger.go rename to net/ghttp/ghttp_server_config_logger.go index e8e8fa52e..a558f869e 100644 --- a/g/net/ghttp/ghttp_server_config_logger.go +++ b/net/ghttp/ghttp_server_config_logger.go @@ -7,7 +7,7 @@ package ghttp import ( - "github.com/gogf/gf/g/os/glog" + "github.com/gogf/gf/os/glog" ) // 设置日志目录，只有在设置了日志目录的情况下才会输出日志到日志文件中。 diff --git a/g/net/ghttp/ghttp_server_config_route.go b/net/ghttp/ghttp_server_config_route.go similarity index 97% rename from g/net/ghttp/ghttp_server_config_route.go rename to net/ghttp/ghttp_server_config_route.go index 55ae078e2..c9d91e734 100644 --- a/g/net/ghttp/ghttp_server_config_route.go +++ b/net/ghttp/ghttp_server_config_route.go @@ -6,7 +6,7 @@ package ghttp -import "github.com/gogf/gf/g/os/glog" +import "github.com/gogf/gf/os/glog" func (s *Server) SetDenyIps(ips []string) { if s.Status() == SERVER_STATUS_RUNNING { diff --git a/g/net/ghttp/ghttp_server_config_session.go b/net/ghttp/ghttp_server_config_session.go similarity index 96% rename from g/net/ghttp/ghttp_server_config_session.go rename to net/ghttp/ghttp_server_config_session.go index 3c9030fc0..ceecfbd3a 100644 --- a/g/net/ghttp/ghttp_server_config_session.go +++ b/net/ghttp/ghttp_server_config_session.go @@ -6,7 +6,7 @@ package ghttp -import "github.com/gogf/gf/g/os/glog" +import "github.com/gogf/gf/os/glog" // 设置http server参数 - SessionMaxAge func (s *Server) SetSessionMaxAge(age int) { diff --git a/g/net/ghttp/ghttp_server_config_static.go b/net/ghttp/ghttp_server_config_static.go similarity index 96% rename from g/net/ghttp/ghttp_server_config_static.go rename to net/ghttp/ghttp_server_config_static.go index 9981f6f17..eba79de98 100644 --- a/g/net/ghttp/ghttp_server_config_static.go +++ b/net/ghttp/ghttp_server_config_static.go @@ -10,11 +10,12 @@ package ghttp import ( "fmt" - "github.com/gogf/gf/g/container/garray" - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/util/gconv" "strings" + + "github.com/gogf/gf/container/garray" + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/util/gconv" ) // 静态文件目录映射关系对象 diff --git a/g/net/ghttp/ghttp_server_cookie.go b/net/ghttp/ghttp_server_cookie.go similarity index 99% rename from g/net/ghttp/ghttp_server_cookie.go rename to net/ghttp/ghttp_server_cookie.go index 66c6495c9..2ae4f9e32 100644 --- a/g/net/ghttp/ghttp_server_cookie.go +++ b/net/ghttp/ghttp_server_cookie.go @@ -10,9 +10,10 @@ package ghttp import ( - "github.com/gogf/gf/g/os/gtime" "net/http" "time" + + "github.com/gogf/gf/os/gtime" ) // COOKIE对象 diff --git a/g/net/ghttp/ghttp_server_domain.go b/net/ghttp/ghttp_server_domain.go similarity index 100% rename from g/net/ghttp/ghttp_server_domain.go rename to net/ghttp/ghttp_server_domain.go diff --git a/g/net/ghttp/ghttp_server_graceful.go b/net/ghttp/ghttp_server_graceful.go similarity index 98% rename from g/net/ghttp/ghttp_server_graceful.go rename to net/ghttp/ghttp_server_graceful.go index 696422616..5126e00ab 100644 --- a/g/net/ghttp/ghttp_server_graceful.go +++ b/net/ghttp/ghttp_server_graceful.go @@ -11,12 +11,13 @@ import ( "crypto/tls" "errors" "fmt" - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/os/gproc" "net" "net/http" "os" "time" + + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/os/gproc" ) // 优雅的Web Server对象封装 diff --git a/g/net/ghttp/ghttp_server_handler.go b/net/ghttp/ghttp_server_handler.go similarity index 98% rename from g/net/ghttp/ghttp_server_handler.go rename to net/ghttp/ghttp_server_handler.go index dbb9dbe6a..756afe0df 100644 --- a/g/net/ghttp/ghttp_server_handler.go +++ b/net/ghttp/ghttp_server_handler.go @@ -13,10 +13,10 @@ import ( "sort" "strings" - "github.com/gogf/gf/g/encoding/ghtml" - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/os/gspath" - "github.com/gogf/gf/g/os/gtime" + "github.com/gogf/gf/encoding/ghtml" + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/os/gspath" + "github.com/gogf/gf/os/gtime" ) // 默认HTTP Server处理入口，http包底层默认使用了gorutine异步处理请求，所以这里不再异步执行 diff --git a/g/net/ghttp/ghttp_server_log.go b/net/ghttp/ghttp_server_log.go similarity index 98% rename from g/net/ghttp/ghttp_server_log.go rename to net/ghttp/ghttp_server_log.go index cc08b828c..4d35d55a6 100644 --- a/g/net/ghttp/ghttp_server_log.go +++ b/net/ghttp/ghttp_server_log.go @@ -10,7 +10,7 @@ package ghttp import ( "fmt" - "github.com/gogf/gf/g/os/gtime" + "github.com/gogf/gf/os/gtime" ) // 处理服务错误信息，主要是panic，http请求的status由access log进行管理 diff --git a/g/net/ghttp/ghttp_server_pprof.go b/net/ghttp/ghttp_server_pprof.go similarity index 98% rename from g/net/ghttp/ghttp_server_pprof.go rename to net/ghttp/ghttp_server_pprof.go index 7b6be8729..b460fcca8 100644 --- a/g/net/ghttp/ghttp_server_pprof.go +++ b/net/ghttp/ghttp_server_pprof.go @@ -8,10 +8,11 @@ package ghttp import ( - "github.com/gogf/gf/g/os/gview" netpprof "net/http/pprof" runpprof "runtime/pprof" "strings" + + "github.com/gogf/gf/os/gview" ) // 用于pprof的对象 diff --git a/g/net/ghttp/ghttp_server_router.go b/net/ghttp/ghttp_server_router.go similarity index 98% rename from g/net/ghttp/ghttp_server_router.go rename to net/ghttp/ghttp_server_router.go index dfefb0001..8f2ba5948 100644 --- a/g/net/ghttp/ghttp_server_router.go +++ b/net/ghttp/ghttp_server_router.go @@ -11,11 +11,12 @@ import ( "container/list" "errors" "fmt" - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/text/gregex" - "github.com/gogf/gf/g/text/gstr" "runtime" "strings" + + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/text/gregex" + "github.com/gogf/gf/text/gstr" ) // 解析pattern diff --git a/g/net/ghttp/ghttp_server_router_group.go b/net/ghttp/ghttp_server_router_group.go similarity index 98% rename from g/net/ghttp/ghttp_server_router_group.go rename to net/ghttp/ghttp_server_router_group.go index 1b8a2d894..e43bf4198 100644 --- a/g/net/ghttp/ghttp_server_router_group.go +++ b/net/ghttp/ghttp_server_router_group.go @@ -11,8 +11,8 @@ import ( "reflect" "strings" - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/util/gconv" ) // 分组路由对象 diff --git a/g/net/ghttp/ghttp_server_router_hook.go b/net/ghttp/ghttp_server_router_hook.go similarity index 98% rename from g/net/ghttp/ghttp_server_router_hook.go rename to net/ghttp/ghttp_server_router_hook.go index 442533077..04079e099 100644 --- a/g/net/ghttp/ghttp_server_router_hook.go +++ b/net/ghttp/ghttp_server_router_hook.go @@ -10,11 +10,12 @@ package ghttp import ( "container/list" "fmt" - "github.com/gogf/gf/g/container/gset" - "github.com/gogf/gf/g/text/gregex" "reflect" "runtime" "strings" + + "github.com/gogf/gf/container/gset" + "github.com/gogf/gf/text/gregex" ) // 绑定指定的hook回调函数, pattern参数同BindHandler，支持命名路由；hook参数的值由ghttp server设定，参数不区分大小写 diff --git a/g/net/ghttp/ghttp_server_router_serve.go b/net/ghttp/ghttp_server_router_serve.go similarity index 99% rename from g/net/ghttp/ghttp_server_router_serve.go rename to net/ghttp/ghttp_server_router_serve.go index 9f1ec0822..81ff30fff 100644 --- a/g/net/ghttp/ghttp_server_router_serve.go +++ b/net/ghttp/ghttp_server_router_serve.go @@ -11,7 +11,7 @@ import ( "container/list" "strings" - "github.com/gogf/gf/g/text/gregex" + "github.com/gogf/gf/text/gregex" ) // 查询请求处理方法. diff --git a/g/net/ghttp/ghttp_server_service_controller.go b/net/ghttp/ghttp_server_service_controller.go similarity index 97% rename from g/net/ghttp/ghttp_server_service_controller.go rename to net/ghttp/ghttp_server_service_controller.go index a41be3a3b..14973d3df 100644 --- a/g/net/ghttp/ghttp_server_service_controller.go +++ b/net/ghttp/ghttp_server_service_controller.go @@ -11,10 +11,10 @@ import ( "reflect" "strings" - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/text/gregex" - "github.com/gogf/gf/g/text/gstr" + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/text/gregex" + "github.com/gogf/gf/text/gstr" ) // 绑定控制器，控制器需要实现 gmvc.Controller 接口, diff --git a/g/net/ghttp/ghttp_server_service_handler.go b/net/ghttp/ghttp_server_service_handler.go similarity index 98% rename from g/net/ghttp/ghttp_server_service_handler.go rename to net/ghttp/ghttp_server_service_handler.go index f0c337818..7a3ddf5ec 100644 --- a/g/net/ghttp/ghttp_server_service_handler.go +++ b/net/ghttp/ghttp_server_service_handler.go @@ -8,11 +8,12 @@ package ghttp import ( "bytes" - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/text/gstr" "reflect" "runtime" "strings" + + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/text/gstr" ) // 注意该方法是直接绑定函数的内存地址，执行的时候直接执行该方法，不会存在初始化新的控制器逻辑 diff --git a/g/net/ghttp/ghttp_server_service_object.go b/net/ghttp/ghttp_server_service_object.go similarity index 97% rename from g/net/ghttp/ghttp_server_service_object.go rename to net/ghttp/ghttp_server_service_object.go index 2e9695abb..763a857ee 100644 --- a/g/net/ghttp/ghttp_server_service_object.go +++ b/net/ghttp/ghttp_server_service_object.go @@ -11,10 +11,10 @@ import ( "reflect" "strings" - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/text/gregex" - "github.com/gogf/gf/g/text/gstr" + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/text/gregex" + "github.com/gogf/gf/text/gstr" ) // 绑定对象到URI请求处理中，会自动识别方法名称，并附加到对应的URI地址后面 diff --git a/g/net/ghttp/ghttp_server_session.go b/net/ghttp/ghttp_server_session.go similarity index 97% rename from g/net/ghttp/ghttp_server_session.go rename to net/ghttp/ghttp_server_session.go index c53086763..34b22d9ea 100644 --- a/g/net/ghttp/ghttp_server_session.go +++ b/net/ghttp/ghttp_server_session.go @@ -12,11 +12,11 @@ import ( "strings" "time" - "github.com/gogf/gf/g/container/gmap" - "github.com/gogf/gf/g/container/gvar" - "github.com/gogf/gf/g/os/gtime" - "github.com/gogf/gf/g/util/gconv" - "github.com/gogf/gf/g/util/grand" + "github.com/gogf/gf/container/gmap" + "github.com/gogf/gf/container/gvar" + "github.com/gogf/gf/os/gtime" + "github.com/gogf/gf/util/gconv" + "github.com/gogf/gf/util/grand" ) // SESSION对象，并发安全 diff --git a/g/net/ghttp/ghttp_server_status.go b/net/ghttp/ghttp_server_status.go similarity index 100% rename from g/net/ghttp/ghttp_server_status.go rename to net/ghttp/ghttp_server_status.go diff --git a/g/net/ghttp/ghttp_server_websocket.go b/net/ghttp/ghttp_server_websocket.go similarity index 93% rename from g/net/ghttp/ghttp_server_websocket.go rename to net/ghttp/ghttp_server_websocket.go index 29cfe078f..ad5b297e0 100644 --- a/g/net/ghttp/ghttp_server_websocket.go +++ b/net/ghttp/ghttp_server_websocket.go @@ -6,7 +6,7 @@ package ghttp -import "github.com/gogf/gf/third/github.com/gorilla/websocket" +import "github.com/gogf/gf/internal/thirdparty/github.com/gorilla/websocket" type WebSocket struct { *websocket.Conn diff --git a/g/net/ghttp/ghttp_unit_cookie_test.go b/net/ghttp/ghttp_unit_cookie_test.go similarity index 94% rename from g/net/ghttp/ghttp_unit_cookie_test.go rename to net/ghttp/ghttp_unit_cookie_test.go index 69b84f2dc..a3211028f 100644 --- a/g/net/ghttp/ghttp_unit_cookie_test.go +++ b/net/ghttp/ghttp_unit_cookie_test.go @@ -9,11 +9,12 @@ package ghttp_test import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/test/gtest" "testing" "time" + + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/test/gtest" ) func Test_Cookie(t *testing.T) { diff --git a/g/net/ghttp/ghttp_unit_init_test.go b/net/ghttp/ghttp_unit_init_test.go similarity index 92% rename from g/net/ghttp/ghttp_unit_init_test.go rename to net/ghttp/ghttp_unit_init_test.go index 3952032e0..1d3b58e26 100644 --- a/g/net/ghttp/ghttp_unit_init_test.go +++ b/net/ghttp/ghttp_unit_init_test.go @@ -8,7 +8,7 @@ package ghttp_test import ( - "github.com/gogf/gf/g/container/garray" + "github.com/gogf/gf/container/garray" ) var ( diff --git a/g/net/ghttp/ghttp_unit_param_json_test.go b/net/ghttp/ghttp_unit_param_json_test.go similarity index 97% rename from g/net/ghttp/ghttp_unit_param_json_test.go rename to net/ghttp/ghttp_unit_param_json_test.go index 764be4cb9..c226c1828 100644 --- a/g/net/ghttp/ghttp_unit_param_json_test.go +++ b/net/ghttp/ghttp_unit_param_json_test.go @@ -9,11 +9,12 @@ package ghttp_test import ( "encoding/json" "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/test/gtest" "testing" "time" + + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/test/gtest" ) func Test_Params_Json(t *testing.T) { diff --git a/g/net/ghttp/ghttp_unit_param_struct_test.go b/net/ghttp/ghttp_unit_param_struct_test.go similarity index 93% rename from g/net/ghttp/ghttp_unit_param_struct_test.go rename to net/ghttp/ghttp_unit_param_struct_test.go index 762bddead..aef65fddc 100644 --- a/g/net/ghttp/ghttp_unit_param_struct_test.go +++ b/net/ghttp/ghttp_unit_param_struct_test.go @@ -11,11 +11,11 @@ import ( "testing" "time" - "github.com/gogf/gf/g/util/gvalid" + "github.com/gogf/gf/util/gvalid" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/test/gtest" ) func Test_Params_Struct(t *testing.T) { diff --git a/g/net/ghttp/ghttp_unit_param_test.go b/net/ghttp/ghttp_unit_param_test.go similarity index 98% rename from g/net/ghttp/ghttp_unit_param_test.go rename to net/ghttp/ghttp_unit_param_test.go index e04278730..72eeaeec0 100644 --- a/g/net/ghttp/ghttp_unit_param_test.go +++ b/net/ghttp/ghttp_unit_param_test.go @@ -11,9 +11,9 @@ import ( "testing" "time" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/test/gtest" ) func Test_Params_Basic(t *testing.T) { diff --git a/g/net/ghttp/ghttp_unit_router_basic_test.go b/net/ghttp/ghttp_unit_router_basic_test.go similarity index 98% rename from g/net/ghttp/ghttp_unit_router_basic_test.go rename to net/ghttp/ghttp_unit_router_basic_test.go index 7a46e9db2..b1e2b27f3 100644 --- a/g/net/ghttp/ghttp_unit_router_basic_test.go +++ b/net/ghttp/ghttp_unit_router_basic_test.go @@ -9,11 +9,12 @@ package ghttp_test import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/test/gtest" "testing" "time" + + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/test/gtest" ) // 基本路由功能测试 diff --git a/g/net/ghttp/ghttp_unit_router_controller_rest_test.go b/net/ghttp/ghttp_unit_router_controller_rest_test.go similarity index 95% rename from g/net/ghttp/ghttp_unit_router_controller_rest_test.go rename to net/ghttp/ghttp_unit_router_controller_rest_test.go index 6625ae6ad..ace420002 100644 --- a/g/net/ghttp/ghttp_unit_router_controller_rest_test.go +++ b/net/ghttp/ghttp_unit_router_controller_rest_test.go @@ -8,12 +8,13 @@ package ghttp_test import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/frame/gmvc" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/test/gtest" "testing" "time" + + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/frame/gmvc" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/test/gtest" ) type ControllerRest struct { diff --git a/g/net/ghttp/ghttp_unit_router_controller_test.go b/net/ghttp/ghttp_unit_router_controller_test.go similarity index 96% rename from g/net/ghttp/ghttp_unit_router_controller_test.go rename to net/ghttp/ghttp_unit_router_controller_test.go index b0b55e43b..6628dd3b0 100644 --- a/g/net/ghttp/ghttp_unit_router_controller_test.go +++ b/net/ghttp/ghttp_unit_router_controller_test.go @@ -8,12 +8,13 @@ package ghttp_test import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/frame/gmvc" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/test/gtest" "testing" "time" + + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/frame/gmvc" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/test/gtest" ) // 控制器 diff --git a/g/net/ghttp/ghttp_unit_router_domain_basic_test.go b/net/ghttp/ghttp_unit_router_domain_basic_test.go similarity index 98% rename from g/net/ghttp/ghttp_unit_router_domain_basic_test.go rename to net/ghttp/ghttp_unit_router_domain_basic_test.go index 32ead4ef5..bb7105a65 100644 --- a/g/net/ghttp/ghttp_unit_router_domain_basic_test.go +++ b/net/ghttp/ghttp_unit_router_domain_basic_test.go @@ -9,11 +9,12 @@ package ghttp_test import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/test/gtest" "testing" "time" + + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/test/gtest" ) // 基本路由功能测试 diff --git a/g/net/ghttp/ghttp_unit_router_domain_controller_rest_test.go b/net/ghttp/ghttp_unit_router_domain_controller_rest_test.go similarity index 96% rename from g/net/ghttp/ghttp_unit_router_domain_controller_rest_test.go rename to net/ghttp/ghttp_unit_router_domain_controller_rest_test.go index 836107afa..957666985 100644 --- a/g/net/ghttp/ghttp_unit_router_domain_controller_rest_test.go +++ b/net/ghttp/ghttp_unit_router_domain_controller_rest_test.go @@ -8,12 +8,13 @@ package ghttp_test import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/frame/gmvc" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/test/gtest" "testing" "time" + + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/frame/gmvc" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/test/gtest" ) type DomainControllerRest struct { diff --git a/g/net/ghttp/ghttp_unit_router_domain_controller_test.go b/net/ghttp/ghttp_unit_router_domain_controller_test.go similarity index 98% rename from g/net/ghttp/ghttp_unit_router_domain_controller_test.go rename to net/ghttp/ghttp_unit_router_domain_controller_test.go index 5be410b1f..249575776 100644 --- a/g/net/ghttp/ghttp_unit_router_domain_controller_test.go +++ b/net/ghttp/ghttp_unit_router_domain_controller_test.go @@ -8,12 +8,13 @@ package ghttp_test import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/frame/gmvc" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/test/gtest" "testing" "time" + + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/frame/gmvc" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/test/gtest" ) type DomainController struct { diff --git a/g/net/ghttp/ghttp_unit_router_domain_object_rest_test.go b/net/ghttp/ghttp_unit_router_domain_object_rest_test.go similarity index 97% rename from g/net/ghttp/ghttp_unit_router_domain_object_rest_test.go rename to net/ghttp/ghttp_unit_router_domain_object_rest_test.go index a4d76fa50..131f8861f 100644 --- a/g/net/ghttp/ghttp_unit_router_domain_object_rest_test.go +++ b/net/ghttp/ghttp_unit_router_domain_object_rest_test.go @@ -8,11 +8,12 @@ package ghttp_test import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/test/gtest" "testing" "time" + + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/test/gtest" ) type DomainObjectRest struct{} diff --git a/g/net/ghttp/ghttp_unit_router_domain_object_test.go b/net/ghttp/ghttp_unit_router_domain_object_test.go similarity index 98% rename from g/net/ghttp/ghttp_unit_router_domain_object_test.go rename to net/ghttp/ghttp_unit_router_domain_object_test.go index 32beae115..05a609816 100644 --- a/g/net/ghttp/ghttp_unit_router_domain_object_test.go +++ b/net/ghttp/ghttp_unit_router_domain_object_test.go @@ -8,11 +8,12 @@ package ghttp_test import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/test/gtest" "testing" "time" + + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/test/gtest" ) type DomainObject struct{} diff --git a/g/net/ghttp/ghttp_unit_router_exit_test.go b/net/ghttp/ghttp_unit_router_exit_test.go similarity index 97% rename from g/net/ghttp/ghttp_unit_router_exit_test.go rename to net/ghttp/ghttp_unit_router_exit_test.go index fb90d519c..c859174db 100644 --- a/g/net/ghttp/ghttp_unit_router_exit_test.go +++ b/net/ghttp/ghttp_unit_router_exit_test.go @@ -8,11 +8,12 @@ package ghttp_test import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/test/gtest" "testing" "time" + + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/test/gtest" ) func Test_Router_Exit(t *testing.T) { diff --git a/g/net/ghttp/ghttp_unit_router_group_hook_test.go b/net/ghttp/ghttp_unit_router_group_hook_test.go similarity index 96% rename from g/net/ghttp/ghttp_unit_router_group_hook_test.go rename to net/ghttp/ghttp_unit_router_group_hook_test.go index c130ca96d..c49933df4 100644 --- a/g/net/ghttp/ghttp_unit_router_group_hook_test.go +++ b/net/ghttp/ghttp_unit_router_group_hook_test.go @@ -8,11 +8,12 @@ package ghttp_test import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/test/gtest" "testing" "time" + + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/test/gtest" ) func Test_Router_Group_HOOK1(t *testing.T) { diff --git a/g/net/ghttp/ghttp_unit_router_group_rest_test.go b/net/ghttp/ghttp_unit_router_group_rest_test.go similarity index 97% rename from g/net/ghttp/ghttp_unit_router_group_rest_test.go rename to net/ghttp/ghttp_unit_router_group_rest_test.go index 1dff0215e..f53ae7a9b 100644 --- a/g/net/ghttp/ghttp_unit_router_group_rest_test.go +++ b/net/ghttp/ghttp_unit_router_group_rest_test.go @@ -9,12 +9,13 @@ package ghttp_test import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/frame/gmvc" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/test/gtest" "testing" "time" + + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/frame/gmvc" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/test/gtest" ) type GroupCtlRest struct { diff --git a/g/net/ghttp/ghttp_unit_router_group_test.go b/net/ghttp/ghttp_unit_router_group_test.go similarity index 97% rename from g/net/ghttp/ghttp_unit_router_group_test.go rename to net/ghttp/ghttp_unit_router_group_test.go index c76a4f28c..ae81bec04 100644 --- a/g/net/ghttp/ghttp_unit_router_group_test.go +++ b/net/ghttp/ghttp_unit_router_group_test.go @@ -9,12 +9,13 @@ package ghttp_test import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/frame/gmvc" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/test/gtest" "testing" "time" + + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/frame/gmvc" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/test/gtest" ) // 执行对象 diff --git a/g/net/ghttp/ghttp_unit_router_hook_test.go b/net/ghttp/ghttp_unit_router_hook_test.go similarity index 97% rename from g/net/ghttp/ghttp_unit_router_hook_test.go rename to net/ghttp/ghttp_unit_router_hook_test.go index 45121aed5..786856ab2 100644 --- a/g/net/ghttp/ghttp_unit_router_hook_test.go +++ b/net/ghttp/ghttp_unit_router_hook_test.go @@ -8,11 +8,12 @@ package ghttp_test import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/test/gtest" "testing" "time" + + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/test/gtest" ) func Test_Router_Hook_Basic(t *testing.T) { diff --git a/g/net/ghttp/ghttp_unit_router_names_test.go b/net/ghttp/ghttp_unit_router_names_test.go similarity index 96% rename from g/net/ghttp/ghttp_unit_router_names_test.go rename to net/ghttp/ghttp_unit_router_names_test.go index 11800a7f5..b44111dc8 100644 --- a/g/net/ghttp/ghttp_unit_router_names_test.go +++ b/net/ghttp/ghttp_unit_router_names_test.go @@ -8,11 +8,12 @@ package ghttp_test import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/test/gtest" "testing" "time" + + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/test/gtest" ) type NamesObject struct{} diff --git a/g/net/ghttp/ghttp_unit_router_object_rest_test.go b/net/ghttp/ghttp_unit_router_object_rest_test.go similarity index 96% rename from g/net/ghttp/ghttp_unit_router_object_rest_test.go rename to net/ghttp/ghttp_unit_router_object_rest_test.go index eebc27ad8..2dc10dc50 100644 --- a/g/net/ghttp/ghttp_unit_router_object_rest_test.go +++ b/net/ghttp/ghttp_unit_router_object_rest_test.go @@ -8,11 +8,12 @@ package ghttp_test import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/test/gtest" "testing" "time" + + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/test/gtest" ) type ObjectRest struct{} diff --git a/g/net/ghttp/ghttp_unit_router_object_test.go b/net/ghttp/ghttp_unit_router_object_test.go similarity index 97% rename from g/net/ghttp/ghttp_unit_router_object_test.go rename to net/ghttp/ghttp_unit_router_object_test.go index 927c64ed0..39fe96b96 100644 --- a/g/net/ghttp/ghttp_unit_router_object_test.go +++ b/net/ghttp/ghttp_unit_router_object_test.go @@ -8,11 +8,12 @@ package ghttp_test import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/test/gtest" "testing" "time" + + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/test/gtest" ) type Object struct{} diff --git a/g/net/ghttp/ghttp_unit_session_test.go b/net/ghttp/ghttp_unit_session_test.go similarity index 94% rename from g/net/ghttp/ghttp_unit_session_test.go rename to net/ghttp/ghttp_unit_session_test.go index 4e304d8e1..78faa5543 100644 --- a/g/net/ghttp/ghttp_unit_session_test.go +++ b/net/ghttp/ghttp_unit_session_test.go @@ -9,11 +9,12 @@ package ghttp_test import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/test/gtest" "testing" "time" + + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/test/gtest" ) func Test_Session(t *testing.T) { diff --git a/g/net/ghttp/ghttp_unit_static_test.go b/net/ghttp/ghttp_unit_static_test.go similarity index 98% rename from g/net/ghttp/ghttp_unit_static_test.go rename to net/ghttp/ghttp_unit_static_test.go index 6eecd348e..5c34d70d6 100644 --- a/g/net/ghttp/ghttp_unit_static_test.go +++ b/net/ghttp/ghttp_unit_static_test.go @@ -9,12 +9,13 @@ package ghttp_test import ( "fmt" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/test/gtest" "testing" "time" + + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/test/gtest" ) func Test_Static_ServerRoot(t *testing.T) { diff --git a/g/net/gipv4/gipv4.go b/net/gipv4/gipv4.go similarity index 99% rename from g/net/gipv4/gipv4.go rename to net/gipv4/gipv4.go index a12afb1fc..38ef58d0d 100644 --- a/g/net/gipv4/gipv4.go +++ b/net/gipv4/gipv4.go @@ -11,11 +11,12 @@ package gipv4 import ( "encoding/binary" "fmt" - "github.com/gogf/gf/g/text/gregex" "net" "regexp" "strconv" "strings" + + "github.com/gogf/gf/text/gregex" ) // 判断所给地址是否是一个IPv4地址 diff --git a/g/net/gipv6/gipv6.go b/net/gipv6/gipv6.go similarity index 95% rename from g/net/gipv6/gipv6.go rename to net/gipv6/gipv6.go index 796dddf07..19a682bb4 100644 --- a/g/net/gipv6/gipv6.go +++ b/net/gipv6/gipv6.go @@ -7,7 +7,7 @@ // Package gipv4 provides useful API for IPv6 address handling. package gipv6 -import "github.com/gogf/gf/g/text/gregex" +import "github.com/gogf/gf/text/gregex" // 判断所给地址是否是一个IPv6地址 func Validate(ip string) bool { diff --git a/g/net/gsmtp/gsmtp.go b/net/gsmtp/gsmtp.go similarity index 100% rename from g/net/gsmtp/gsmtp.go rename to net/gsmtp/gsmtp.go diff --git a/g/net/gtcp/gtcp.go b/net/gtcp/gtcp.go similarity index 100% rename from g/net/gtcp/gtcp.go rename to net/gtcp/gtcp.go diff --git a/g/net/gtcp/gtcp_conn.go b/net/gtcp/gtcp_conn.go similarity index 99% rename from g/net/gtcp/gtcp_conn.go rename to net/gtcp/gtcp_conn.go index af57bf0fa..9be7d3438 100644 --- a/g/net/gtcp/gtcp_conn.go +++ b/net/gtcp/gtcp_conn.go @@ -14,7 +14,7 @@ import ( "net" "time" - "github.com/gogf/gf/g/errors/gerror" + "github.com/gogf/gf/errors/gerror" ) // 封装的链接对象 diff --git a/g/net/gtcp/gtcp_conn_pkg.go b/net/gtcp/gtcp_conn_pkg.go similarity index 99% rename from g/net/gtcp/gtcp_conn_pkg.go rename to net/gtcp/gtcp_conn_pkg.go index c3172e1e4..ffbc7ebb4 100644 --- a/g/net/gtcp/gtcp_conn_pkg.go +++ b/net/gtcp/gtcp_conn_pkg.go @@ -11,7 +11,7 @@ import ( "fmt" "time" - "github.com/gogf/gf/g/errors/gerror" + "github.com/gogf/gf/errors/gerror" ) const ( diff --git a/g/net/gtcp/gtcp_func.go b/net/gtcp/gtcp_func.go similarity index 99% rename from g/net/gtcp/gtcp_func.go rename to net/gtcp/gtcp_func.go index f7947261f..c2743c0f2 100644 --- a/g/net/gtcp/gtcp_func.go +++ b/net/gtcp/gtcp_func.go @@ -9,9 +9,10 @@ package gtcp import ( "crypto/rand" "crypto/tls" - "github.com/gogf/gf/g/os/gfile" "net" "time" + + "github.com/gogf/gf/os/gfile" ) const ( diff --git a/g/net/gtcp/gtcp_func_pkg.go b/net/gtcp/gtcp_func_pkg.go similarity index 100% rename from g/net/gtcp/gtcp_func_pkg.go rename to net/gtcp/gtcp_func_pkg.go diff --git a/g/net/gtcp/gtcp_pool.go b/net/gtcp/gtcp_pool.go similarity index 97% rename from g/net/gtcp/gtcp_pool.go rename to net/gtcp/gtcp_pool.go index ccb5ce2b6..a49fa4f5e 100644 --- a/g/net/gtcp/gtcp_pool.go +++ b/net/gtcp/gtcp_pool.go @@ -9,9 +9,9 @@ package gtcp import ( "time" - "github.com/gogf/gf/g/container/gmap" - "github.com/gogf/gf/g/container/gpool" - "github.com/gogf/gf/g/errors/gerror" + "github.com/gogf/gf/container/gmap" + "github.com/gogf/gf/container/gpool" + "github.com/gogf/gf/errors/gerror" ) // 链接池链接对象 diff --git a/g/net/gtcp/gtcp_pool_pkg.go b/net/gtcp/gtcp_pool_pkg.go similarity index 98% rename from g/net/gtcp/gtcp_pool_pkg.go rename to net/gtcp/gtcp_pool_pkg.go index d62cdc122..465341de9 100644 --- a/g/net/gtcp/gtcp_pool_pkg.go +++ b/net/gtcp/gtcp_pool_pkg.go @@ -9,7 +9,7 @@ package gtcp import ( "time" - "github.com/gogf/gf/g/errors/gerror" + "github.com/gogf/gf/errors/gerror" ) // 简单协议: (方法覆盖)发送数据 diff --git a/g/net/gtcp/gtcp_server.go b/net/gtcp/gtcp_server.go similarity index 97% rename from g/net/gtcp/gtcp_server.go rename to net/gtcp/gtcp_server.go index da0197e31..6d9610886 100644 --- a/g/net/gtcp/gtcp_server.go +++ b/net/gtcp/gtcp_server.go @@ -9,10 +9,11 @@ package gtcp import ( "crypto/tls" "errors" - "github.com/gogf/gf/g/container/gmap" - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/util/gconv" "net" + + "github.com/gogf/gf/container/gmap" + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/util/gconv" ) const ( diff --git a/g/net/gudp/gudp.go b/net/gudp/gudp.go similarity index 100% rename from g/net/gudp/gudp.go rename to net/gudp/gudp.go diff --git a/g/net/gudp/gudp_conn.go b/net/gudp/gudp_conn.go similarity index 99% rename from g/net/gudp/gudp_conn.go rename to net/gudp/gudp_conn.go index 663c16b7e..53f712109 100644 --- a/g/net/gudp/gudp_conn.go +++ b/net/gudp/gudp_conn.go @@ -11,7 +11,7 @@ import ( "net" "time" - "github.com/gogf/gf/g/errors/gerror" + "github.com/gogf/gf/errors/gerror" ) // 封装的UDP链接对象 diff --git a/g/net/gudp/gudp_func.go b/net/gudp/gudp_func.go similarity index 100% rename from g/net/gudp/gudp_func.go rename to net/gudp/gudp_func.go diff --git a/g/net/gudp/gudp_server.go b/net/gudp/gudp_server.go similarity index 95% rename from g/net/gudp/gudp_server.go rename to net/gudp/gudp_server.go index ccd3b9cae..ed1e010dd 100644 --- a/g/net/gudp/gudp_server.go +++ b/net/gudp/gudp_server.go @@ -8,10 +8,11 @@ package gudp import ( "errors" - "github.com/gogf/gf/g/container/gmap" - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/util/gconv" "net" + + "github.com/gogf/gf/container/gmap" + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/util/gconv" ) const ( diff --git a/g/os/gcache/gcache.go b/os/gcache/gcache.go similarity index 100% rename from g/os/gcache/gcache.go rename to os/gcache/gcache.go diff --git a/g/os/gcache/gcache_cache.go b/os/gcache/gcache_cache.go similarity index 96% rename from g/os/gcache/gcache_cache.go rename to os/gcache/gcache_cache.go index d8b5cadf7..1de35a314 100644 --- a/g/os/gcache/gcache_cache.go +++ b/os/gcache/gcache_cache.go @@ -7,10 +7,11 @@ package gcache import ( - "github.com/gogf/gf/g/os/gtimer" "sync/atomic" "time" "unsafe" + + "github.com/gogf/gf/os/gtimer" ) // Cache struct. diff --git a/g/os/gcache/gcache_mem_cache.go b/os/gcache/gcache_mem_cache.go similarity index 98% rename from g/os/gcache/gcache_mem_cache.go rename to os/gcache/gcache_mem_cache.go index 982f62169..4999161fb 100644 --- a/g/os/gcache/gcache_mem_cache.go +++ b/os/gcache/gcache_mem_cache.go @@ -11,12 +11,12 @@ import ( "sync" "time" - "github.com/gogf/gf/g/container/glist" - "github.com/gogf/gf/g/container/gset" - "github.com/gogf/gf/g/container/gtype" - "github.com/gogf/gf/g/os/gtime" - "github.com/gogf/gf/g/os/gtimer" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/container/glist" + "github.com/gogf/gf/container/gset" + "github.com/gogf/gf/container/gtype" + "github.com/gogf/gf/os/gtime" + "github.com/gogf/gf/os/gtimer" + "github.com/gogf/gf/util/gconv" ) // Internal cache object. diff --git a/g/os/gcache/gcache_mem_cache_item.go b/os/gcache/gcache_mem_cache_item.go similarity index 93% rename from g/os/gcache/gcache_mem_cache_item.go rename to os/gcache/gcache_mem_cache_item.go index c0ce6c6d7..07601c8ff 100644 --- a/g/os/gcache/gcache_mem_cache_item.go +++ b/os/gcache/gcache_mem_cache_item.go @@ -6,7 +6,7 @@ package gcache -import "github.com/gogf/gf/g/os/gtime" +import "github.com/gogf/gf/os/gtime" // IsExpired checks whether is expired. func (item *memCacheItem) IsExpired() bool { diff --git a/g/os/gcache/gcache_mem_cache_lru.go b/os/gcache/gcache_mem_cache_lru.go similarity index 94% rename from g/os/gcache/gcache_mem_cache_lru.go rename to os/gcache/gcache_mem_cache_lru.go index 8dfb1a885..4b789cfab 100644 --- a/g/os/gcache/gcache_mem_cache_lru.go +++ b/os/gcache/gcache_mem_cache_lru.go @@ -7,11 +7,12 @@ package gcache import ( - "github.com/gogf/gf/g/container/glist" - "github.com/gogf/gf/g/container/gmap" - "github.com/gogf/gf/g/container/gtype" - "github.com/gogf/gf/g/os/gtimer" "time" + + "github.com/gogf/gf/container/glist" + "github.com/gogf/gf/container/gmap" + "github.com/gogf/gf/container/gtype" + "github.com/gogf/gf/os/gtimer" ) // LRU cache object. diff --git a/g/os/gcache/gcache_z_bench_test.go b/os/gcache/gcache_z_bench_test.go similarity index 97% rename from g/os/gcache/gcache_z_bench_test.go rename to os/gcache/gcache_z_bench_test.go index 066585624..0279cf6c3 100644 --- a/g/os/gcache/gcache_z_bench_test.go +++ b/os/gcache/gcache_z_bench_test.go @@ -9,8 +9,9 @@ package gcache_test import ( - "github.com/gogf/gf/g/os/gcache" "testing" + + "github.com/gogf/gf/os/gcache" ) var ( diff --git a/g/os/gcache/gcache_z_unit_1_test.go b/os/gcache/gcache_z_unit_1_test.go similarity index 97% rename from g/os/gcache/gcache_z_unit_1_test.go rename to os/gcache/gcache_z_unit_1_test.go index 3c89dad8f..4005101cd 100644 --- a/g/os/gcache/gcache_z_unit_1_test.go +++ b/os/gcache/gcache_z_unit_1_test.go @@ -12,11 +12,11 @@ import ( "testing" "time" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/container/gset" - "github.com/gogf/gf/g/os/gcache" - "github.com/gogf/gf/g/os/grpool" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/container/gset" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/os/gcache" + "github.com/gogf/gf/os/grpool" + "github.com/gogf/gf/test/gtest" ) //clear 用于清除全局缓存，因gcache api 暂未暴露 Clear 方法 diff --git a/g/os/gcfg/gcfg.go b/os/gcfg/gcfg.go similarity index 96% rename from g/os/gcfg/gcfg.go rename to os/gcfg/gcfg.go index 6ca67a54c..a682ff9cc 100644 --- a/g/os/gcfg/gcfg.go +++ b/os/gcfg/gcfg.go @@ -12,15 +12,15 @@ import ( "errors" "fmt" - "github.com/gogf/gf/g/container/garray" - "github.com/gogf/gf/g/container/gmap" - "github.com/gogf/gf/g/container/gtype" - "github.com/gogf/gf/g/encoding/gjson" - "github.com/gogf/gf/g/internal/cmdenv" - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/os/gfsnotify" - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/os/gspath" + "github.com/gogf/gf/container/garray" + "github.com/gogf/gf/container/gmap" + "github.com/gogf/gf/container/gtype" + "github.com/gogf/gf/encoding/gjson" + "github.com/gogf/gf/internal/cmdenv" + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/os/gfsnotify" + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/os/gspath" ) const ( diff --git a/g/os/gcfg/gcfg_api.go b/os/gcfg/gcfg_api.go similarity index 98% rename from g/os/gcfg/gcfg_api.go rename to os/gcfg/gcfg_api.go index 640ab5400..95633dfec 100644 --- a/g/os/gcfg/gcfg_api.go +++ b/os/gcfg/gcfg_api.go @@ -10,10 +10,10 @@ import ( "errors" "time" - "github.com/gogf/gf/g/encoding/gjson" + "github.com/gogf/gf/encoding/gjson" - "github.com/gogf/gf/g/container/gvar" - "github.com/gogf/gf/g/os/gtime" + "github.com/gogf/gf/container/gvar" + "github.com/gogf/gf/os/gtime" ) func (c *Config) Get(pattern string, def ...interface{}) interface{} { diff --git a/g/os/gcfg/gcfg_config.go b/os/gcfg/gcfg_config.go similarity index 97% rename from g/os/gcfg/gcfg_config.go rename to os/gcfg/gcfg_config.go index 66bdd214d..daa60a7ec 100644 --- a/g/os/gcfg/gcfg_config.go +++ b/os/gcfg/gcfg_config.go @@ -6,7 +6,7 @@ package gcfg -import "github.com/gogf/gf/g/container/gmap" +import "github.com/gogf/gf/container/gmap" var ( // Customized configuration content. diff --git a/g/os/gcfg/gcfg_error.go b/os/gcfg/gcfg_error.go similarity index 93% rename from g/os/gcfg/gcfg_error.go rename to os/gcfg/gcfg_error.go index befd19843..00baea1b6 100644 --- a/g/os/gcfg/gcfg_error.go +++ b/os/gcfg/gcfg_error.go @@ -7,7 +7,7 @@ package gcfg import ( - "github.com/gogf/gf/g/internal/cmdenv" + "github.com/gogf/gf/internal/cmdenv" ) const ( diff --git a/g/os/gcfg/gcfg_instance.go b/os/gcfg/gcfg_instance.go similarity index 95% rename from g/os/gcfg/gcfg_instance.go rename to os/gcfg/gcfg_instance.go index cece36c59..aaa7a6aa2 100644 --- a/g/os/gcfg/gcfg_instance.go +++ b/os/gcfg/gcfg_instance.go @@ -7,7 +7,7 @@ package gcfg import ( - "github.com/gogf/gf/g/container/gmap" + "github.com/gogf/gf/container/gmap" ) const ( diff --git a/g/os/gcfg/gcfg_z_unit_test.go b/os/gcfg/gcfg_z_unit_test.go similarity index 98% rename from g/os/gcfg/gcfg_z_unit_test.go rename to os/gcfg/gcfg_z_unit_test.go index cc9963daf..01012b3ea 100644 --- a/g/os/gcfg/gcfg_z_unit_test.go +++ b/os/gcfg/gcfg_z_unit_test.go @@ -13,11 +13,11 @@ import ( "os" "testing" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/encoding/gjson" - "github.com/gogf/gf/g/os/gcfg" - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/encoding/gjson" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/os/gcfg" + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/test/gtest" ) func init() { diff --git a/g/os/gcmd/gcmd.go b/os/gcmd/gcmd.go similarity index 98% rename from g/os/gcmd/gcmd.go rename to os/gcmd/gcmd.go index 9d1f125b5..1353ba514 100644 --- a/g/os/gcmd/gcmd.go +++ b/os/gcmd/gcmd.go @@ -12,7 +12,7 @@ import ( "os" "regexp" - "github.com/gogf/gf/g/os/glog" + "github.com/gogf/gf/os/glog" ) // Console values. diff --git a/g/os/gcmd/gcmd_option.go b/os/gcmd/gcmd_option.go similarity index 96% rename from g/os/gcmd/gcmd_option.go rename to os/gcmd/gcmd_option.go index 7707148ba..02981a0b1 100644 --- a/g/os/gcmd/gcmd_option.go +++ b/os/gcmd/gcmd_option.go @@ -7,7 +7,7 @@ package gcmd -import "github.com/gogf/gf/g/container/gvar" +import "github.com/gogf/gf/container/gvar" // GetAll returns all option values as map[string]string. func (c *gCmdOption) GetAll() map[string]string { diff --git a/g/os/gcmd/gcmd_value.go b/os/gcmd/gcmd_value.go similarity index 95% rename from g/os/gcmd/gcmd_value.go rename to os/gcmd/gcmd_value.go index 26e9f520b..bea4390b4 100644 --- a/g/os/gcmd/gcmd_value.go +++ b/os/gcmd/gcmd_value.go @@ -7,7 +7,7 @@ package gcmd -import "github.com/gogf/gf/g/container/gvar" +import "github.com/gogf/gf/container/gvar" // GetAll returns all values as a slice of string. func (c *gCmdValue) GetAll() []string { diff --git a/g/os/gcmd/gcmd_z_unit_test.go b/os/gcmd/gcmd_z_unit_test.go similarity index 97% rename from g/os/gcmd/gcmd_z_unit_test.go rename to os/gcmd/gcmd_z_unit_test.go index 205dcfe15..56d79d607 100644 --- a/g/os/gcmd/gcmd_z_unit_test.go +++ b/os/gcmd/gcmd_z_unit_test.go @@ -12,7 +12,7 @@ import ( "os" "testing" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/test/gtest" ) func Test_ValueAndOption(t *testing.T) { diff --git a/g/os/gcron/gcron.go b/os/gcron/gcron.go similarity index 99% rename from g/os/gcron/gcron.go rename to os/gcron/gcron.go index be3c7eade..cc3c73c3a 100644 --- a/g/os/gcron/gcron.go +++ b/os/gcron/gcron.go @@ -8,9 +8,10 @@ package gcron import ( - "github.com/gogf/gf/g/os/gtimer" "math" "time" + + "github.com/gogf/gf/os/gtimer" ) const ( diff --git a/g/os/gcron/gcron_cron.go b/os/gcron/gcron_cron.go similarity index 96% rename from g/os/gcron/gcron_cron.go rename to os/gcron/gcron_cron.go index dcfea1644..e0dba05ca 100644 --- a/g/os/gcron/gcron_cron.go +++ b/os/gcron/gcron_cron.go @@ -9,12 +9,13 @@ package gcron import ( "errors" "fmt" - "github.com/gogf/gf/g/container/garray" - "github.com/gogf/gf/g/container/gmap" - "github.com/gogf/gf/g/container/gtype" - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/os/gtimer" "time" + + "github.com/gogf/gf/container/garray" + "github.com/gogf/gf/container/gmap" + "github.com/gogf/gf/container/gtype" + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/os/gtimer" ) type Cron struct { diff --git a/g/os/gcron/gcron_entry.go b/os/gcron/gcron_entry.go similarity index 96% rename from g/os/gcron/gcron_entry.go rename to os/gcron/gcron_entry.go index c918a024d..4ea18fab8 100644 --- a/g/os/gcron/gcron_entry.go +++ b/os/gcron/gcron_entry.go @@ -7,13 +7,14 @@ package gcron import ( - "github.com/gogf/gf/g/container/gtype" - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/os/gtimer" - "github.com/gogf/gf/g/util/gconv" "reflect" "runtime" "time" + + "github.com/gogf/gf/container/gtype" + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/os/gtimer" + "github.com/gogf/gf/util/gconv" ) // Timed task entry. diff --git a/g/os/gcron/gcron_schedule.go b/os/gcron/gcron_schedule.go similarity index 99% rename from g/os/gcron/gcron_schedule.go rename to os/gcron/gcron_schedule.go index 5cea26d8c..3088ff9c4 100644 --- a/g/os/gcron/gcron_schedule.go +++ b/os/gcron/gcron_schedule.go @@ -9,10 +9,11 @@ package gcron import ( "errors" "fmt" - "github.com/gogf/gf/g/text/gregex" "strconv" "strings" "time" + + "github.com/gogf/gf/text/gregex" ) // 运行时间管理对象 diff --git a/g/os/gcron/gcron_unit_1_test.go b/os/gcron/gcron_unit_1_test.go similarity index 98% rename from g/os/gcron/gcron_unit_1_test.go rename to os/gcron/gcron_unit_1_test.go index 9d842b137..e11bd4d98 100644 --- a/g/os/gcron/gcron_unit_1_test.go +++ b/os/gcron/gcron_unit_1_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "github.com/gogf/gf/g/container/garray" - "github.com/gogf/gf/g/os/gcron" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/container/garray" + "github.com/gogf/gf/os/gcron" + "github.com/gogf/gf/test/gtest" ) func TestCron_Add_Close(t *testing.T) { diff --git a/g/os/gcron/gcron_unit_2_test.go b/os/gcron/gcron_unit_2_test.go similarity index 91% rename from g/os/gcron/gcron_unit_2_test.go rename to os/gcron/gcron_unit_2_test.go index fa4631625..5168fa0af 100644 --- a/g/os/gcron/gcron_unit_2_test.go +++ b/os/gcron/gcron_unit_2_test.go @@ -7,12 +7,13 @@ package gcron_test import ( - "github.com/gogf/gf/g/container/garray" - "github.com/gogf/gf/g/os/gcron" - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/test/gtest" "testing" "time" + + "github.com/gogf/gf/container/garray" + "github.com/gogf/gf/os/gcron" + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/test/gtest" ) func TestCron_Entry_Operations(t *testing.T) { diff --git a/g/os/gcron/gcron_z_bench_test.go b/os/gcron/gcron_z_bench_test.go similarity index 92% rename from g/os/gcron/gcron_z_bench_test.go rename to os/gcron/gcron_z_bench_test.go index fa8a6408b..fd9925691 100644 --- a/g/os/gcron/gcron_z_bench_test.go +++ b/os/gcron/gcron_z_bench_test.go @@ -7,8 +7,9 @@ package gcron_test import ( - "github.com/gogf/gf/g/os/gcron" "testing" + + "github.com/gogf/gf/os/gcron" ) func Benchmark_Add(b *testing.B) { diff --git a/g/os/gcron/gcron_z_example_1_test.go b/os/gcron/gcron_z_example_1_test.go similarity index 87% rename from g/os/gcron/gcron_z_example_1_test.go rename to os/gcron/gcron_z_example_1_test.go index 7c6adb12e..56b96c362 100644 --- a/g/os/gcron/gcron_z_example_1_test.go +++ b/os/gcron/gcron_z_example_1_test.go @@ -7,9 +7,10 @@ package gcron_test import ( - "github.com/gogf/gf/g/os/gcron" - "github.com/gogf/gf/g/os/glog" "time" + + "github.com/gogf/gf/os/gcron" + "github.com/gogf/gf/os/glog" ) func ExampleCron_AddSingleton() { diff --git a/g/os/genv/genv.go b/os/genv/genv.go similarity index 100% rename from g/os/genv/genv.go rename to os/genv/genv.go diff --git a/g/os/genv/genv_test.go b/os/genv/genv_test.go similarity index 92% rename from g/os/genv/genv_test.go rename to os/genv/genv_test.go index 536b3a822..3f33f9cbc 100644 --- a/g/os/genv/genv_test.go +++ b/os/genv/genv_test.go @@ -7,12 +7,13 @@ package genv_test import ( - "github.com/gogf/gf/g/os/genv" - "github.com/gogf/gf/g/os/gtime" - "github.com/gogf/gf/g/test/gtest" - "github.com/gogf/gf/g/util/gconv" "os" "testing" + + "github.com/gogf/gf/os/genv" + "github.com/gogf/gf/os/gtime" + "github.com/gogf/gf/test/gtest" + "github.com/gogf/gf/util/gconv" ) func Test_GEnv_All(t *testing.T) { @@ -65,8 +66,8 @@ func Test_GEnv_Set(t *testing.T) { func Test_GEnv_Build(t *testing.T) { gtest.Case(t, func() { s := genv.Build(map[string]string{ - "k1":"v1", - "k2":"v2", + "k1": "v1", + "k2": "v2", }) gtest.AssertIN("k1=v1", s) gtest.AssertIN("k2=v2", s) diff --git a/g/os/gfcache/gfcache.go b/os/gfcache/gfcache.go similarity index 94% rename from g/os/gfcache/gfcache.go rename to os/gfcache/gfcache.go index d32bb1f18..5d3f65544 100644 --- a/g/os/gfcache/gfcache.go +++ b/os/gfcache/gfcache.go @@ -10,10 +10,10 @@ package gfcache import ( "time" - "github.com/gogf/gf/g/internal/cmdenv" - "github.com/gogf/gf/g/os/gcache" - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/os/gfsnotify" + "github.com/gogf/gf/internal/cmdenv" + "github.com/gogf/gf/os/gcache" + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/os/gfsnotify" ) const ( diff --git a/g/os/gfcache/gfcache_z_unit_test.go b/os/gfcache/gfcache_z_unit_test.go similarity index 94% rename from g/os/gfcache/gfcache_z_unit_test.go rename to os/gfcache/gfcache_z_unit_test.go index b45a1fe13..753ddfde3 100755 --- a/g/os/gfcache/gfcache_z_unit_test.go +++ b/os/gfcache/gfcache_z_unit_test.go @@ -14,9 +14,9 @@ import ( "testing" "time" - "github.com/gogf/gf/g/os/gfcache" - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/os/gfcache" + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/test/gtest" ) func TestGetContents(t *testing.T) { diff --git a/g/os/gfile/gfile.go b/os/gfile/gfile.go similarity index 99% rename from g/os/gfile/gfile.go rename to os/gfile/gfile.go index 6ba032b36..9063d9b4e 100644 --- a/g/os/gfile/gfile.go +++ b/os/gfile/gfile.go @@ -21,8 +21,8 @@ import ( "strings" "time" - "github.com/gogf/gf/g/container/gtype" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/container/gtype" + "github.com/gogf/gf/util/gconv" ) const ( diff --git a/g/os/gfile/gfile_contents.go b/os/gfile/gfile_contents.go similarity index 100% rename from g/os/gfile/gfile_contents.go rename to os/gfile/gfile_contents.go diff --git a/g/os/gfile/gfile_replace.go b/os/gfile/gfile_replace.go similarity index 97% rename from g/os/gfile/gfile_replace.go rename to os/gfile/gfile_replace.go index 523e9ace2..71eef6634 100644 --- a/g/os/gfile/gfile_replace.go +++ b/os/gfile/gfile_replace.go @@ -7,7 +7,7 @@ package gfile import ( - "github.com/gogf/gf/g/text/gstr" + "github.com/gogf/gf/text/gstr" ) // Replace replaces content for files under . diff --git a/g/os/gfile/gfile_scan.go b/os/gfile/gfile_scan.go similarity index 100% rename from g/os/gfile/gfile_scan.go rename to os/gfile/gfile_scan.go diff --git a/g/os/gfile/gfile_search.go b/os/gfile/gfile_search.go similarity index 97% rename from g/os/gfile/gfile_search.go rename to os/gfile/gfile_search.go index 9785a98ee..9e7b88470 100644 --- a/g/os/gfile/gfile_search.go +++ b/os/gfile/gfile_search.go @@ -10,7 +10,8 @@ import ( "bytes" "errors" "fmt" - "github.com/gogf/gf/g/container/garray" + + "github.com/gogf/gf/container/garray" ) // Search searches file by name in following paths with priority: diff --git a/g/os/gfile/gfile_size.go b/os/gfile/gfile_size.go similarity index 100% rename from g/os/gfile/gfile_size.go rename to os/gfile/gfile_size.go diff --git a/g/os/gfile/gfile_sort.go b/os/gfile/gfile_sort.go similarity index 96% rename from g/os/gfile/gfile_sort.go rename to os/gfile/gfile_sort.go index 41b7eda92..a0d655370 100644 --- a/g/os/gfile/gfile_sort.go +++ b/os/gfile/gfile_sort.go @@ -9,7 +9,7 @@ package gfile import ( "strings" - "github.com/gogf/gf/g/container/garray" + "github.com/gogf/gf/container/garray" ) // fileSortFunc is the comparison function for files. diff --git a/g/os/gfile/gfile_source.go b/os/gfile/gfile_source.go similarity index 87% rename from g/os/gfile/gfile_source.go rename to os/gfile/gfile_source.go index b0126cdf0..41028f041 100644 --- a/g/os/gfile/gfile_source.go +++ b/os/gfile/gfile_source.go @@ -10,13 +10,13 @@ import ( "os" "runtime" - "github.com/gogf/gf/g/internal/debug" - "github.com/gogf/gf/g/text/gregex" - "github.com/gogf/gf/g/text/gstr" + "github.com/gogf/gf/internal/debug" + "github.com/gogf/gf/text/gregex" + "github.com/gogf/gf/text/gstr" ) const ( - gPATH_FILTER_KEY = "/g/os/gfile/gfile_source.go" + gPATH_FILTER_KEY = "/gf/os/gfile/gfile_source.go" ) // SourcePath returns absolute file path of the current source file path. @@ -48,7 +48,8 @@ func MainPkgPath() string { for i := 1; i < 10000; i++ { if _, file, _, ok := runtime.Caller(i); ok { // is separated by '/' - if gstr.Contains(file, "/gf/g/") { + if gstr.Contains(file, "/github.com/gogf/gf/") && + !gstr.Contains(file, "/github.com/gogf/gf/example/") { continue } if Ext(file) != ".go" { diff --git a/g/os/gfile/gfile_time.go b/os/gfile/gfile_time.go similarity index 100% rename from g/os/gfile/gfile_time.go rename to os/gfile/gfile_time.go diff --git a/g/os/gfile/gfile_z_contents_test.go b/os/gfile/gfile_z_contents_test.go similarity index 99% rename from g/os/gfile/gfile_z_contents_test.go rename to os/gfile/gfile_z_contents_test.go index a67eaff48..a926b0d7b 100644 --- a/g/os/gfile/gfile_z_contents_test.go +++ b/os/gfile/gfile_z_contents_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/test/gtest" ) // 创建测试文件 diff --git a/g/os/gfile/gfile_z_scan_test.go b/os/gfile/gfile_z_scan_test.go similarity index 95% rename from g/os/gfile/gfile_z_scan_test.go rename to os/gfile/gfile_z_scan_test.go index 0ca2c80b8..c7b0defd1 100644 --- a/g/os/gfile/gfile_z_scan_test.go +++ b/os/gfile/gfile_z_scan_test.go @@ -3,9 +3,9 @@ package gfile_test import ( "testing" - "github.com/gogf/gf/g/os/gfile" + "github.com/gogf/gf/os/gfile" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/test/gtest" ) func Test_ScanDir(t *testing.T) { diff --git a/g/os/gfile/gfile_z_search_test.go b/os/gfile/gfile_z_search_test.go similarity index 94% rename from g/os/gfile/gfile_z_search_test.go rename to os/gfile/gfile_z_search_test.go index 5442ba2c5..9516cc928 100644 --- a/g/os/gfile/gfile_z_search_test.go +++ b/os/gfile/gfile_z_search_test.go @@ -4,8 +4,8 @@ import ( "path/filepath" "testing" - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/test/gtest" ) func Test_Search(t *testing.T) { diff --git a/g/os/gfile/gfile_z_size_test.go b/os/gfile/gfile_z_size_test.go similarity index 94% rename from g/os/gfile/gfile_z_size_test.go rename to os/gfile/gfile_z_size_test.go index 3aafba956..be000760d 100644 --- a/g/os/gfile/gfile_z_size_test.go +++ b/os/gfile/gfile_z_size_test.go @@ -3,8 +3,8 @@ package gfile_test import ( "testing" - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/test/gtest" ) func Test_Size(t *testing.T) { diff --git a/g/os/gfile/gfile_z_test.go b/os/gfile/gfile_z_test.go similarity index 99% rename from g/os/gfile/gfile_z_test.go rename to os/gfile/gfile_z_test.go index 63b12fa44..b2d1e0f5b 100644 --- a/g/os/gfile/gfile_z_test.go +++ b/os/gfile/gfile_z_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/test/gtest" ) func Test_IsDir(t *testing.T) { diff --git a/g/os/gfile/gfile_z_time_test.go b/os/gfile/gfile_z_time_test.go similarity index 92% rename from g/os/gfile/gfile_z_time_test.go rename to os/gfile/gfile_z_time_test.go index c61bf6d2e..a464200b7 100644 --- a/g/os/gfile/gfile_z_time_test.go +++ b/os/gfile/gfile_z_time_test.go @@ -4,8 +4,8 @@ import ( "os" "testing" - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/test/gtest" ) func Test_MTime(t *testing.T) { diff --git a/g/os/gfile/testdata/dir1/file1 b/os/gfile/testdata/dir1/file1 similarity index 100% rename from g/os/gfile/testdata/dir1/file1 rename to os/gfile/testdata/dir1/file1 diff --git a/g/os/gfile/testdata/dir2/file2 b/os/gfile/testdata/dir2/file2 similarity index 100% rename from g/os/gfile/testdata/dir2/file2 rename to os/gfile/testdata/dir2/file2 diff --git a/g/os/gflock/gflock.go b/os/gflock/gflock.go similarity index 97% rename from g/os/gflock/gflock.go rename to os/gflock/gflock.go index 5b0d3669c..3b244f5d1 100644 --- a/g/os/gflock/gflock.go +++ b/os/gflock/gflock.go @@ -8,8 +8,8 @@ package gflock import ( - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/third/github.com/theckman/go-flock" + flock "github.com/gogf/gf/internal/thirdparty/github.com/theckman/go-flock" + "github.com/gogf/gf/os/gfile" ) // File locker. diff --git a/g/os/gflock/gflock_unit_test.go b/os/gflock/gflock_unit_test.go similarity index 96% rename from g/os/gflock/gflock_unit_test.go rename to os/gflock/gflock_unit_test.go index 761071879..c4ed45dd0 100644 --- a/g/os/gflock/gflock_unit_test.go +++ b/os/gflock/gflock_unit_test.go @@ -10,10 +10,10 @@ import ( "testing" "time" - "github.com/gogf/gf/g/container/garray" - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/os/gflock" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/container/garray" + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/os/gflock" + "github.com/gogf/gf/test/gtest" ) func Test_GFlock_Base(t *testing.T) { diff --git a/g/os/gfpool/gfpool.go b/os/gfpool/gfpool.go similarity index 96% rename from g/os/gfpool/gfpool.go rename to os/gfpool/gfpool.go index c19eb32db..493783f82 100644 --- a/g/os/gfpool/gfpool.go +++ b/os/gfpool/gfpool.go @@ -9,12 +9,13 @@ package gfpool import ( "fmt" - "github.com/gogf/gf/g/container/gmap" - "github.com/gogf/gf/g/container/gpool" - "github.com/gogf/gf/g/container/gtype" - "github.com/gogf/gf/g/os/gfsnotify" "os" "sync" + + "github.com/gogf/gf/container/gmap" + "github.com/gogf/gf/container/gpool" + "github.com/gogf/gf/container/gtype" + "github.com/gogf/gf/os/gfsnotify" ) // File pointer pool. diff --git a/g/os/gfpool/gfpool_z_bench_test.go b/os/gfpool/gfpool_z_bench_test.go similarity index 100% rename from g/os/gfpool/gfpool_z_bench_test.go rename to os/gfpool/gfpool_z_bench_test.go diff --git a/g/os/gfpool/gfpool_z_unit_test.go b/os/gfpool/gfpool_z_unit_test.go similarity index 96% rename from g/os/gfpool/gfpool_z_unit_test.go rename to os/gfpool/gfpool_z_unit_test.go index 3026790fd..9730954c2 100644 --- a/g/os/gfpool/gfpool_z_unit_test.go +++ b/os/gfpool/gfpool_z_unit_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/os/gfpool" - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/os/gfpool" + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/test/gtest" ) // TestOpen test open file cache diff --git a/g/os/gfsnotify/gfsnotify.go b/os/gfsnotify/gfsnotify.go similarity index 93% rename from g/os/gfsnotify/gfsnotify.go rename to os/gfsnotify/gfsnotify.go index 08b1f860a..fc52f3dd3 100644 --- a/g/os/gfsnotify/gfsnotify.go +++ b/os/gfsnotify/gfsnotify.go @@ -13,12 +13,12 @@ import ( "errors" "fmt" - "github.com/gogf/gf/g/container/glist" - "github.com/gogf/gf/g/container/gmap" - "github.com/gogf/gf/g/container/gqueue" - "github.com/gogf/gf/g/container/gtype" - "github.com/gogf/gf/g/os/gcache" - "github.com/gogf/gf/third/github.com/fsnotify/fsnotify" + "github.com/gogf/gf/container/glist" + "github.com/gogf/gf/container/gmap" + "github.com/gogf/gf/container/gqueue" + "github.com/gogf/gf/container/gtype" + "github.com/gogf/gf/internal/thirdparty/github.com/fsnotify/fsnotify" + "github.com/gogf/gf/os/gcache" ) // 监听管理对象 diff --git a/g/os/gfsnotify/gfsnotify_event.go b/os/gfsnotify/gfsnotify_event.go similarity index 100% rename from g/os/gfsnotify/gfsnotify_event.go rename to os/gfsnotify/gfsnotify_event.go diff --git a/g/os/gfsnotify/gfsnotify_filefunc.go b/os/gfsnotify/gfsnotify_filefunc.go similarity index 100% rename from g/os/gfsnotify/gfsnotify_filefunc.go rename to os/gfsnotify/gfsnotify_filefunc.go diff --git a/g/os/gfsnotify/gfsnotify_watcher.go b/os/gfsnotify/gfsnotify_watcher.go similarity index 99% rename from g/os/gfsnotify/gfsnotify_watcher.go rename to os/gfsnotify/gfsnotify_watcher.go index 257d4f812..5dbe0d65f 100644 --- a/g/os/gfsnotify/gfsnotify_watcher.go +++ b/os/gfsnotify/gfsnotify_watcher.go @@ -10,7 +10,7 @@ import ( "errors" "fmt" - "github.com/gogf/gf/g/container/glist" + "github.com/gogf/gf/container/glist" ) // 添加监控，path参数支持文件或者目录路径，recursive为非必需参数，默认为递归监控(当path为目录时)。 diff --git a/g/os/gfsnotify/gfsnotify_watcher_loop.go b/os/gfsnotify/gfsnotify_watcher_loop.go similarity index 99% rename from g/os/gfsnotify/gfsnotify_watcher_loop.go rename to os/gfsnotify/gfsnotify_watcher_loop.go index 1199fb65f..814b47bbc 100644 --- a/g/os/gfsnotify/gfsnotify_watcher_loop.go +++ b/os/gfsnotify/gfsnotify_watcher_loop.go @@ -7,7 +7,7 @@ package gfsnotify import ( - "github.com/gogf/gf/g/container/glist" + "github.com/gogf/gf/container/glist" ) // 监听循环 diff --git a/g/os/gfsnotify/gfsnotify_z_unit_test.go b/os/gfsnotify/gfsnotify_z_unit_test.go similarity index 94% rename from g/os/gfsnotify/gfsnotify_z_unit_test.go rename to os/gfsnotify/gfsnotify_z_unit_test.go index 147b6fc64..621247a79 100644 --- a/g/os/gfsnotify/gfsnotify_z_unit_test.go +++ b/os/gfsnotify/gfsnotify_z_unit_test.go @@ -12,12 +12,12 @@ import ( "testing" "time" - "github.com/gogf/gf/g/container/gtype" - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/os/gfsnotify" - "github.com/gogf/gf/g/os/gtime" - "github.com/gogf/gf/g/test/gtest" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/container/gtype" + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/os/gfsnotify" + "github.com/gogf/gf/os/gtime" + "github.com/gogf/gf/test/gtest" + "github.com/gogf/gf/util/gconv" ) func TestWatcher_AddRemove(t *testing.T) { diff --git a/g/os/glog/glog.go b/os/glog/glog.go similarity index 98% rename from g/os/glog/glog.go rename to os/glog/glog.go index b6bee7509..ef0117634 100644 --- a/g/os/glog/glog.go +++ b/os/glog/glog.go @@ -10,8 +10,8 @@ package glog import ( "io" - "github.com/gogf/gf/g/internal/cmdenv" - "github.com/gogf/gf/g/os/grpool" + "github.com/gogf/gf/internal/cmdenv" + "github.com/gogf/gf/os/grpool" ) const ( diff --git a/g/os/glog/glog_api.go b/os/glog/glog_api.go similarity index 100% rename from g/os/glog/glog_api.go rename to os/glog/glog_api.go diff --git a/g/os/glog/glog_chaining.go b/os/glog/glog_chaining.go similarity index 100% rename from g/os/glog/glog_chaining.go rename to os/glog/glog_chaining.go diff --git a/g/os/glog/glog_logger.go b/os/glog/glog_logger.go similarity index 97% rename from g/os/glog/glog_logger.go rename to os/glog/glog_logger.go index bd22fccbe..774f3876b 100644 --- a/g/os/glog/glog_logger.go +++ b/os/glog/glog_logger.go @@ -15,13 +15,13 @@ import ( "strings" "time" - "github.com/gogf/gf/g/internal/debug" + "github.com/gogf/gf/internal/debug" - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/os/gfpool" - "github.com/gogf/gf/g/os/gtime" - "github.com/gogf/gf/g/text/gregex" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/os/gfpool" + "github.com/gogf/gf/os/gtime" + "github.com/gogf/gf/text/gregex" + "github.com/gogf/gf/util/gconv" ) type Logger struct { @@ -43,7 +43,7 @@ const ( gDEFAULT_FILE_POOL_FLAGS = os.O_CREATE | os.O_WRONLY | os.O_APPEND gDEFAULT_FPOOL_PERM = os.FileMode(0666) gDEFAULT_FPOOL_EXPIRE = 60000 - gPATH_FILTER_KEY = "/g/os/glog/glog" + gPATH_FILTER_KEY = "/gf/os/glog/glog" ) const ( diff --git a/g/os/glog/glog_logger_api.go b/os/glog/glog_logger_api.go similarity index 100% rename from g/os/glog/glog_logger_api.go rename to os/glog/glog_logger_api.go diff --git a/g/os/glog/glog_logger_chaining.go b/os/glog/glog_logger_chaining.go similarity index 99% rename from g/os/glog/glog_logger_chaining.go rename to os/glog/glog_logger_chaining.go index 02e43630e..f2f9831a6 100644 --- a/g/os/glog/glog_logger_chaining.go +++ b/os/glog/glog_logger_chaining.go @@ -9,7 +9,7 @@ package glog import ( "io" - "github.com/gogf/gf/g/os/gfile" + "github.com/gogf/gf/os/gfile" ) // To is a chaining function, diff --git a/g/os/glog/glog_logger_writer.go b/os/glog/glog_logger_writer.go similarity index 100% rename from g/os/glog/glog_logger_writer.go rename to os/glog/glog_logger_writer.go diff --git a/g/os/gmlock/gmlock.go b/os/gmlock/gmlock.go similarity index 100% rename from g/os/gmlock/gmlock.go rename to os/gmlock/gmlock.go diff --git a/g/os/gmlock/gmlock_locker.go b/os/gmlock/gmlock_locker.go similarity index 98% rename from g/os/gmlock/gmlock_locker.go rename to os/gmlock/gmlock_locker.go index 3e9c7b719..5c0138da7 100644 --- a/g/os/gmlock/gmlock_locker.go +++ b/os/gmlock/gmlock_locker.go @@ -7,8 +7,8 @@ package gmlock import ( - "github.com/gogf/gf/g/container/gmap" - "github.com/gogf/gf/g/os/gmutex" + "github.com/gogf/gf/container/gmap" + "github.com/gogf/gf/os/gmutex" ) // Memory locker. diff --git a/g/os/gmlock/gmlock_unit_lock_test.go b/os/gmlock/gmlock_unit_lock_test.go similarity index 96% rename from g/os/gmlock/gmlock_unit_lock_test.go rename to os/gmlock/gmlock_unit_lock_test.go index 8bd7bbdda..480ea11b5 100644 --- a/g/os/gmlock/gmlock_unit_lock_test.go +++ b/os/gmlock/gmlock_unit_lock_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "github.com/gogf/gf/g/container/garray" - "github.com/gogf/gf/g/os/gmlock" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/container/garray" + "github.com/gogf/gf/os/gmlock" + "github.com/gogf/gf/test/gtest" ) func Test_Locker_Lock(t *testing.T) { diff --git a/g/os/gmlock/gmlock_unit_rlock_test.go b/os/gmlock/gmlock_unit_rlock_test.go similarity index 98% rename from g/os/gmlock/gmlock_unit_rlock_test.go rename to os/gmlock/gmlock_unit_rlock_test.go index 1f017f7a1..66e60a31a 100644 --- a/g/os/gmlock/gmlock_unit_rlock_test.go +++ b/os/gmlock/gmlock_unit_rlock_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "github.com/gogf/gf/g/container/garray" - "github.com/gogf/gf/g/os/gmlock" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/container/garray" + "github.com/gogf/gf/os/gmlock" + "github.com/gogf/gf/test/gtest" ) func Test_Locker_RLock(t *testing.T) { diff --git a/g/os/gmutex/gmutex.go b/os/gmutex/gmutex.go similarity index 99% rename from g/os/gmutex/gmutex.go rename to os/gmutex/gmutex.go index b59927f2c..b39a80c2a 100644 --- a/g/os/gmutex/gmutex.go +++ b/os/gmutex/gmutex.go @@ -11,7 +11,7 @@ import ( "math" "runtime" - "github.com/gogf/gf/g/container/gtype" + "github.com/gogf/gf/container/gtype" ) // The high level Mutex, which implements more rich features for mutex. diff --git a/g/os/gmutex/gmutex_bench_test.go b/os/gmutex/gmutex_bench_test.go similarity index 97% rename from g/os/gmutex/gmutex_bench_test.go rename to os/gmutex/gmutex_bench_test.go index 2e67d89f2..848b31c73 100644 --- a/g/os/gmutex/gmutex_bench_test.go +++ b/os/gmutex/gmutex_bench_test.go @@ -10,7 +10,7 @@ import ( "sync" "testing" - "github.com/gogf/gf/g/os/gmutex" + "github.com/gogf/gf/os/gmutex" ) var ( diff --git a/g/os/gmutex/gmutex_unit_test.go b/os/gmutex/gmutex_unit_test.go similarity index 98% rename from g/os/gmutex/gmutex_unit_test.go rename to os/gmutex/gmutex_unit_test.go index 709079944..08957b579 100644 --- a/g/os/gmutex/gmutex_unit_test.go +++ b/os/gmutex/gmutex_unit_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "github.com/gogf/gf/g/container/garray" - "github.com/gogf/gf/g/os/gmutex" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/container/garray" + "github.com/gogf/gf/os/gmutex" + "github.com/gogf/gf/test/gtest" ) func Test_Mutex_RUnlock(t *testing.T) { diff --git a/g/os/gproc/gproc.go b/os/gproc/gproc.go similarity index 98% rename from g/os/gproc/gproc.go rename to os/gproc/gproc.go index 51ff3187b..3533f8cfe 100644 --- a/g/os/gproc/gproc.go +++ b/os/gproc/gproc.go @@ -15,8 +15,8 @@ import ( "strings" "time" - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/util/gconv" ) const ( diff --git a/g/os/gproc/gproc_comm.go b/os/gproc/gproc_comm.go similarity index 92% rename from g/os/gproc/gproc_comm.go rename to os/gproc/gproc_comm.go index 5402de948..78de5a177 100644 --- a/g/os/gproc/gproc_comm.go +++ b/os/gproc/gproc_comm.go @@ -8,10 +8,11 @@ package gproc import ( - "github.com/gogf/gf/g/container/gmap" - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/util/gconv" "os" + + "github.com/gogf/gf/container/gmap" + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/util/gconv" ) // 进程通信数据结构 diff --git a/g/os/gproc/gproc_comm_receive.go b/os/gproc/gproc_comm_receive.go similarity index 93% rename from g/os/gproc/gproc_comm_receive.go rename to os/gproc/gproc_comm_receive.go index 8da7ad064..b0b0035c8 100644 --- a/g/os/gproc/gproc_comm_receive.go +++ b/os/gproc/gproc_comm_receive.go @@ -11,13 +11,14 @@ package gproc import ( "encoding/json" "fmt" - "github.com/gogf/gf/g/container/gqueue" - "github.com/gogf/gf/g/container/gtype" - "github.com/gogf/gf/g/net/gtcp" - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/util/gconv" "net" + + "github.com/gogf/gf/container/gqueue" + "github.com/gogf/gf/container/gtype" + "github.com/gogf/gf/net/gtcp" + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/util/gconv" ) const ( diff --git a/g/os/gproc/gproc_comm_send.go b/os/gproc/gproc_comm_send.go similarity index 95% rename from g/os/gproc/gproc_comm_send.go rename to os/gproc/gproc_comm_send.go index d3ba589c3..a05f8a23d 100644 --- a/g/os/gproc/gproc_comm_send.go +++ b/os/gproc/gproc_comm_send.go @@ -11,11 +11,12 @@ import ( "encoding/json" "errors" "fmt" - "github.com/gogf/gf/g/net/gtcp" - "github.com/gogf/gf/g/os/gfcache" - "github.com/gogf/gf/g/util/gconv" "io" "time" + + "github.com/gogf/gf/net/gtcp" + "github.com/gogf/gf/os/gfcache" + "github.com/gogf/gf/util/gconv" ) const ( diff --git a/g/os/gproc/gproc_manager.go b/os/gproc/gproc_manager.go similarity index 98% rename from g/os/gproc/gproc_manager.go rename to os/gproc/gproc_manager.go index ad6158fbe..841fceb72 100644 --- a/g/os/gproc/gproc_manager.go +++ b/os/gproc/gproc_manager.go @@ -8,8 +8,9 @@ package gproc import ( - "github.com/gogf/gf/g/container/gmap" "os" + + "github.com/gogf/gf/container/gmap" ) // 进程管理器 diff --git a/g/os/gproc/gproc_proccess.go b/os/gproc/gproc_proccess.go similarity index 100% rename from g/os/gproc/gproc_proccess.go rename to os/gproc/gproc_proccess.go diff --git a/g/os/grpool/grpool.go b/os/grpool/grpool.go similarity index 97% rename from g/os/grpool/grpool.go rename to os/grpool/grpool.go index 27d443f1e..668fbb202 100644 --- a/g/os/grpool/grpool.go +++ b/os/grpool/grpool.go @@ -10,8 +10,8 @@ package grpool import ( "errors" - "github.com/gogf/gf/g/container/glist" - "github.com/gogf/gf/g/container/gtype" + "github.com/gogf/gf/container/glist" + "github.com/gogf/gf/container/gtype" ) // Goroutine Pool diff --git a/g/os/grpool/grpool_bench_1_test.go b/os/grpool/grpool_bench_1_test.go similarity index 94% rename from g/os/grpool/grpool_bench_1_test.go rename to os/grpool/grpool_bench_1_test.go index 5527f5496..0f6eb0f72 100644 --- a/g/os/grpool/grpool_bench_1_test.go +++ b/os/grpool/grpool_bench_1_test.go @@ -9,8 +9,9 @@ package grpool_test import ( - "github.com/gogf/gf/g/os/grpool" "testing" + + "github.com/gogf/gf/os/grpool" ) func increment() { diff --git a/g/os/grpool/grpool_bench_2_test.go b/os/grpool/grpool_bench_2_test.go similarity index 94% rename from g/os/grpool/grpool_bench_2_test.go rename to os/grpool/grpool_bench_2_test.go index 0e06d3a86..c7fae031d 100644 --- a/g/os/grpool/grpool_bench_2_test.go +++ b/os/grpool/grpool_bench_2_test.go @@ -9,8 +9,9 @@ package grpool_test import ( - "github.com/gogf/gf/g/os/grpool" "testing" + + "github.com/gogf/gf/os/grpool" ) var n = 500000 diff --git a/g/os/grpool/grpool_unit_test.go b/os/grpool/grpool_unit_test.go similarity index 94% rename from g/os/grpool/grpool_unit_test.go rename to os/grpool/grpool_unit_test.go index f4a35d710..976a5078c 100644 --- a/g/os/grpool/grpool_unit_test.go +++ b/os/grpool/grpool_unit_test.go @@ -13,9 +13,9 @@ import ( "testing" "time" - "github.com/gogf/gf/g/container/garray" - "github.com/gogf/gf/g/os/grpool" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/container/garray" + "github.com/gogf/gf/os/grpool" + "github.com/gogf/gf/test/gtest" ) func Test_Basic(t *testing.T) { diff --git a/g/os/gspath/gspath.go b/os/gspath/gspath.go similarity index 97% rename from g/os/gspath/gspath.go rename to os/gspath/gspath.go index 31e2161a3..28d465f06 100644 --- a/g/os/gspath/gspath.go +++ b/os/gspath/gspath.go @@ -14,13 +14,14 @@ package gspath import ( "errors" "fmt" - "github.com/gogf/gf/g/container/garray" - "github.com/gogf/gf/g/container/gmap" - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/text/gstr" "os" "sort" "strings" + + "github.com/gogf/gf/container/garray" + "github.com/gogf/gf/container/gmap" + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/text/gstr" ) // 文件目录搜索管理对象 diff --git a/g/os/gspath/gspath_cache.go b/os/gspath/gspath_cache.go similarity index 96% rename from g/os/gspath/gspath_cache.go rename to os/gspath/gspath_cache.go index aa84b76c9..52c847ed1 100644 --- a/g/os/gspath/gspath_cache.go +++ b/os/gspath/gspath_cache.go @@ -10,11 +10,12 @@ package gspath import ( - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/os/gfsnotify" - "github.com/gogf/gf/g/text/gstr" "runtime" "strings" + + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/os/gfsnotify" + "github.com/gogf/gf/text/gstr" ) // 递归添加目录下的文件 diff --git a/g/os/gspath/gspath_unit_test.go b/os/gspath/gspath_unit_test.go similarity index 96% rename from g/os/gspath/gspath_unit_test.go rename to os/gspath/gspath_unit_test.go index 9f08d6c0a..223eaabc6 100644 --- a/g/os/gspath/gspath_unit_test.go +++ b/os/gspath/gspath_unit_test.go @@ -1,10 +1,11 @@ package gspath_test import ( - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/os/gspath" - "github.com/gogf/gf/g/test/gtest" "testing" + + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/os/gspath" + "github.com/gogf/gf/test/gtest" ) func TestSPath_Api(t *testing.T) { diff --git a/g/os/gtime/gtime.go b/os/gtime/gtime.go similarity index 99% rename from g/os/gtime/gtime.go rename to os/gtime/gtime.go index f27c82b1b..2640c46ad 100644 --- a/g/os/gtime/gtime.go +++ b/os/gtime/gtime.go @@ -14,7 +14,7 @@ import ( "strings" "time" - "github.com/gogf/gf/g/text/gregex" + "github.com/gogf/gf/text/gregex" ) const ( diff --git a/g/os/gtime/gtime_format.go b/os/gtime/gtime_format.go similarity index 99% rename from g/os/gtime/gtime_format.go rename to os/gtime/gtime_format.go index d54edcfd4..8cc6024fa 100644 --- a/g/os/gtime/gtime_format.go +++ b/os/gtime/gtime_format.go @@ -11,7 +11,7 @@ import ( "strconv" "strings" - "github.com/gogf/gf/g/text/gregex" + "github.com/gogf/gf/text/gregex" ) var ( diff --git a/g/os/gtime/gtime_time.go b/os/gtime/gtime_time.go similarity index 100% rename from g/os/gtime/gtime_time.go rename to os/gtime/gtime_time.go diff --git a/g/os/gtime/gtime_z_bench_test.go b/os/gtime/gtime_z_bench_test.go similarity index 97% rename from g/os/gtime/gtime_z_bench_test.go rename to os/gtime/gtime_z_bench_test.go index 1b6e60c54..69a37e223 100644 --- a/g/os/gtime/gtime_z_bench_test.go +++ b/os/gtime/gtime_z_bench_test.go @@ -9,7 +9,7 @@ package gtime_test import ( "testing" - "github.com/gogf/gf/g/os/gtime" + "github.com/gogf/gf/os/gtime" ) func Benchmark_Second(b *testing.B) { diff --git a/g/os/gtime/gtime_z_unit_basic_test.go b/os/gtime/gtime_z_unit_basic_test.go similarity index 98% rename from g/os/gtime/gtime_z_unit_basic_test.go rename to os/gtime/gtime_z_unit_basic_test.go index 236797672..88d75f7fe 100644 --- a/g/os/gtime/gtime_z_unit_basic_test.go +++ b/os/gtime/gtime_z_unit_basic_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/gogf/gf/g/os/gtime" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/os/gtime" + "github.com/gogf/gf/test/gtest" ) func Test_SetTimeZone(t *testing.T) { diff --git a/g/os/gtime/gtime_z_unit_format_test.go b/os/gtime/gtime_z_unit_format_test.go similarity index 98% rename from g/os/gtime/gtime_z_unit_format_test.go rename to os/gtime/gtime_z_unit_format_test.go index 657d394ec..95551ced9 100644 --- a/g/os/gtime/gtime_z_unit_format_test.go +++ b/os/gtime/gtime_z_unit_format_test.go @@ -1,9 +1,10 @@ package gtime_test import ( - "github.com/gogf/gf/g/os/gtime" - "github.com/gogf/gf/g/test/gtest" "testing" + + "github.com/gogf/gf/os/gtime" + "github.com/gogf/gf/test/gtest" ) func Test_Format(t *testing.T) { diff --git a/g/os/gtime/gtime_z_unit_time_test.go b/os/gtime/gtime_z_unit_time_test.go similarity index 98% rename from g/os/gtime/gtime_z_unit_time_test.go rename to os/gtime/gtime_z_unit_time_test.go index 71af39768..ae1b7f3b7 100644 --- a/g/os/gtime/gtime_z_unit_time_test.go +++ b/os/gtime/gtime_z_unit_time_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/gogf/gf/g/os/gtime" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/os/gtime" + "github.com/gogf/gf/test/gtest" ) func Test_New(t *testing.T) { diff --git a/g/os/gtimer/gtimer.go b/os/gtimer/gtimer.go similarity index 98% rename from g/os/gtimer/gtimer.go rename to os/gtimer/gtimer.go index e7e87c77e..1e7a87f5d 100644 --- a/g/os/gtimer/gtimer.go +++ b/os/gtimer/gtimer.go @@ -13,9 +13,10 @@ package gtimer import ( - "github.com/gogf/gf/g/internal/cmdenv" "math" "time" + + "github.com/gogf/gf/internal/cmdenv" ) const ( diff --git a/g/os/gtimer/gtimer_entry.go b/os/gtimer/gtimer_entry.go similarity index 99% rename from g/os/gtimer/gtimer_entry.go rename to os/gtimer/gtimer_entry.go index a271df959..e1859e7d5 100644 --- a/g/os/gtimer/gtimer_entry.go +++ b/os/gtimer/gtimer_entry.go @@ -7,8 +7,9 @@ package gtimer import ( - "github.com/gogf/gf/g/container/gtype" "time" + + "github.com/gogf/gf/container/gtype" ) // 循环任务项 diff --git a/g/os/gtimer/gtimer_loop.go b/os/gtimer/gtimer_loop.go similarity index 97% rename from g/os/gtimer/gtimer_loop.go rename to os/gtimer/gtimer_loop.go index ac64e138a..e2a79701b 100644 --- a/g/os/gtimer/gtimer_loop.go +++ b/os/gtimer/gtimer_loop.go @@ -7,8 +7,9 @@ package gtimer import ( - "github.com/gogf/gf/g/container/glist" "time" + + "github.com/gogf/gf/container/glist" ) // 开始循环 diff --git a/g/os/gtimer/gtimer_timer.go b/os/gtimer/gtimer_timer.go similarity index 98% rename from g/os/gtimer/gtimer_timer.go rename to os/gtimer/gtimer_timer.go index a5a8c857a..62ac2fd04 100644 --- a/g/os/gtimer/gtimer_timer.go +++ b/os/gtimer/gtimer_timer.go @@ -7,9 +7,10 @@ package gtimer import ( - "github.com/gogf/gf/g/container/glist" - "github.com/gogf/gf/g/container/gtype" "time" + + "github.com/gogf/gf/container/glist" + "github.com/gogf/gf/container/gtype" ) // 定时器/分层时间轮 diff --git a/g/os/gtimer/gtimer_z_bench_test.go b/os/gtimer/gtimer_z_bench_test.go similarity index 94% rename from g/os/gtimer/gtimer_z_bench_test.go rename to os/gtimer/gtimer_z_bench_test.go index b1216c685..b114ad55a 100644 --- a/g/os/gtimer/gtimer_z_bench_test.go +++ b/os/gtimer/gtimer_z_bench_test.go @@ -7,9 +7,10 @@ package gtimer_test import ( - "github.com/gogf/gf/g/os/gtimer" "testing" "time" + + "github.com/gogf/gf/os/gtimer" ) var ( diff --git a/g/os/gtimer/gtimer_z_example_test.go b/os/gtimer/gtimer_z_example_test.go similarity index 94% rename from g/os/gtimer/gtimer_z_example_test.go rename to os/gtimer/gtimer_z_example_test.go index 4d388d18c..ff0a9e98f 100644 --- a/g/os/gtimer/gtimer_z_example_test.go +++ b/os/gtimer/gtimer_z_example_test.go @@ -8,8 +8,9 @@ package gtimer_test import ( "fmt" - "github.com/gogf/gf/g/os/gtimer" "time" + + "github.com/gogf/gf/os/gtimer" ) func ExampleAdd() { diff --git a/g/os/gtimer/gtimer_z_unit_0_test.go b/os/gtimer/gtimer_z_unit_0_test.go similarity index 96% rename from g/os/gtimer/gtimer_z_unit_0_test.go rename to os/gtimer/gtimer_z_unit_0_test.go index 924bfcf9e..ae5c33072 100644 --- a/g/os/gtimer/gtimer_z_unit_0_test.go +++ b/os/gtimer/gtimer_z_unit_0_test.go @@ -9,11 +9,12 @@ package gtimer_test import ( - "github.com/gogf/gf/g/container/garray" - "github.com/gogf/gf/g/os/gtimer" - "github.com/gogf/gf/g/test/gtest" "testing" "time" + + "github.com/gogf/gf/container/garray" + "github.com/gogf/gf/os/gtimer" + "github.com/gogf/gf/test/gtest" ) func TestSetTimeout(t *testing.T) { diff --git a/g/os/gtimer/gtimer_z_unit_1_test.go b/os/gtimer/gtimer_z_unit_1_test.go similarity index 98% rename from g/os/gtimer/gtimer_z_unit_1_test.go rename to os/gtimer/gtimer_z_unit_1_test.go index e0b2c09c6..9a2982397 100644 --- a/g/os/gtimer/gtimer_z_unit_1_test.go +++ b/os/gtimer/gtimer_z_unit_1_test.go @@ -9,11 +9,12 @@ package gtimer_test import ( - "github.com/gogf/gf/g/container/garray" - "github.com/gogf/gf/g/os/gtimer" - "github.com/gogf/gf/g/test/gtest" "testing" "time" + + "github.com/gogf/gf/container/garray" + "github.com/gogf/gf/os/gtimer" + "github.com/gogf/gf/test/gtest" ) func New() *gtimer.Timer { diff --git a/g/os/gtimer/gtimer_z_unit_2_test.go b/os/gtimer/gtimer_z_unit_2_test.go similarity index 94% rename from g/os/gtimer/gtimer_z_unit_2_test.go rename to os/gtimer/gtimer_z_unit_2_test.go index f6a02478d..6399d2426 100644 --- a/g/os/gtimer/gtimer_z_unit_2_test.go +++ b/os/gtimer/gtimer_z_unit_2_test.go @@ -9,11 +9,12 @@ package gtimer_test import ( - "github.com/gogf/gf/g/container/garray" - "github.com/gogf/gf/g/os/gtimer" - "github.com/gogf/gf/g/test/gtest" "testing" "time" + + "github.com/gogf/gf/container/garray" + "github.com/gogf/gf/os/gtimer" + "github.com/gogf/gf/test/gtest" ) func TestEntry_Start_Stop_Close(t *testing.T) { diff --git a/g/os/gview/gview.go b/os/gview/gview.go similarity index 97% rename from g/os/gview/gview.go rename to os/gview/gview.go index a69a5ba94..7035727ec 100644 --- a/g/os/gview/gview.go +++ b/os/gview/gview.go @@ -11,13 +11,14 @@ import ( "bytes" "errors" "fmt" - "github.com/gogf/gf" - "github.com/gogf/gf/g/container/garray" - "github.com/gogf/gf/g/internal/cmdenv" - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/os/gspath" "sync" + + "github.com/gogf/gf" + "github.com/gogf/gf/container/garray" + "github.com/gogf/gf/internal/cmdenv" + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/os/gspath" ) // View object for template engine. diff --git a/g/os/gview/gview_buildin.go b/os/gview/gview_buildin.go similarity index 96% rename from g/os/gview/gview_buildin.go rename to os/gview/gview_buildin.go index 4963e6c9e..5447007fb 100644 --- a/g/os/gview/gview_buildin.go +++ b/os/gview/gview_buildin.go @@ -8,12 +8,13 @@ package gview import ( "fmt" - "github.com/gogf/gf/g/encoding/ghtml" - "github.com/gogf/gf/g/encoding/gurl" - "github.com/gogf/gf/g/os/gtime" - "github.com/gogf/gf/g/text/gstr" - "github.com/gogf/gf/g/util/gconv" "strings" + + "github.com/gogf/gf/encoding/ghtml" + "github.com/gogf/gf/encoding/gurl" + "github.com/gogf/gf/os/gtime" + "github.com/gogf/gf/text/gstr" + "github.com/gogf/gf/util/gconv" ) // Build-in template function: eq diff --git a/g/os/gview/gview_config.go b/os/gview/gview_config.go similarity index 100% rename from g/os/gview/gview_config.go rename to os/gview/gview_config.go diff --git a/g/os/gview/gview_doparse.go b/os/gview/gview_doparse.go similarity index 94% rename from g/os/gview/gview_doparse.go rename to os/gview/gview_doparse.go index f5c3f3afa..deae7beff 100644 --- a/g/os/gview/gview_doparse.go +++ b/os/gview/gview_doparse.go @@ -10,17 +10,18 @@ import ( "bytes" "errors" "fmt" - "github.com/gogf/gf/g/container/gmap" - "github.com/gogf/gf/g/encoding/ghash" - "github.com/gogf/gf/g/os/gfcache" - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/os/gfsnotify" - "github.com/gogf/gf/g/os/glog" - "github.com/gogf/gf/g/os/gmlock" - "github.com/gogf/gf/g/os/gspath" - "github.com/gogf/gf/g/text/gstr" - "github.com/gogf/gf/g/util/gconv" "text/template" + + "github.com/gogf/gf/container/gmap" + "github.com/gogf/gf/encoding/ghash" + "github.com/gogf/gf/os/gfcache" + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/os/gfsnotify" + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/os/gmlock" + "github.com/gogf/gf/os/gspath" + "github.com/gogf/gf/text/gstr" + "github.com/gogf/gf/util/gconv" ) const ( diff --git a/g/os/gview/gview_error.go b/os/gview/gview_error.go similarity index 93% rename from g/os/gview/gview_error.go rename to os/gview/gview_error.go index 8905a173c..073bbf5e1 100644 --- a/g/os/gview/gview_error.go +++ b/os/gview/gview_error.go @@ -7,7 +7,7 @@ package gview import ( - "github.com/gogf/gf/g/internal/cmdenv" + "github.com/gogf/gf/internal/cmdenv" ) const ( diff --git a/g/os/gview/gview_instance.go b/os/gview/gview_instance.go similarity index 94% rename from g/os/gview/gview_instance.go rename to os/gview/gview_instance.go index 9e1d7dac4..c5e25e55d 100644 --- a/g/os/gview/gview_instance.go +++ b/os/gview/gview_instance.go @@ -6,7 +6,7 @@ package gview -import "github.com/gogf/gf/g/container/gmap" +import "github.com/gogf/gf/container/gmap" const ( // Default group name for instance usage. diff --git a/g/os/gview/gview_unit_test.go b/os/gview/gview_unit_test.go similarity index 97% rename from g/os/gview/gview_unit_test.go rename to os/gview/gview_unit_test.go index e9e78bbc7..9c04e2a04 100644 --- a/g/os/gview/gview_unit_test.go +++ b/os/gview/gview_unit_test.go @@ -1,14 +1,15 @@ package gview_test import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/os/gview" - "github.com/gogf/gf/g/test/gtest" - "github.com/gogf/gf/g/text/gstr" "io/ioutil" "os" "testing" + + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/os/gfile" + "github.com/gogf/gf/os/gview" + "github.com/gogf/gf/test/gtest" + "github.com/gogf/gf/text/gstr" ) func init() { diff --git a/g/test/gtest/gtest.go b/test/gtest/gtest.go similarity index 98% rename from g/test/gtest/gtest.go rename to test/gtest/gtest.go index 8f00f3055..ef5ee9767 100644 --- a/g/test/gtest/gtest.go +++ b/test/gtest/gtest.go @@ -13,13 +13,13 @@ import ( "reflect" "testing" - "github.com/gogf/gf/g/internal/debug" + "github.com/gogf/gf/internal/debug" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/util/gconv" ) const ( - gPATH_FILTER_KEY = "/g/test/gtest/gtest" + gPATH_FILTER_KEY = "/gf/test/gtest/gtest" ) // Case creates an unit test case. diff --git a/g/test/gtest/gtest_test.go b/test/gtest/gtest_test.go similarity index 93% rename from g/test/gtest/gtest_test.go rename to test/gtest/gtest_test.go index 36cdf853f..b881de05d 100644 --- a/g/test/gtest/gtest_test.go +++ b/test/gtest/gtest_test.go @@ -9,7 +9,7 @@ package gtest_test import ( "testing" - "github.com/gogf/gf/g/test/gtest" + "github.com/gogf/gf/test/gtest" ) func TestCase(t *testing.T) { diff --git a/g/text/gregex/gregex.go b/text/gregex/gregex.go similarity index 100% rename from g/text/gregex/gregex.go rename to text/gregex/gregex.go diff --git a/g/text/gregex/gregex_cache.go b/text/gregex/gregex_cache.go similarity index 100% rename from g/text/gregex/gregex_cache.go rename to text/gregex/gregex_cache.go diff --git a/g/text/gregex/gregex_z_bench_test.go b/text/gregex/gregex_z_bench_test.go similarity index 95% rename from g/text/gregex/gregex_z_bench_test.go rename to text/gregex/gregex_z_bench_test.go index c8cfa553d..a6c9e4af9 100644 --- a/g/text/gregex/gregex_z_bench_test.go +++ b/text/gregex/gregex_z_bench_test.go @@ -12,7 +12,7 @@ import ( "regexp" "testing" - "github.com/gogf/gf/g/text/gregex" + "github.com/gogf/gf/text/gregex" ) var pattern = `(\w+).+\-\-\s*(.+)` diff --git a/g/text/gregex/gregex_z_unit_test.go b/text/gregex/gregex_z_unit_test.go similarity index 99% rename from g/text/gregex/gregex_z_unit_test.go rename to text/gregex/gregex_z_unit_test.go index bd2556b3b..ecee38d4f 100644 --- a/g/text/gregex/gregex_z_unit_test.go +++ b/text/gregex/gregex_z_unit_test.go @@ -9,10 +9,11 @@ package gregex_test import ( - "github.com/gogf/gf/g/test/gtest" - "github.com/gogf/gf/g/text/gregex" "strings" "testing" + + "github.com/gogf/gf/test/gtest" + "github.com/gogf/gf/text/gregex" ) var ( diff --git a/g/text/gstr/gstr.go b/text/gstr/gstr.go similarity index 98% rename from g/text/gstr/gstr.go rename to text/gstr/gstr.go index 57237e4bd..c9d34ce93 100644 --- a/g/text/gstr/gstr.go +++ b/text/gstr/gstr.go @@ -16,11 +16,11 @@ import ( "unicode" "unicode/utf8" - "github.com/gogf/gf/g/internal/strutils" + "github.com/gogf/gf/internal/strutils" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/util/gconv" - "github.com/gogf/gf/g/util/grand" + "github.com/gogf/gf/util/grand" ) // Replace returns a copy of the string @@ -611,10 +611,10 @@ func CompareVersion(a, b string) int { } array1 := strings.Split(a, ".") array2 := strings.Split(b, ".") - for i := 0; i < len(array2) - len(array1); i++ { + for i := 0; i < len(array2)-len(array1); i++ { array1 = append(array1, "") } - for i := 0; i < len(array1) - len(array2); i++ { + for i := 0; i < len(array1)-len(array2); i++ { array2 = append(array2, "") } v1 := 0 diff --git a/g/text/gstr/gstr_levenshtein.go b/text/gstr/gstr_levenshtein.go similarity index 100% rename from g/text/gstr/gstr_levenshtein.go rename to text/gstr/gstr_levenshtein.go diff --git a/g/text/gstr/gstr_parse.go b/text/gstr/gstr_parse.go similarity index 100% rename from g/text/gstr/gstr_parse.go rename to text/gstr/gstr_parse.go diff --git a/g/text/gstr/gstr_pos.go b/text/gstr/gstr_pos.go similarity index 100% rename from g/text/gstr/gstr_pos.go rename to text/gstr/gstr_pos.go diff --git a/g/text/gstr/gstr_similartext.go b/text/gstr/gstr_similartext.go similarity index 100% rename from g/text/gstr/gstr_similartext.go rename to text/gstr/gstr_similartext.go diff --git a/g/text/gstr/gstr_soundex.go b/text/gstr/gstr_soundex.go similarity index 100% rename from g/text/gstr/gstr_soundex.go rename to text/gstr/gstr_soundex.go diff --git a/g/text/gstr/gstr_trim.go b/text/gstr/gstr_trim.go similarity index 100% rename from g/text/gstr/gstr_trim.go rename to text/gstr/gstr_trim.go diff --git a/g/text/gstr/gstr_z_unit_basic_test.go b/text/gstr/gstr_z_unit_basic_test.go similarity index 99% rename from g/text/gstr/gstr_z_unit_basic_test.go rename to text/gstr/gstr_z_unit_basic_test.go index a8efe1fe0..8f163949f 100644 --- a/g/text/gstr/gstr_z_unit_basic_test.go +++ b/text/gstr/gstr_z_unit_basic_test.go @@ -9,10 +9,11 @@ package gstr_test import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/test/gtest" - "github.com/gogf/gf/g/text/gstr" "testing" + + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/test/gtest" + "github.com/gogf/gf/text/gstr" ) func Test_Replace(t *testing.T) { diff --git a/g/text/gstr/gstr_z_unit_parse_test.go b/text/gstr/gstr_z_unit_parse_test.go similarity index 93% rename from g/text/gstr/gstr_z_unit_parse_test.go rename to text/gstr/gstr_z_unit_parse_test.go index 012b3aab0..16ad9627e 100644 --- a/g/text/gstr/gstr_z_unit_parse_test.go +++ b/text/gstr/gstr_z_unit_parse_test.go @@ -9,10 +9,11 @@ package gstr_test import ( - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/test/gtest" - "github.com/gogf/gf/g/text/gstr" "testing" + + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/test/gtest" + "github.com/gogf/gf/text/gstr" ) func Test_Parse(t *testing.T) { diff --git a/g/text/gstr/gstr_z_unit_pos_test.go b/text/gstr/gstr_z_unit_pos_test.go similarity index 95% rename from g/text/gstr/gstr_z_unit_pos_test.go rename to text/gstr/gstr_z_unit_pos_test.go index 879bcf04e..a8724e478 100644 --- a/g/text/gstr/gstr_z_unit_pos_test.go +++ b/text/gstr/gstr_z_unit_pos_test.go @@ -9,9 +9,10 @@ package gstr_test import ( - "github.com/gogf/gf/g/test/gtest" - "github.com/gogf/gf/g/text/gstr" "testing" + + "github.com/gogf/gf/test/gtest" + "github.com/gogf/gf/text/gstr" ) func Test_Pos(t *testing.T) { diff --git a/g/text/gstr/gstr_z_unit_trim_test.go b/text/gstr/gstr_z_unit_trim_test.go similarity index 94% rename from g/text/gstr/gstr_z_unit_trim_test.go rename to text/gstr/gstr_z_unit_trim_test.go index b019dbc75..0ad6ba7c0 100644 --- a/g/text/gstr/gstr_z_unit_trim_test.go +++ b/text/gstr/gstr_z_unit_trim_test.go @@ -9,9 +9,10 @@ package gstr_test import ( - "github.com/gogf/gf/g/test/gtest" - "github.com/gogf/gf/g/text/gstr" "testing" + + "github.com/gogf/gf/test/gtest" + "github.com/gogf/gf/text/gstr" ) func Test_Trim(t *testing.T) { diff --git a/third/README.MD b/third/README.MD deleted file mode 100644 index d01b35096..000000000 --- a/third/README.MD +++ /dev/null @@ -1 +0,0 @@ -`GF` self-maintains its third-party-packages, developers need no worry about the dependencies. \ No newline at end of file diff --git a/g/util/gconv/gconv.go b/util/gconv/gconv.go similarity index 99% rename from g/util/gconv/gconv.go rename to util/gconv/gconv.go index 631494805..10e44019d 100644 --- a/g/util/gconv/gconv.go +++ b/util/gconv/gconv.go @@ -13,7 +13,7 @@ import ( "reflect" "strconv" - "github.com/gogf/gf/g/encoding/gbinary" + "github.com/gogf/gf/encoding/gbinary" ) // Type assert api for String(). diff --git a/g/util/gconv/gconv_map.go b/util/gconv/gconv_map.go similarity index 99% rename from g/util/gconv/gconv_map.go rename to util/gconv/gconv_map.go index 56f0b8a92..2f13f3046 100644 --- a/g/util/gconv/gconv_map.go +++ b/util/gconv/gconv_map.go @@ -11,8 +11,8 @@ import ( "reflect" "strings" - "github.com/gogf/gf/g/internal/empty" - "github.com/gogf/gf/g/internal/strutils" + "github.com/gogf/gf/internal/empty" + "github.com/gogf/gf/internal/strutils" ) // Map converts any variable to map[string]interface{}. diff --git a/g/util/gconv/gconv_slice.go b/util/gconv/gconv_slice.go similarity index 99% rename from g/util/gconv/gconv_slice.go rename to util/gconv/gconv_slice.go index 6d9ff97d2..38135d396 100644 --- a/g/util/gconv/gconv_slice.go +++ b/util/gconv/gconv_slice.go @@ -11,7 +11,7 @@ import ( "fmt" "reflect" - "github.com/gogf/gf/g/internal/strutils" + "github.com/gogf/gf/internal/strutils" ) // SliceInt is alias of Ints. diff --git a/g/util/gconv/gconv_struct.go b/util/gconv/gconv_struct.go similarity index 99% rename from g/util/gconv/gconv_struct.go rename to util/gconv/gconv_struct.go index 51ae60e52..deb2c45ef 100644 --- a/g/util/gconv/gconv_struct.go +++ b/util/gconv/gconv_struct.go @@ -12,8 +12,8 @@ import ( "reflect" "strings" - "github.com/gogf/gf/g/internal/structs" - "github.com/gogf/gf/g/internal/strutils" + "github.com/gogf/gf/internal/structs" + "github.com/gogf/gf/internal/strutils" ) // Struct maps the params key-value pairs to the corresponding struct object's properties. diff --git a/g/util/gconv/gconv_time.go b/util/gconv/gconv_time.go similarity index 94% rename from g/util/gconv/gconv_time.go rename to util/gconv/gconv_time.go index 34025128f..e1fa23d71 100644 --- a/g/util/gconv/gconv_time.go +++ b/util/gconv/gconv_time.go @@ -9,8 +9,8 @@ package gconv import ( "time" - "github.com/gogf/gf/g/internal/strutils" - "github.com/gogf/gf/g/os/gtime" + "github.com/gogf/gf/internal/strutils" + "github.com/gogf/gf/os/gtime" ) // Time converts to time.Time. diff --git a/g/util/gconv/gconv_z_all_test.go b/util/gconv/gconv_z_all_test.go similarity index 99% rename from g/util/gconv/gconv_z_all_test.go rename to util/gconv/gconv_z_all_test.go index 9fc8aed85..71a2b05d6 100644 --- a/g/util/gconv/gconv_z_all_test.go +++ b/util/gconv/gconv_z_all_test.go @@ -10,10 +10,10 @@ import ( "testing" "time" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/os/gtime" - "github.com/gogf/gf/g/test/gtest" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/os/gtime" + "github.com/gogf/gf/test/gtest" + "github.com/gogf/gf/util/gconv" ) type apiString interface { diff --git a/g/util/gconv/gconv_z_bench_bytes_test.go b/util/gconv/gconv_z_bench_bytes_test.go similarity index 98% rename from g/util/gconv/gconv_z_bench_bytes_test.go rename to util/gconv/gconv_z_bench_bytes_test.go index 7e39d1760..3109b976a 100644 --- a/g/util/gconv/gconv_z_bench_bytes_test.go +++ b/util/gconv/gconv_z_bench_bytes_test.go @@ -12,7 +12,7 @@ import ( "testing" "unsafe" - "github.com/gogf/gf/g/encoding/gbinary" + "github.com/gogf/gf/encoding/gbinary" ) var valueBytes = gbinary.Encode(123456789) diff --git a/g/util/gconv/gconv_z_bench_float_test.go b/util/gconv/gconv_z_bench_float_test.go similarity index 100% rename from g/util/gconv/gconv_z_bench_float_test.go rename to util/gconv/gconv_z_bench_float_test.go diff --git a/g/util/gconv/gconv_z_bench_int_test.go b/util/gconv/gconv_z_bench_int_test.go similarity index 100% rename from g/util/gconv/gconv_z_bench_int_test.go rename to util/gconv/gconv_z_bench_int_test.go diff --git a/g/util/gconv/gconv_z_bench_str_test.go b/util/gconv/gconv_z_bench_str_test.go similarity index 100% rename from g/util/gconv/gconv_z_bench_str_test.go rename to util/gconv/gconv_z_bench_str_test.go diff --git a/g/util/gconv/gconv_z_unit_basic_test.go b/util/gconv/gconv_z_unit_basic_test.go similarity index 94% rename from g/util/gconv/gconv_z_unit_basic_test.go rename to util/gconv/gconv_z_unit_basic_test.go index 02cde52f5..0d4dab64f 100644 --- a/g/util/gconv/gconv_z_unit_basic_test.go +++ b/util/gconv/gconv_z_unit_basic_test.go @@ -9,8 +9,8 @@ package gconv_test import ( "testing" - "github.com/gogf/gf/g/test/gtest" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/test/gtest" + "github.com/gogf/gf/util/gconv" ) func Test_Basic(t *testing.T) { diff --git a/g/util/gconv/gconv_z_unit_bool_test.go b/util/gconv/gconv_z_unit_bool_test.go similarity index 94% rename from g/util/gconv/gconv_z_unit_bool_test.go rename to util/gconv/gconv_z_unit_bool_test.go index 9adf4b60f..0f8e76f94 100644 --- a/g/util/gconv/gconv_z_unit_bool_test.go +++ b/util/gconv/gconv_z_unit_bool_test.go @@ -7,9 +7,10 @@ package gconv_test import ( - "github.com/gogf/gf/g/test/gtest" - "github.com/gogf/gf/g/util/gconv" "testing" + + "github.com/gogf/gf/test/gtest" + "github.com/gogf/gf/util/gconv" ) type boolStruct struct { diff --git a/g/util/gconv/gconv_z_unit_map_test.go b/util/gconv/gconv_z_unit_map_test.go similarity index 98% rename from g/util/gconv/gconv_z_unit_map_test.go rename to util/gconv/gconv_z_unit_map_test.go index c40c9e6df..3ebe7b904 100644 --- a/g/util/gconv/gconv_z_unit_map_test.go +++ b/util/gconv/gconv_z_unit_map_test.go @@ -9,9 +9,9 @@ package gconv_test import ( "testing" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/test/gtest" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/test/gtest" + "github.com/gogf/gf/util/gconv" ) func Test_Map_Basic(t *testing.T) { diff --git a/g/util/gconv/gconv_z_unit_slice_test.go b/util/gconv/gconv_z_unit_slice_test.go similarity index 95% rename from g/util/gconv/gconv_z_unit_slice_test.go rename to util/gconv/gconv_z_unit_slice_test.go index 3b7c54322..4bc22fe16 100644 --- a/g/util/gconv/gconv_z_unit_slice_test.go +++ b/util/gconv/gconv_z_unit_slice_test.go @@ -9,9 +9,9 @@ package gconv_test import ( "testing" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/test/gtest" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/test/gtest" + "github.com/gogf/gf/util/gconv" ) func Test_Slice(t *testing.T) { diff --git a/g/util/gconv/gconv_z_unit_string_test.go b/util/gconv/gconv_z_unit_string_test.go similarity index 96% rename from g/util/gconv/gconv_z_unit_string_test.go rename to util/gconv/gconv_z_unit_string_test.go index 1af1a7a3b..860ab5dc0 100644 --- a/g/util/gconv/gconv_z_unit_string_test.go +++ b/util/gconv/gconv_z_unit_string_test.go @@ -7,9 +7,10 @@ package gconv_test import ( - "github.com/gogf/gf/g/test/gtest" - "github.com/gogf/gf/g/util/gconv" "testing" + + "github.com/gogf/gf/test/gtest" + "github.com/gogf/gf/util/gconv" ) type stringStruct1 struct { diff --git a/g/util/gconv/gconv_z_unit_struct_test.go b/util/gconv/gconv_z_unit_struct_test.go similarity index 98% rename from g/util/gconv/gconv_z_unit_struct_test.go rename to util/gconv/gconv_z_unit_struct_test.go index aa067ba0e..d37ed4265 100644 --- a/g/util/gconv/gconv_z_unit_struct_test.go +++ b/util/gconv/gconv_z_unit_struct_test.go @@ -10,10 +10,10 @@ import ( "testing" "time" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/os/gtime" - "github.com/gogf/gf/g/test/gtest" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/os/gtime" + "github.com/gogf/gf/test/gtest" + "github.com/gogf/gf/util/gconv" ) func Test_Struct_Basic1(t *testing.T) { diff --git a/g/util/gconv/gconv_z_unit_time_test.go b/util/gconv/gconv_z_unit_time_test.go similarity index 85% rename from g/util/gconv/gconv_z_unit_time_test.go rename to util/gconv/gconv_z_unit_time_test.go index b9d4ec79a..f439a4352 100644 --- a/g/util/gconv/gconv_z_unit_time_test.go +++ b/util/gconv/gconv_z_unit_time_test.go @@ -7,11 +7,12 @@ package gconv_test import ( - "github.com/gogf/gf/g/os/gtime" - "github.com/gogf/gf/g/test/gtest" - "github.com/gogf/gf/g/util/gconv" "testing" "time" + + "github.com/gogf/gf/os/gtime" + "github.com/gogf/gf/test/gtest" + "github.com/gogf/gf/util/gconv" ) func Test_Time(t *testing.T) { diff --git a/g/util/gpage/gpage.go b/util/gpage/gpage.go similarity index 98% rename from g/util/gpage/gpage.go rename to util/gpage/gpage.go index e899657f9..7718068a8 100644 --- a/g/util/gpage/gpage.go +++ b/util/gpage/gpage.go @@ -9,13 +9,14 @@ package gpage import ( "fmt" - "github.com/gogf/gf/g/net/ghttp" - "github.com/gogf/gf/g/text/gregex" - "github.com/gogf/gf/g/text/gstr" - "github.com/gogf/gf/g/util/gconv" "math" url2 "net/url" "strings" + + "github.com/gogf/gf/net/ghttp" + "github.com/gogf/gf/text/gregex" + "github.com/gogf/gf/text/gstr" + "github.com/gogf/gf/util/gconv" ) // 分页对象 diff --git a/g/util/grand/grand.go b/util/grand/grand.go similarity index 100% rename from g/util/grand/grand.go rename to util/grand/grand.go diff --git a/g/util/grand/grand_intn.go b/util/grand/grand_intn.go similarity index 100% rename from g/util/grand/grand_intn.go rename to util/grand/grand_intn.go diff --git a/g/util/grand/grand_z_bench_test.go b/util/grand/grand_z_bench_test.go similarity index 94% rename from g/util/grand/grand_z_bench_test.go rename to util/grand/grand_z_bench_test.go index caf5b0d2c..a7b0be890 100644 --- a/g/util/grand/grand_z_bench_test.go +++ b/util/grand/grand_z_bench_test.go @@ -9,8 +9,9 @@ package grand_test import ( - "github.com/gogf/gf/g/util/grand" "testing" + + "github.com/gogf/gf/util/grand" ) var buffer = make([]byte, 8) diff --git a/g/util/grand/grand_z_unit_test.go b/util/grand/grand_z_unit_test.go similarity index 97% rename from g/util/grand/grand_z_unit_test.go rename to util/grand/grand_z_unit_test.go index cb8eb59ba..d084aea39 100644 --- a/g/util/grand/grand_z_unit_test.go +++ b/util/grand/grand_z_unit_test.go @@ -9,9 +9,10 @@ package grand_test import ( - "github.com/gogf/gf/g/test/gtest" - "github.com/gogf/gf/g/util/grand" "testing" + + "github.com/gogf/gf/test/gtest" + "github.com/gogf/gf/util/grand" ) func Test_Intn(t *testing.T) { diff --git a/g/util/gutil/gutil.go b/util/gutil/gutil.go similarity index 96% rename from g/util/gutil/gutil.go rename to util/gutil/gutil.go index de320ba5a..69615fbd6 100644 --- a/g/util/gutil/gutil.go +++ b/util/gutil/gutil.go @@ -13,8 +13,8 @@ import ( "fmt" "os" - "github.com/gogf/gf/g/internal/empty" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/internal/empty" + "github.com/gogf/gf/util/gconv" ) // Dump prints variables to stdout with more manually readable. diff --git a/g/util/gutil/gutil_comparator.go b/util/gutil/gutil_comparator.go similarity index 98% rename from g/util/gutil/gutil_comparator.go rename to util/gutil/gutil_comparator.go index 4cbfa9579..3f62ab1d6 100644 --- a/g/util/gutil/gutil_comparator.go +++ b/util/gutil/gutil_comparator.go @@ -1,8 +1,9 @@ package gutil import ( - "github.com/gogf/gf/g/util/gconv" "strings" + + "github.com/gogf/gf/util/gconv" ) // Comparator is a function that compare a and b, and returns the result as int. diff --git a/g/util/gutil/gutil_debug.go b/util/gutil/gutil_debug.go similarity index 95% rename from g/util/gutil/gutil_debug.go rename to util/gutil/gutil_debug.go index a9ba7c9f5..3117900c0 100644 --- a/g/util/gutil/gutil_debug.go +++ b/util/gutil/gutil_debug.go @@ -7,7 +7,7 @@ package gutil import ( - "github.com/gogf/gf/g/internal/debug" + "github.com/gogf/gf/internal/debug" ) // PrintStack prints to standard error the stack trace returned by runtime.Stack. diff --git a/g/util/gutil/gutil_z_bench_test.go b/util/gutil/gutil_z_bench_test.go similarity index 100% rename from g/util/gutil/gutil_z_bench_test.go rename to util/gutil/gutil_z_bench_test.go diff --git a/g/util/gutil/gutil_z_comparator_z_unit_test.go b/util/gutil/gutil_z_comparator_z_unit_test.go similarity index 98% rename from g/util/gutil/gutil_z_comparator_z_unit_test.go rename to util/gutil/gutil_z_comparator_z_unit_test.go index 82b556a68..c214d30f9 100755 --- a/g/util/gutil/gutil_z_comparator_z_unit_test.go +++ b/util/gutil/gutil_z_comparator_z_unit_test.go @@ -3,8 +3,8 @@ package gutil_test import ( "testing" - "github.com/gogf/gf/g/test/gtest" - "github.com/gogf/gf/g/util/gutil" + "github.com/gogf/gf/test/gtest" + "github.com/gogf/gf/util/gutil" ) func Test_ComparatorString(t *testing.T) { diff --git a/g/util/gutil/gutil_z_unit_test.go b/util/gutil/gutil_z_unit_test.go similarity index 93% rename from g/util/gutil/gutil_z_unit_test.go rename to util/gutil/gutil_z_unit_test.go index 05fd8a9b9..e3aed0824 100755 --- a/g/util/gutil/gutil_z_unit_test.go +++ b/util/gutil/gutil_z_unit_test.go @@ -3,8 +3,8 @@ package gutil_test import ( "testing" - "github.com/gogf/gf/g/test/gtest" - "github.com/gogf/gf/g/util/gutil" + "github.com/gogf/gf/test/gtest" + "github.com/gogf/gf/util/gutil" ) func Test_Dump(t *testing.T) { diff --git a/g/util/gvalid/gvalid.go b/util/gvalid/gvalid.go similarity index 99% rename from g/util/gvalid/gvalid.go rename to util/gvalid/gvalid.go index 3ca1a72e6..1df71b33c 100644 --- a/g/util/gvalid/gvalid.go +++ b/util/gvalid/gvalid.go @@ -10,8 +10,9 @@ package gvalid import ( - "github.com/gogf/gf/g/text/gregex" "strings" + + "github.com/gogf/gf/text/gregex" ) /* diff --git a/g/util/gvalid/gvalid_check.go b/util/gvalid/gvalid_check.go similarity index 98% rename from g/util/gvalid/gvalid_check.go rename to util/gvalid/gvalid_check.go index 2c909636b..b0728a9d6 100644 --- a/g/util/gvalid/gvalid_check.go +++ b/util/gvalid/gvalid_check.go @@ -11,13 +11,13 @@ import ( "strconv" "strings" - "github.com/gogf/gf/g/container/gmap" - "github.com/gogf/gf/g/encoding/gjson" - "github.com/gogf/gf/g/net/gipv4" - "github.com/gogf/gf/g/net/gipv6" - "github.com/gogf/gf/g/os/gtime" - "github.com/gogf/gf/g/text/gregex" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/container/gmap" + "github.com/gogf/gf/encoding/gjson" + "github.com/gogf/gf/net/gipv4" + "github.com/gogf/gf/net/gipv6" + "github.com/gogf/gf/os/gtime" + "github.com/gogf/gf/text/gregex" + "github.com/gogf/gf/util/gconv" ) const ( diff --git a/g/util/gvalid/gvalid_check_map.go b/util/gvalid/gvalid_check_map.go similarity index 99% rename from g/util/gvalid/gvalid_check_map.go rename to util/gvalid/gvalid_check_map.go index 88a450476..df82f65a3 100644 --- a/g/util/gvalid/gvalid_check_map.go +++ b/util/gvalid/gvalid_check_map.go @@ -9,7 +9,7 @@ package gvalid import ( "strings" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/util/gconv" ) // 检测键值对参数Map， diff --git a/g/util/gvalid/gvalid_check_struct.go b/util/gvalid/gvalid_check_struct.go similarity index 98% rename from g/util/gvalid/gvalid_check_struct.go rename to util/gvalid/gvalid_check_struct.go index 4510aecb1..112fa4091 100644 --- a/g/util/gvalid/gvalid_check_struct.go +++ b/util/gvalid/gvalid_check_struct.go @@ -9,8 +9,8 @@ package gvalid import ( "strings" - "github.com/gogf/gf/g/internal/structs" - "github.com/gogf/gf/g/util/gconv" + "github.com/gogf/gf/internal/structs" + "github.com/gogf/gf/util/gconv" ) var ( diff --git a/g/util/gvalid/gvalid_error.go b/util/gvalid/gvalid_error.go similarity index 100% rename from g/util/gvalid/gvalid_error.go rename to util/gvalid/gvalid_error.go diff --git a/g/util/gvalid/gvalid_message.go b/util/gvalid/gvalid_message.go similarity index 100% rename from g/util/gvalid/gvalid_message.go rename to util/gvalid/gvalid_message.go diff --git a/g/util/gvalid/gvalid_unit_basic_all_test.go b/util/gvalid/gvalid_unit_basic_all_test.go similarity index 99% rename from g/util/gvalid/gvalid_unit_basic_all_test.go rename to util/gvalid/gvalid_unit_basic_all_test.go index 7345e69de..500caa8dc 100755 --- a/g/util/gvalid/gvalid_unit_basic_all_test.go +++ b/util/gvalid/gvalid_unit_basic_all_test.go @@ -9,9 +9,9 @@ package gvalid_test import ( "testing" - "github.com/gogf/gf/g" - "github.com/gogf/gf/g/test/gtest" - "github.com/gogf/gf/g/util/gvalid" + "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/test/gtest" + "github.com/gogf/gf/util/gvalid" ) func Test_Check(t *testing.T) { diff --git a/g/util/gvalid/gvalid_unit_checkmap_test.go b/util/gvalid/gvalid_unit_checkmap_test.go similarity index 98% rename from g/util/gvalid/gvalid_unit_checkmap_test.go rename to util/gvalid/gvalid_unit_checkmap_test.go index 05b519d94..639a185f0 100755 --- a/g/util/gvalid/gvalid_unit_checkmap_test.go +++ b/util/gvalid/gvalid_unit_checkmap_test.go @@ -9,8 +9,8 @@ package gvalid_test import ( "testing" - "github.com/gogf/gf/g/test/gtest" - "github.com/gogf/gf/g/util/gvalid" + "github.com/gogf/gf/test/gtest" + "github.com/gogf/gf/util/gvalid" ) func Test_CheckMap(t *testing.T) { diff --git a/g/util/gvalid/gvalid_unit_checkstruct_test.go b/util/gvalid/gvalid_unit_checkstruct_test.go similarity index 98% rename from g/util/gvalid/gvalid_unit_checkstruct_test.go rename to util/gvalid/gvalid_unit_checkstruct_test.go index 6c4b68754..4219fca90 100755 --- a/g/util/gvalid/gvalid_unit_checkstruct_test.go +++ b/util/gvalid/gvalid_unit_checkstruct_test.go @@ -9,10 +9,10 @@ package gvalid_test import ( "testing" - "github.com/gogf/gf/g" + "github.com/gogf/gf/frame/g" - "github.com/gogf/gf/g/test/gtest" - "github.com/gogf/gf/g/util/gvalid" + "github.com/gogf/gf/test/gtest" + "github.com/gogf/gf/util/gvalid" ) func Test_CheckStruct(t *testing.T) { diff --git a/g/util/gvalid/gvalid_unit_customerror_test.go b/util/gvalid/gvalid_unit_customerror_test.go similarity index 97% rename from g/util/gvalid/gvalid_unit_customerror_test.go rename to util/gvalid/gvalid_unit_customerror_test.go index c7cea0db8..6dfd673bb 100755 --- a/g/util/gvalid/gvalid_unit_customerror_test.go +++ b/util/gvalid/gvalid_unit_customerror_test.go @@ -10,8 +10,8 @@ import ( "strings" "testing" - "github.com/gogf/gf/g/test/gtest" - "github.com/gogf/gf/g/util/gvalid" + "github.com/gogf/gf/test/gtest" + "github.com/gogf/gf/util/gvalid" ) func Test_Map(t *testing.T) {