From 14c1b765695af47609d2d0cf73a53f7923a7d936 Mon Sep 17 00:00:00 2001 From: Ming Deng Date: Thu, 8 Oct 2020 17:17:15 +0800 Subject: [PATCH] remove pkg directory; remove build directory; remove githook directory; --- .travis.yml | 2 +- {pkg/adapter => adapter}/admin.go | 4 +- {pkg/adapter => adapter}/app.go | 6 +- {pkg/adapter => adapter}/beego.go | 6 +- {pkg/adapter => adapter}/build_info.go | 0 {pkg/adapter => adapter}/cache/cache.go | 0 .../cache/cache_adapter.go | 2 +- {pkg/adapter => adapter}/cache/cache_test.go | 0 {pkg/adapter => adapter}/cache/conv.go | 2 +- {pkg/adapter => adapter}/cache/conv_test.go | 0 {pkg/adapter => adapter}/cache/file.go | 2 +- .../cache/memcache/memcache.go | 4 +- .../cache/memcache/memcache_test.go | 2 +- {pkg/adapter => adapter}/cache/memory.go | 2 +- {pkg/adapter => adapter}/cache/redis/redis.go | 4 +- .../cache/redis/redis_test.go | 2 +- {pkg/adapter => adapter}/cache/ssdb/ssdb.go | 4 +- .../cache/ssdb/ssdb_test.go | 2 +- {pkg/adapter => adapter}/config.go | 6 +- {pkg/adapter => adapter}/config/adapter.go | 2 +- {pkg/adapter => adapter}/config/config.go | 2 +- .../adapter => adapter}/config/config_test.go | 0 {pkg/adapter => adapter}/config/env/env.go | 2 +- .../config/env/env_test.go | 0 {pkg/adapter => adapter}/config/fake.go | 2 +- {pkg/adapter => adapter}/config/ini_test.go | 0 {pkg/adapter => adapter}/config/json.go | 2 +- {pkg/adapter => adapter}/config/json_test.go | 0 {pkg/adapter => adapter}/config/xml/xml.go | 2 +- .../config/xml/xml_test.go | 2 +- {pkg/adapter => adapter}/config/yaml/yaml.go | 2 +- .../config/yaml/yaml_test.go | 2 +- .../context/acceptencoder.go | 2 +- {pkg/adapter => adapter}/context/context.go | 2 +- {pkg/adapter => adapter}/context/input.go | 2 +- {pkg/adapter => adapter}/context/output.go | 2 +- {pkg/adapter => adapter}/context/renderer.go | 2 +- {pkg/adapter => adapter}/context/response.go | 0 {pkg/adapter => adapter}/controller.go | 6 +- {pkg/adapter => adapter}/doc.go | 0 {pkg/adapter => adapter}/error.go | 6 +- {pkg/adapter => adapter}/filter.go | 6 +- {pkg/adapter => adapter}/flash.go | 2 +- {pkg/adapter => adapter}/fs.go | 2 +- {pkg/adapter => adapter}/grace/grace.go | 2 +- {pkg/adapter => adapter}/grace/server.go | 2 +- {pkg/adapter => adapter}/httplib/httplib.go | 2 +- .../httplib/httplib_test.go | 0 {pkg/adapter => adapter}/log.go | 4 +- {pkg/adapter => adapter}/logs/accesslog.go | 2 +- adapter/logs/alils/alils.go | 5 + adapter/logs/es/es.go | 5 + {pkg/adapter => adapter}/logs/log.go | 2 +- {pkg/adapter => adapter}/logs/log_adapter.go | 2 +- {pkg/adapter => adapter}/logs/logger.go | 2 +- {pkg/adapter => adapter}/logs/logger_test.go | 0 {pkg/adapter => adapter}/metric/prometheus.go | 20 ++-- .../metric/prometheus_test.go | 2 +- {pkg/adapter => adapter}/migration/ddl.go | 2 +- {pkg/adapter => adapter}/migration/doc.go | 0 .../migration/migration.go | 2 +- {pkg/adapter => adapter}/namespace.go | 6 +- {pkg/adapter => adapter}/orm/cmd.go | 2 +- {pkg/adapter => adapter}/orm/db.go | 2 +- {pkg/adapter => adapter}/orm/db_alias.go | 2 +- {pkg/adapter => adapter}/orm/models.go | 2 +- {pkg/adapter => adapter}/orm/models_boot.go | 2 +- {pkg/adapter => adapter}/orm/models_fields.go | 2 +- {pkg/adapter => adapter}/orm/orm.go | 6 +- {pkg/adapter => adapter}/orm/orm_conds.go | 2 +- {pkg/adapter => adapter}/orm/orm_log.go | 2 +- {pkg/adapter => adapter}/orm/orm_queryset.go | 2 +- {pkg/adapter => adapter}/orm/qb.go | 2 +- {pkg/adapter => adapter}/orm/qb_mysql.go | 2 +- {pkg/adapter => adapter}/orm/qb_tidb.go | 2 +- .../orm/query_setter_adapter.go | 2 +- {pkg/adapter => adapter}/orm/types.go | 2 +- {pkg/adapter => adapter}/orm/utils.go | 2 +- {pkg/adapter => adapter}/orm/utils_test.go | 0 .../plugins/apiauth/apiauth.go | 8 +- .../plugins/apiauth/apiauth_test.go | 0 .../adapter => adapter}/plugins/auth/basic.go | 8 +- .../plugins/authz/authz.go | 8 +- .../plugins/authz/authz_model.conf | 0 .../plugins/authz/authz_policy.csv | 0 .../plugins/authz/authz_test.go | 6 +- {pkg/adapter => adapter}/plugins/cors/cors.go | 8 +- {pkg/adapter => adapter}/policy.go | 6 +- {pkg/adapter => adapter}/router.go | 6 +- .../session/couchbase/sess_couchbase.go | 4 +- .../session/ledis/ledis_session.go | 4 +- .../session/memcache/sess_memcache.go | 4 +- .../session/mysql/sess_mysql.go | 4 +- .../session/postgres/sess_postgresql.go | 4 +- .../session/provider_adapter.go | 2 +- .../session/redis/sess_redis.go | 4 +- .../session/redis_cluster/redis_cluster.go | 4 +- .../redis_sentinel/sess_redis_sentinel.go | 4 +- .../sess_redis_sentinel_test.go | 2 +- .../session/sess_cookie.go | 2 +- .../session/sess_cookie_test.go | 0 {pkg/adapter => adapter}/session/sess_file.go | 2 +- .../session/sess_file_test.go | 0 {pkg/adapter => adapter}/session/sess_mem.go | 2 +- .../session/sess_mem_test.go | 0 {pkg/adapter => adapter}/session/sess_test.go | 0 .../adapter => adapter}/session/sess_utils.go | 2 +- {pkg/adapter => adapter}/session/session.go | 2 +- .../session/ssdb/sess_ssdb.go | 4 +- .../session/store_adapter.go | 2 +- {pkg/adapter => adapter}/swagger/swagger.go | 2 +- {pkg/adapter => adapter}/template.go | 2 +- {pkg/adapter => adapter}/templatefunc.go | 2 +- {pkg/adapter => adapter}/templatefunc_test.go | 0 {pkg/adapter => adapter}/testing/client.go | 2 +- .../toolbox/healthcheck.go | 2 +- {pkg/adapter => adapter}/toolbox/profile.go | 2 +- .../toolbox/profile_test.go | 0 .../adapter => adapter}/toolbox/statistics.go | 2 +- .../toolbox/statistics_test.go | 0 {pkg/adapter => adapter}/toolbox/task.go | 2 +- {pkg/adapter => adapter}/toolbox/task_test.go | 0 {pkg/adapter => adapter}/tree.go | 6 +- {pkg/adapter => adapter}/tree_test.go | 4 +- {pkg/adapter => adapter}/utils/caller.go | 2 +- {pkg/adapter => adapter}/utils/caller_test.go | 0 .../adapter => adapter}/utils/captcha/LICENSE | 0 .../utils/captcha/README.md | 0 .../utils/captcha/captcha.go | 8 +- .../utils/captcha/image.go | 2 +- .../utils/captcha/image_test.go | 2 +- {pkg/adapter => adapter}/utils/debug.go | 2 +- {pkg/adapter => adapter}/utils/debug_test.go | 0 {pkg/adapter => adapter}/utils/file.go | 2 +- {pkg/adapter => adapter}/utils/mail.go | 2 +- {pkg/adapter => adapter}/utils/mail_test.go | 0 .../utils/pagination/controller.go | 6 +- .../utils/pagination/doc.go | 0 .../utils/pagination/paginator.go | 2 +- {pkg/adapter => adapter}/utils/rand.go | 2 +- {pkg/adapter => adapter}/utils/rand_test.go | 0 {pkg/adapter => adapter}/utils/safemap.go | 2 +- .../adapter => adapter}/utils/safemap_test.go | 0 {pkg/adapter => adapter}/utils/slice.go | 2 +- {pkg/adapter => adapter}/utils/slice_test.go | 0 {pkg/adapter => adapter}/utils/utils.go | 2 +- {pkg/adapter => adapter}/validation/util.go | 2 +- .../validation/validation.go | 2 +- .../validation/validation_test.go | 0 .../validation/validators.go | 2 +- build/gobuild-sample.sh | 112 ------------------ build/report_build_info.sh | 52 -------- pkg/build_info.go => build_info.go | 2 +- {pkg/client => client}/cache/README.md | 0 {pkg/client => client}/cache/cache.go | 0 {pkg/client => client}/cache/cache_test.go | 0 {pkg/client => client}/cache/conv.go | 0 {pkg/client => client}/cache/conv_test.go | 0 {pkg/client => client}/cache/file.go | 0 .../cache/memcache/memcache.go | 2 +- .../cache/memcache/memcache_test.go | 2 +- {pkg/client => client}/cache/memory.go | 0 {pkg/client => client}/cache/redis/redis.go | 2 +- .../cache/redis/redis_test.go | 2 +- {pkg/client => client}/cache/ssdb/ssdb.go | 2 +- .../client => client}/cache/ssdb/ssdb_test.go | 2 +- {pkg/client => client}/httplib/README.md | 0 {pkg/client => client}/httplib/filter.go | 0 .../httplib/filter/opentracing/filter.go | 2 +- .../httplib/filter/opentracing/filter_test.go | 2 +- .../httplib/filter/prometheus/filter.go | 2 +- .../httplib/filter/prometheus/filter_test.go | 2 +- {pkg/client => client}/httplib/httplib.go | 0 .../client => client}/httplib/httplib_test.go | 0 .../httplib/testing/client.go | 2 +- {pkg/client => client}/orm/README.md | 0 {pkg/client => client}/orm/cmd.go | 0 {pkg/client => client}/orm/cmd_utils.go | 0 {pkg/client => client}/orm/db.go | 2 +- {pkg/client => client}/orm/db_alias.go | 0 {pkg/client => client}/orm/db_alias_test.go | 0 {pkg/client => client}/orm/db_mysql.go | 0 {pkg/client => client}/orm/db_oracle.go | 2 +- {pkg/client => client}/orm/db_postgres.go | 0 {pkg/client => client}/orm/db_sqlite.go | 2 +- {pkg/client => client}/orm/db_tables.go | 0 {pkg/client => client}/orm/db_tidb.go | 0 {pkg/client => client}/orm/db_utils.go | 0 {pkg/client => client}/orm/do_nothing_orm.go | 2 +- .../orm/do_nothing_orm_test.go | 0 {pkg/client => client}/orm/filter.go | 0 .../orm/filter/bean/default_value_filter.go | 6 +- .../filter/bean/default_value_filter_test.go | 2 +- .../orm/filter/opentracing/filter.go | 2 +- .../orm/filter/opentracing/filter_test.go | 2 +- .../orm/filter/prometheus/filter.go | 2 +- .../orm/filter/prometheus/filter_test.go | 2 +- .../orm/filter_orm_decorator.go | 2 +- .../orm/filter_orm_decorator_test.go | 2 +- {pkg/client => client}/orm/filter_test.go | 0 {pkg/client => client}/orm/hints/db_hints.go | 2 +- .../orm/hints/db_hints_test.go | 0 {pkg/client => client}/orm/invocation.go | 0 {pkg/client => client}/orm/migration/ddl.go | 2 +- {pkg/client => client}/orm/migration/doc.go | 0 .../orm/migration/migration.go | 4 +- .../client => client}/orm/model_utils_test.go | 0 {pkg/client => client}/orm/models.go | 0 {pkg/client => client}/orm/models_boot.go | 0 {pkg/client => client}/orm/models_fields.go | 0 {pkg/client => client}/orm/models_info_f.go | 0 {pkg/client => client}/orm/models_info_m.go | 0 {pkg/client => client}/orm/models_test.go | 12 +- {pkg/client => client}/orm/models_utils.go | 0 .../orm/models_utils_test.go | 0 {pkg/client => client}/orm/orm.go | 8 +- {pkg/client => client}/orm/orm_conds.go | 0 {pkg/client => client}/orm/orm_log.go | 0 {pkg/client => client}/orm/orm_object.go | 0 {pkg/client => client}/orm/orm_querym2m.go | 0 {pkg/client => client}/orm/orm_queryset.go | 2 +- {pkg/client => client}/orm/orm_raw.go | 0 {pkg/client => client}/orm/orm_test.go | 2 +- {pkg/client => client}/orm/qb.go | 0 {pkg/client => client}/orm/qb_mysql.go | 0 {pkg/client => client}/orm/qb_postgres.go | 0 {pkg/client => client}/orm/qb_tidb.go | 0 {pkg/client => client}/orm/types.go | 2 +- {pkg/client => client}/orm/utils.go | 0 {pkg/client => client}/orm/utils_test.go | 0 {pkg/core => core}/bean/context.go | 0 {pkg/core => core}/bean/doc.go | 0 {pkg/core => core}/bean/factory.go | 0 {pkg/core => core}/bean/metadata.go | 0 .../bean/tag_auto_wire_bean_factory.go | 2 +- .../bean/tag_auto_wire_bean_factory_test.go | 0 {pkg/core => core}/bean/time_type_adapter.go | 0 .../bean/time_type_adapter_test.go | 0 {pkg/core => core}/bean/type_adapter.go | 0 {pkg/core => core}/config/base_config_test.go | 0 {pkg/core => core}/config/config.go | 0 {pkg/core => core}/config/config_test.go | 0 {pkg/core => core}/config/env/env.go | 2 +- {pkg/core => core}/config/env/env_test.go | 0 {pkg/core => core}/config/etcd/config.go | 4 +- {pkg/core => core}/config/etcd/config_test.go | 0 {pkg/core => core}/config/fake.go | 0 {pkg/core => core}/config/ini.go | 0 {pkg/core => core}/config/ini_test.go | 0 {pkg/core => core}/config/json/json.go | 4 +- {pkg/core => core}/config/json/json_test.go | 2 +- {pkg/core => core}/config/xml/xml.go | 4 +- {pkg/core => core}/config/xml/xml_test.go | 2 +- {pkg/core => core}/config/yaml/yaml.go | 5 +- {pkg/core => core}/config/yaml/yaml_test.go | 2 +- {pkg/core => core}/governor/command.go | 0 {pkg/core => core}/governor/healthcheck.go | 0 {pkg/core => core}/governor/profile.go | 2 +- {pkg/core => core}/governor/profile_test.go | 0 {pkg/core => core}/logs/README.md | 0 {pkg/core => core}/logs/access_log.go | 0 {pkg/core => core}/logs/access_log_test.go | 0 {pkg/core => core}/logs/alils/alils.go | 2 +- {pkg/core => core}/logs/alils/config.go | 0 {pkg/core => core}/logs/alils/log.pb.go | 0 {pkg/core => core}/logs/alils/log_config.go | 0 {pkg/core => core}/logs/alils/log_project.go | 0 {pkg/core => core}/logs/alils/log_store.go | 0 .../core => core}/logs/alils/machine_group.go | 0 {pkg/core => core}/logs/alils/request.go | 0 {pkg/core => core}/logs/alils/signature.go | 0 {pkg/core => core}/logs/conn.go | 0 {pkg/core => core}/logs/conn_test.go | 0 {pkg/core => core}/logs/console.go | 0 {pkg/core => core}/logs/console_test.go | 0 {pkg/core => core}/logs/es/es.go | 2 +- {pkg/core => core}/logs/es/index.go | 2 +- {pkg/core => core}/logs/es/index_test.go | 2 +- {pkg/core => core}/logs/file.go | 0 {pkg/core => core}/logs/file_test.go | 0 {pkg/core => core}/logs/formatter.go | 0 {pkg/core => core}/logs/formatter_test.go | 0 {pkg/core => core}/logs/jianliao.go | 0 {pkg/core => core}/logs/jianliao_test.go | 0 {pkg/core => core}/logs/log.go | 0 {pkg/core => core}/logs/log_msg.go | 0 {pkg/core => core}/logs/log_msg_test.go | 0 {pkg/core => core}/logs/log_test.go | 0 {pkg/core => core}/logs/logger.go | 0 {pkg/core => core}/logs/logger_test.go | 0 {pkg/core => core}/logs/multifile.go | 0 {pkg/core => core}/logs/multifile_test.go | 0 {pkg/core => core}/logs/slack.go | 0 {pkg/core => core}/logs/smtp.go | 0 {pkg/core => core}/logs/smtp_test.go | 0 {pkg/core => core}/utils/caller.go | 0 {pkg/core => core}/utils/caller_test.go | 0 {pkg/core => core}/utils/debug.go | 0 {pkg/core => core}/utils/debug_test.go | 0 {pkg/core => core}/utils/file.go | 0 {pkg/core => core}/utils/file_test.go | 0 {pkg/core => core}/utils/kv.go | 0 {pkg/core => core}/utils/kv_test.go | 0 {pkg/core => core}/utils/mail.go | 0 {pkg/core => core}/utils/mail_test.go | 0 {pkg/core => core}/utils/pagination/doc.go | 2 +- .../utils/pagination/paginator.go | 0 {pkg/core => core}/utils/pagination/utils.go | 0 {pkg/core => core}/utils/rand.go | 0 {pkg/core => core}/utils/rand_test.go | 0 {pkg/core => core}/utils/safemap.go | 0 {pkg/core => core}/utils/safemap_test.go | 0 {pkg/core => core}/utils/slice.go | 0 {pkg/core => core}/utils/slice_test.go | 0 {pkg/core => core}/utils/testdata/grepe.test | 0 {pkg/core => core}/utils/time.go | 0 {pkg/core => core}/utils/utils.go | 0 {pkg/core => core}/utils/utils_test.go | 0 {pkg/core => core}/validation/README.md | 0 {pkg/core => core}/validation/util.go | 0 {pkg/core => core}/validation/util_test.go | 0 {pkg/core => core}/validation/validation.go | 0 .../validation/validation_test.go | 0 {pkg/core => core}/validation/validators.go | 2 +- pkg/doc.go => doc.go | 2 +- githook/pre-commit | 7 -- pkg/adapter/logs/alils/alils.go | 5 - pkg/adapter/logs/es/es.go | 5 - {pkg/server => server}/web/LICENSE | 0 {pkg/server => server}/web/admin.go | 2 +- .../server => server}/web/admin_controller.go | 2 +- {pkg/server => server}/web/admin_test.go | 2 +- {pkg/server => server}/web/adminui.go | 0 {pkg/server => server}/web/beego.go | 0 {pkg/server => server}/web/captcha/LICENSE | 0 {pkg/server => server}/web/captcha/README.md | 0 {pkg/server => server}/web/captcha/captcha.go | 8 +- {pkg/server => server}/web/captcha/image.go | 0 .../web/captcha/image_test.go | 2 +- {pkg/server => server}/web/captcha/siprng.go | 0 .../web/captcha/siprng_test.go | 0 {pkg/server => server}/web/config.go | 14 +-- {pkg/server => server}/web/config_test.go | 2 +- .../web/context/acceptencoder.go | 0 .../web/context/acceptencoder_test.go | 0 {pkg/server => server}/web/context/context.go | 2 +- .../web/context/context_test.go | 0 {pkg/server => server}/web/context/input.go | 2 +- .../web/context/input_test.go | 0 {pkg/server => server}/web/context/output.go | 0 .../web/context/param/conv.go | 4 +- .../web/context/param/methodparams.go | 0 .../web/context/param/options.go | 0 .../web/context/param/parsers.go | 0 .../web/context/param/parsers_test.go | 0 .../server => server}/web/context/renderer.go | 0 .../server => server}/web/context/response.go | 3 +- {pkg/server => server}/web/controller.go | 6 +- {pkg/server => server}/web/controller_test.go | 2 +- {pkg/server => server}/web/doc.go | 2 +- {pkg/server => server}/web/error.go | 10 +- {pkg/server => server}/web/error_test.go | 0 {pkg/server => server}/web/filter.go | 2 +- .../web/filter/apiauth/apiauth.go | 4 +- .../web/filter/apiauth/apiauth_test.go | 0 .../web/filter/auth/basic.go | 4 +- .../web/filter/authz/authz.go | 4 +- .../web/filter/authz/authz_model.conf | 0 .../web/filter/authz/authz_policy.csv | 0 .../web/filter/authz/authz_test.go | 6 +- .../server => server}/web/filter/cors/cors.go | 4 +- .../web/filter/cors/cors_test.go | 4 +- .../web/filter/opentracing/filter.go | 5 +- .../web/filter/opentracing/filter_test.go | 2 +- .../web/filter/prometheus/filter.go | 20 ++-- .../web/filter/prometheus/filter_test.go | 2 +- .../web/filter_chain_test.go | 2 +- {pkg/server => server}/web/filter_test.go | 2 +- {pkg/server => server}/web/flash.go | 0 {pkg/server => server}/web/flash_test.go | 0 {pkg/server => server}/web/fs.go | 0 {pkg/server => server}/web/grace/grace.go | 0 {pkg/server => server}/web/grace/server.go | 0 {pkg/server => server}/web/hooks.go | 6 +- {pkg/server => server}/web/mime.go | 0 {pkg/server => server}/web/namespace.go | 28 ++--- {pkg/server => server}/web/namespace_test.go | 2 +- .../web/pagination/controller.go | 4 +- {pkg/server => server}/web/parser.go | 10 +- {pkg/server => server}/web/policy.go | 2 +- {pkg/server => server}/web/router.go | 8 +- {pkg/server => server}/web/router_test.go | 4 +- {pkg/server => server}/web/server.go | 8 +- {pkg/server => server}/web/server_test.go | 0 {pkg/server => server}/web/session/README.md | 0 .../web/session/couchbase/sess_couchbase.go | 2 +- .../web/session/ledis/ledis_session.go | 2 +- .../web/session/memcache/sess_memcache.go | 2 +- .../web/session/mysql/sess_mysql.go | 2 +- .../web/session/postgres/sess_postgresql.go | 2 +- .../web/session/redis/sess_redis.go | 4 +- .../web/session/redis/sess_redis_test.go | 2 +- .../session/redis_cluster/redis_cluster.go | 2 +- .../redis_sentinel/sess_redis_sentinel.go | 3 +- .../sess_redis_sentinel_test.go | 2 +- .../web/session/sess_cookie.go | 0 .../web/session/sess_cookie_test.go | 0 .../web/session/sess_file.go | 0 .../web/session/sess_file_test.go | 0 .../server => server}/web/session/sess_mem.go | 0 .../web/session/sess_mem_test.go | 0 .../web/session/sess_test.go | 0 .../web/session/sess_utils.go | 2 +- {pkg/server => server}/web/session/session.go | 0 .../web/session/ssdb/sess_ssdb.go | 2 +- {pkg/server => server}/web/staticfile.go | 4 +- {pkg/server => server}/web/staticfile_test.go | 0 {pkg/server => server}/web/statistics.go | 2 +- {pkg/server => server}/web/statistics_test.go | 0 {pkg/server => server}/web/swagger/swagger.go | 0 {pkg/server => server}/web/template.go | 4 +- {pkg/server => server}/web/template_test.go | 0 {pkg/server => server}/web/templatefunc.go | 0 .../web/templatefunc_test.go | 0 {pkg/server => server}/web/tree.go | 4 +- {pkg/server => server}/web/tree_test.go | 2 +- {pkg/server => server}/web/unregroute_test.go | 0 {pkg/task => task}/govenor_command.go | 2 +- {pkg/task => task}/governor_command_test.go | 0 {pkg/task => task}/task.go | 0 {pkg/task => task}/task_test.go | 0 431 files changed, 372 insertions(+), 545 deletions(-) rename {pkg/adapter => adapter}/admin.go (93%) rename {pkg/adapter => adapter}/app.go (98%) rename {pkg/adapter => adapter}/beego.go (95%) rename {pkg/adapter => adapter}/build_info.go (100%) rename {pkg/adapter => adapter}/cache/cache.go (100%) rename {pkg/adapter => adapter}/cache/cache_adapter.go (98%) rename {pkg/adapter => adapter}/cache/cache_test.go (100%) rename {pkg/adapter => adapter}/cache/conv.go (96%) rename {pkg/adapter => adapter}/cache/conv_test.go (100%) rename {pkg/adapter => adapter}/cache/file.go (95%) rename {pkg/adapter => adapter}/cache/memcache/memcache.go (92%) rename {pkg/adapter => adapter}/cache/memcache/memcache_test.go (98%) rename {pkg/adapter => adapter}/cache/memory.go (94%) rename {pkg/adapter => adapter}/cache/redis/redis.go (92%) rename {pkg/adapter => adapter}/cache/redis/redis_test.go (98%) rename {pkg/adapter => adapter}/cache/ssdb/ssdb.go (68%) rename {pkg/adapter => adapter}/cache/ssdb/ssdb_test.go (98%) rename {pkg/adapter => adapter}/config.go (97%) rename {pkg/adapter => adapter}/config/adapter.go (99%) rename {pkg/adapter => adapter}/config/config.go (99%) rename {pkg/adapter => adapter}/config/config_test.go (100%) rename {pkg/adapter => adapter}/config/env/env.go (97%) rename {pkg/adapter => adapter}/config/env/env_test.go (100%) rename {pkg/adapter => adapter}/config/fake.go (94%) rename {pkg/adapter => adapter}/config/ini_test.go (100%) rename {pkg/adapter => adapter}/config/json.go (92%) rename {pkg/adapter => adapter}/config/json_test.go (100%) rename {pkg/adapter => adapter}/config/xml/xml.go (95%) rename {pkg/adapter => adapter}/config/xml/xml_test.go (98%) rename {pkg/adapter => adapter}/config/yaml/yaml.go (95%) rename {pkg/adapter => adapter}/config/yaml/yaml_test.go (98%) rename {pkg/adapter => adapter}/context/acceptencoder.go (96%) rename {pkg/adapter => adapter}/context/context.go (98%) rename {pkg/adapter => adapter}/context/input.go (99%) rename {pkg/adapter => adapter}/context/output.go (99%) rename {pkg/adapter => adapter}/context/renderer.go (67%) rename {pkg/adapter => adapter}/context/response.go (100%) rename {pkg/adapter => adapter}/controller.go (98%) rename {pkg/adapter => adapter}/doc.go (100%) rename {pkg/adapter => adapter}/error.go (96%) rename {pkg/adapter => adapter}/filter.go (90%) rename {pkg/adapter => adapter}/flash.go (97%) rename {pkg/adapter => adapter}/fs.go (96%) rename {pkg/adapter => adapter}/grace/grace.go (98%) rename {pkg/adapter => adapter}/grace/server.go (97%) rename {pkg/adapter => adapter}/httplib/httplib.go (99%) rename {pkg/adapter => adapter}/httplib/httplib_test.go (100%) rename {pkg/adapter => adapter}/log.go (97%) rename {pkg/adapter => adapter}/logs/accesslog.go (95%) create mode 100644 adapter/logs/alils/alils.go create mode 100644 adapter/logs/es/es.go rename {pkg/adapter => adapter}/logs/log.go (99%) rename {pkg/adapter => adapter}/logs/log_adapter.go (97%) rename {pkg/adapter => adapter}/logs/logger.go (96%) rename {pkg/adapter => adapter}/logs/logger_test.go (100%) rename {pkg/adapter => adapter}/metric/prometheus.go (87%) rename {pkg/adapter => adapter}/metric/prometheus_test.go (96%) rename {pkg/adapter => adapter}/migration/ddl.go (99%) rename {pkg/adapter => adapter}/migration/doc.go (100%) rename {pkg/adapter => adapter}/migration/migration.go (98%) rename {pkg/adapter => adapter}/namespace.go (98%) rename {pkg/adapter => adapter}/orm/cmd.go (95%) rename {pkg/adapter => adapter}/orm/db.go (94%) rename {pkg/adapter => adapter}/orm/db_alias.go (98%) rename {pkg/adapter => adapter}/orm/models.go (94%) rename {pkg/adapter => adapter}/orm/models_boot.go (96%) rename {pkg/adapter => adapter}/orm/models_fields.go (99%) rename {pkg/adapter => adapter}/orm/orm.go (98%) rename {pkg/adapter => adapter}/orm/orm_conds.go (98%) rename {pkg/adapter => adapter}/orm/orm_log.go (95%) rename {pkg/adapter => adapter}/orm/orm_queryset.go (95%) rename {pkg/adapter => adapter}/orm/qb.go (95%) rename {pkg/adapter => adapter}/orm/qb_mysql.go (99%) rename {pkg/adapter => adapter}/orm/qb_tidb.go (99%) rename {pkg/adapter => adapter}/orm/query_setter_adapter.go (95%) rename {pkg/adapter => adapter}/orm/types.go (99%) rename {pkg/adapter => adapter}/orm/utils.go (99%) rename {pkg/adapter => adapter}/orm/utils_test.go (100%) rename {pkg/adapter => adapter}/plugins/apiauth/apiauth.go (92%) rename {pkg/adapter => adapter}/plugins/apiauth/apiauth_test.go (100%) rename {pkg/adapter => adapter}/plugins/auth/basic.go (92%) rename {pkg/adapter => adapter}/plugins/authz/authz.go (91%) rename {pkg/adapter => adapter}/plugins/authz/authz_model.conf (100%) rename {pkg/adapter => adapter}/plugins/authz/authz_policy.csv (100%) rename {pkg/adapter => adapter}/plugins/authz/authz_test.go (96%) rename {pkg/adapter => adapter}/plugins/cors/cors.go (91%) rename {pkg/adapter => adapter}/policy.go (91%) rename {pkg/adapter => adapter}/router.go (98%) rename {pkg/adapter => adapter}/session/couchbase/sess_couchbase.go (97%) rename {pkg/adapter => adapter}/session/ledis/ledis_session.go (95%) rename {pkg/adapter => adapter}/session/memcache/sess_memcache.go (97%) rename {pkg/adapter => adapter}/session/mysql/sess_mysql.go (97%) rename {pkg/adapter => adapter}/session/postgres/sess_postgresql.go (97%) rename {pkg/adapter => adapter}/session/provider_adapter.go (98%) rename {pkg/adapter => adapter}/session/redis/sess_redis.go (97%) rename {pkg/adapter => adapter}/session/redis_cluster/redis_cluster.go (97%) rename {pkg/adapter => adapter}/session/redis_sentinel/sess_redis_sentinel.go (97%) rename {pkg/adapter => adapter}/session/redis_sentinel/sess_redis_sentinel_test.go (97%) rename {pkg/adapter => adapter}/session/sess_cookie.go (98%) rename {pkg/adapter => adapter}/session/sess_cookie_test.go (100%) rename {pkg/adapter => adapter}/session/sess_file.go (98%) rename {pkg/adapter => adapter}/session/sess_file_test.go (100%) rename {pkg/adapter => adapter}/session/sess_mem.go (98%) rename {pkg/adapter => adapter}/session/sess_mem_test.go (100%) rename {pkg/adapter => adapter}/session/sess_test.go (100%) rename {pkg/adapter => adapter}/session/sess_utils.go (94%) rename {pkg/adapter => adapter}/session/session.go (99%) rename {pkg/adapter => adapter}/session/ssdb/sess_ssdb.go (95%) rename {pkg/adapter => adapter}/session/store_adapter.go (97%) rename {pkg/adapter => adapter}/swagger/swagger.go (98%) rename {pkg/adapter => adapter}/template.go (98%) rename {pkg/adapter => adapter}/templatefunc.go (98%) rename {pkg/adapter => adapter}/templatefunc_test.go (100%) rename {pkg/adapter => adapter}/testing/client.go (96%) rename {pkg/adapter => adapter}/toolbox/healthcheck.go (96%) rename {pkg/adapter => adapter}/toolbox/profile.go (96%) rename {pkg/adapter => adapter}/toolbox/profile_test.go (100%) rename {pkg/adapter => adapter}/toolbox/statistics.go (97%) rename {pkg/adapter => adapter}/toolbox/statistics_test.go (100%) rename {pkg/adapter => adapter}/toolbox/task.go (99%) rename {pkg/adapter => adapter}/toolbox/task_test.go (100%) rename {pkg/adapter => adapter}/tree.go (90%) rename {pkg/adapter => adapter}/tree_test.go (99%) rename {pkg/adapter => adapter}/utils/caller.go (94%) rename {pkg/adapter => adapter}/utils/caller_test.go (100%) rename {pkg/adapter => adapter}/utils/captcha/LICENSE (100%) rename {pkg/adapter => adapter}/utils/captcha/README.md (100%) rename {pkg/adapter => adapter}/utils/captcha/captcha.go (93%) rename {pkg/adapter => adapter}/utils/captcha/image.go (95%) rename {pkg/adapter => adapter}/utils/captcha/image_test.go (96%) rename {pkg/adapter => adapter}/utils/debug.go (95%) rename {pkg/adapter => adapter}/utils/debug_test.go (100%) rename {pkg/adapter => adapter}/utils/file.go (97%) rename {pkg/adapter => adapter}/utils/mail.go (97%) rename {pkg/adapter => adapter}/utils/mail_test.go (100%) rename {pkg/adapter => adapter}/utils/pagination/controller.go (84%) rename {pkg/adapter => adapter}/utils/pagination/doc.go (100%) rename {pkg/adapter => adapter}/utils/pagination/paginator.go (98%) rename {pkg/adapter => adapter}/utils/rand.go (94%) rename {pkg/adapter => adapter}/utils/rand_test.go (100%) rename {pkg/adapter => adapter}/utils/safemap.go (97%) rename {pkg/adapter => adapter}/utils/safemap_test.go (100%) rename {pkg/adapter => adapter}/utils/slice.go (98%) rename {pkg/adapter => adapter}/utils/slice_test.go (100%) rename {pkg/adapter => adapter}/utils/utils.go (76%) rename {pkg/adapter => adapter}/validation/util.go (97%) rename {pkg/adapter => adapter}/validation/validation.go (99%) rename {pkg/adapter => adapter}/validation/validation_test.go (100%) rename {pkg/adapter => adapter}/validation/validators.go (99%) delete mode 100755 build/gobuild-sample.sh delete mode 100755 build/report_build_info.sh rename pkg/build_info.go => build_info.go (98%) rename {pkg/client => client}/cache/README.md (100%) rename {pkg/client => client}/cache/cache.go (100%) rename {pkg/client => client}/cache/cache_test.go (100%) rename {pkg/client => client}/cache/conv.go (100%) rename {pkg/client => client}/cache/conv_test.go (100%) rename {pkg/client => client}/cache/file.go (100%) rename {pkg/client => client}/cache/memcache/memcache.go (98%) rename {pkg/client => client}/cache/memcache/memcache_test.go (98%) rename {pkg/client => client}/cache/memory.go (100%) rename {pkg/client => client}/cache/redis/redis.go (99%) rename {pkg/client => client}/cache/redis/redis_test.go (98%) rename {pkg/client => client}/cache/ssdb/ssdb.go (99%) rename {pkg/client => client}/cache/ssdb/ssdb_test.go (98%) rename {pkg/client => client}/httplib/README.md (100%) rename {pkg/client => client}/httplib/filter.go (100%) rename {pkg/client => client}/httplib/filter/opentracing/filter.go (98%) rename {pkg/client => client}/httplib/filter/opentracing/filter_test.go (96%) rename {pkg/client => client}/httplib/filter/prometheus/filter.go (97%) rename {pkg/client => client}/httplib/filter/prometheus/filter_test.go (96%) rename {pkg/client => client}/httplib/httplib.go (100%) rename {pkg/client => client}/httplib/httplib_test.go (100%) rename {pkg/client => client}/httplib/testing/client.go (97%) rename {pkg/client => client}/orm/README.md (100%) rename {pkg/client => client}/orm/cmd.go (100%) rename {pkg/client => client}/orm/cmd_utils.go (100%) rename {pkg/client => client}/orm/db.go (99%) rename {pkg/client => client}/orm/db_alias.go (100%) rename {pkg/client => client}/orm/db_alias_test.go (100%) rename {pkg/client => client}/orm/db_mysql.go (100%) rename {pkg/client => client}/orm/db_oracle.go (98%) rename {pkg/client => client}/orm/db_postgres.go (100%) rename {pkg/client => client}/orm/db_sqlite.go (99%) rename {pkg/client => client}/orm/db_tables.go (100%) rename {pkg/client => client}/orm/db_tidb.go (100%) rename {pkg/client => client}/orm/db_utils.go (100%) rename {pkg/client => client}/orm/do_nothing_orm.go (99%) rename {pkg/client => client}/orm/do_nothing_orm_test.go (100%) rename {pkg/client => client}/orm/filter.go (100%) rename {pkg/client => client}/orm/filter/bean/default_value_filter.go (97%) rename {pkg/client => client}/orm/filter/bean/default_value_filter_test.go (97%) rename {pkg/client => client}/orm/filter/opentracing/filter.go (98%) rename {pkg/client => client}/orm/filter/opentracing/filter_test.go (96%) rename {pkg/client => client}/orm/filter/prometheus/filter.go (98%) rename {pkg/client => client}/orm/filter/prometheus/filter_test.go (97%) rename {pkg/client => client}/orm/filter_orm_decorator.go (99%) rename {pkg/client => client}/orm/filter_orm_decorator_test.go (99%) rename {pkg/client => client}/orm/filter_test.go (100%) rename {pkg/client => client}/orm/hints/db_hints.go (98%) rename {pkg/client => client}/orm/hints/db_hints_test.go (100%) rename {pkg/client => client}/orm/invocation.go (100%) rename {pkg/client => client}/orm/migration/ddl.go (99%) rename {pkg/client => client}/orm/migration/doc.go (100%) rename {pkg/client => client}/orm/migration/migration.go (98%) rename {pkg/client => client}/orm/model_utils_test.go (100%) rename {pkg/client => client}/orm/models.go (100%) rename {pkg/client => client}/orm/models_boot.go (100%) rename {pkg/client => client}/orm/models_fields.go (100%) rename {pkg/client => client}/orm/models_info_f.go (100%) rename {pkg/client => client}/orm/models_info_m.go (100%) rename {pkg/client => client}/orm/models_test.go (97%) rename {pkg/client => client}/orm/models_utils.go (100%) rename {pkg/client => client}/orm/models_utils_test.go (100%) rename {pkg/client => client}/orm/orm.go (98%) rename {pkg/client => client}/orm/orm_conds.go (100%) rename {pkg/client => client}/orm/orm_log.go (100%) rename {pkg/client => client}/orm/orm_object.go (100%) rename {pkg/client => client}/orm/orm_querym2m.go (100%) rename {pkg/client => client}/orm/orm_queryset.go (99%) rename {pkg/client => client}/orm/orm_raw.go (100%) rename {pkg/client => client}/orm/orm_test.go (99%) rename {pkg/client => client}/orm/qb.go (100%) rename {pkg/client => client}/orm/qb_mysql.go (100%) rename {pkg/client => client}/orm/qb_postgres.go (100%) rename {pkg/client => client}/orm/qb_tidb.go (100%) rename {pkg/client => client}/orm/types.go (99%) rename {pkg/client => client}/orm/utils.go (100%) rename {pkg/client => client}/orm/utils_test.go (100%) rename {pkg/core => core}/bean/context.go (100%) rename {pkg/core => core}/bean/doc.go (100%) rename {pkg/core => core}/bean/factory.go (100%) rename {pkg/core => core}/bean/metadata.go (100%) rename {pkg/core => core}/bean/tag_auto_wire_bean_factory.go (99%) rename {pkg/core => core}/bean/tag_auto_wire_bean_factory_test.go (100%) rename {pkg/core => core}/bean/time_type_adapter.go (100%) rename {pkg/core => core}/bean/time_type_adapter_test.go (100%) rename {pkg/core => core}/bean/type_adapter.go (100%) rename {pkg/core => core}/config/base_config_test.go (100%) rename {pkg/core => core}/config/config.go (100%) rename {pkg/core => core}/config/config_test.go (100%) rename {pkg/core => core}/config/env/env.go (98%) rename {pkg/core => core}/config/env/env_test.go (100%) rename {pkg/core => core}/config/etcd/config.go (98%) rename {pkg/core => core}/config/etcd/config_test.go (100%) rename {pkg/core => core}/config/fake.go (100%) rename {pkg/core => core}/config/ini.go (100%) rename {pkg/core => core}/config/ini_test.go (100%) rename {pkg/core => core}/config/json/json.go (98%) rename {pkg/core => core}/config/json/json_test.go (99%) rename {pkg/core => core}/config/xml/xml.go (98%) rename {pkg/core => core}/config/xml/xml_test.go (98%) rename {pkg/core => core}/config/yaml/yaml.go (99%) rename {pkg/core => core}/config/yaml/yaml_test.go (98%) rename {pkg/core => core}/governor/command.go (100%) rename {pkg/core => core}/governor/healthcheck.go (100%) rename {pkg/core => core}/governor/profile.go (99%) rename {pkg/core => core}/governor/profile_test.go (100%) rename {pkg/core => core}/logs/README.md (100%) rename {pkg/core => core}/logs/access_log.go (100%) rename {pkg/core => core}/logs/access_log_test.go (100%) rename {pkg/core => core}/logs/alils/alils.go (98%) rename {pkg/core => core}/logs/alils/config.go (100%) rename {pkg/core => core}/logs/alils/log.pb.go (100%) rename {pkg/core => core}/logs/alils/log_config.go (100%) rename {pkg/core => core}/logs/alils/log_project.go (100%) rename {pkg/core => core}/logs/alils/log_store.go (100%) rename {pkg/core => core}/logs/alils/machine_group.go (100%) rename {pkg/core => core}/logs/alils/request.go (100%) rename {pkg/core => core}/logs/alils/signature.go (100%) rename {pkg/core => core}/logs/conn.go (100%) rename {pkg/core => core}/logs/conn_test.go (100%) rename {pkg/core => core}/logs/console.go (100%) rename {pkg/core => core}/logs/console_test.go (100%) rename {pkg/core => core}/logs/es/es.go (98%) rename {pkg/core => core}/logs/es/index.go (96%) rename {pkg/core => core}/logs/es/index_test.go (95%) rename {pkg/core => core}/logs/file.go (100%) rename {pkg/core => core}/logs/file_test.go (100%) rename {pkg/core => core}/logs/formatter.go (100%) rename {pkg/core => core}/logs/formatter_test.go (100%) rename {pkg/core => core}/logs/jianliao.go (100%) rename {pkg/core => core}/logs/jianliao_test.go (100%) rename {pkg/core => core}/logs/log.go (100%) rename {pkg/core => core}/logs/log_msg.go (100%) rename {pkg/core => core}/logs/log_msg_test.go (100%) rename {pkg/core => core}/logs/log_test.go (100%) rename {pkg/core => core}/logs/logger.go (100%) rename {pkg/core => core}/logs/logger_test.go (100%) rename {pkg/core => core}/logs/multifile.go (100%) rename {pkg/core => core}/logs/multifile_test.go (100%) rename {pkg/core => core}/logs/slack.go (100%) rename {pkg/core => core}/logs/smtp.go (100%) rename {pkg/core => core}/logs/smtp_test.go (100%) rename {pkg/core => core}/utils/caller.go (100%) rename {pkg/core => core}/utils/caller_test.go (100%) rename {pkg/core => core}/utils/debug.go (100%) rename {pkg/core => core}/utils/debug_test.go (100%) rename {pkg/core => core}/utils/file.go (100%) rename {pkg/core => core}/utils/file_test.go (100%) rename {pkg/core => core}/utils/kv.go (100%) rename {pkg/core => core}/utils/kv_test.go (100%) rename {pkg/core => core}/utils/mail.go (100%) rename {pkg/core => core}/utils/mail_test.go (100%) rename {pkg/core => core}/utils/pagination/doc.go (96%) rename {pkg/core => core}/utils/pagination/paginator.go (100%) rename {pkg/core => core}/utils/pagination/utils.go (100%) rename {pkg/core => core}/utils/rand.go (100%) rename {pkg/core => core}/utils/rand_test.go (100%) rename {pkg/core => core}/utils/safemap.go (100%) rename {pkg/core => core}/utils/safemap_test.go (100%) rename {pkg/core => core}/utils/slice.go (100%) rename {pkg/core => core}/utils/slice_test.go (100%) rename {pkg/core => core}/utils/testdata/grepe.test (100%) rename {pkg/core => core}/utils/time.go (100%) rename {pkg/core => core}/utils/utils.go (100%) rename {pkg/core => core}/utils/utils_test.go (100%) rename {pkg/core => core}/validation/README.md (100%) rename {pkg/core => core}/validation/util.go (100%) rename {pkg/core => core}/validation/util_test.go (100%) rename {pkg/core => core}/validation/validation.go (100%) rename {pkg/core => core}/validation/validation_test.go (100%) rename {pkg/core => core}/validation/validators.go (99%) rename pkg/doc.go => doc.go (97%) delete mode 100755 githook/pre-commit delete mode 100644 pkg/adapter/logs/alils/alils.go delete mode 100644 pkg/adapter/logs/es/es.go rename {pkg/server => server}/web/LICENSE (100%) rename {pkg/server => server}/web/admin.go (98%) rename {pkg/server => server}/web/admin_controller.go (99%) rename {pkg/server => server}/web/admin_test.go (99%) rename {pkg/server => server}/web/adminui.go (100%) rename {pkg/server => server}/web/beego.go (100%) rename {pkg/server => server}/web/captcha/LICENSE (100%) rename {pkg/server => server}/web/captcha/README.md (100%) rename {pkg/server => server}/web/captcha/captcha.go (97%) rename {pkg/server => server}/web/captcha/image.go (100%) rename {pkg/server => server}/web/captcha/image_test.go (96%) rename {pkg/server => server}/web/captcha/siprng.go (100%) rename {pkg/server => server}/web/captcha/siprng_test.go (100%) rename {pkg/server => server}/web/config.go (97%) rename {pkg/server => server}/web/config_test.go (98%) rename {pkg/server => server}/web/context/acceptencoder.go (100%) rename {pkg/server => server}/web/context/acceptencoder_test.go (100%) rename {pkg/server => server}/web/context/context.go (99%) rename {pkg/server => server}/web/context/context_test.go (100%) rename {pkg/server => server}/web/context/input.go (99%) rename {pkg/server => server}/web/context/input_test.go (100%) rename {pkg/server => server}/web/context/output.go (100%) rename {pkg/server => server}/web/context/param/conv.go (95%) rename {pkg/server => server}/web/context/param/methodparams.go (100%) rename {pkg/server => server}/web/context/param/options.go (100%) rename {pkg/server => server}/web/context/param/parsers.go (100%) rename {pkg/server => server}/web/context/param/parsers_test.go (100%) rename {pkg/server => server}/web/context/renderer.go (100%) rename {pkg/server => server}/web/context/response.go (99%) rename {pkg/server => server}/web/controller.go (99%) rename {pkg/server => server}/web/controller_test.go (98%) rename {pkg/server => server}/web/doc.go (91%) rename {pkg/server => server}/web/error.go (98%) rename {pkg/server => server}/web/error_test.go (100%) rename {pkg/server => server}/web/filter.go (98%) rename {pkg/server => server}/web/filter/apiauth/apiauth.go (97%) rename {pkg/server => server}/web/filter/apiauth/apiauth_test.go (100%) rename {pkg/server => server}/web/filter/auth/basic.go (97%) rename {pkg/server => server}/web/filter/authz/authz.go (96%) rename {pkg/server => server}/web/filter/authz/authz_model.conf (100%) rename {pkg/server => server}/web/filter/authz/authz_policy.csv (100%) rename {pkg/server => server}/web/filter/authz/authz_test.go (96%) rename {pkg/server => server}/web/filter/cors/cors.go (98%) rename {pkg/server => server}/web/filter/cors/cors_test.go (98%) rename {pkg/server => server}/web/filter/opentracing/filter.go (96%) rename {pkg/server => server}/web/filter/opentracing/filter_test.go (96%) rename {pkg/server => server}/web/filter/prometheus/filter.go (84%) rename {pkg/server => server}/web/filter/prometheus/filter_test.go (95%) rename {pkg/server => server}/web/filter_chain_test.go (95%) rename {pkg/server => server}/web/filter_test.go (97%) rename {pkg/server => server}/web/flash.go (100%) rename {pkg/server => server}/web/flash_test.go (100%) rename {pkg/server => server}/web/fs.go (100%) rename {pkg/server => server}/web/grace/grace.go (100%) rename {pkg/server => server}/web/grace/server.go (100%) rename {pkg/server => server}/web/hooks.go (95%) rename {pkg/server => server}/web/mime.go (100%) rename {pkg/server => server}/web/namespace.go (91%) rename {pkg/server => server}/web/namespace_test.go (98%) rename {pkg/server => server}/web/pagination/controller.go (90%) rename {pkg/server => server}/web/parser.go (98%) rename {pkg/server => server}/web/policy.go (98%) rename {pkg/server => server}/web/router.go (99%) rename {pkg/server => server}/web/router_test.go (99%) rename {pkg/server => server}/web/server.go (99%) rename {pkg/server => server}/web/server_test.go (100%) rename {pkg/server => server}/web/session/README.md (100%) rename {pkg/server => server}/web/session/couchbase/sess_couchbase.go (99%) rename {pkg/server => server}/web/session/ledis/ledis_session.go (98%) rename {pkg/server => server}/web/session/memcache/sess_memcache.go (99%) rename {pkg/server => server}/web/session/mysql/sess_mysql.go (99%) rename {pkg/server => server}/web/session/postgres/sess_postgresql.go (99%) rename {pkg/server => server}/web/session/redis/sess_redis.go (99%) rename {pkg/server => server}/web/session/redis/sess_redis_test.go (97%) rename {pkg/server => server}/web/session/redis_cluster/redis_cluster.go (99%) rename {pkg/server => server}/web/session/redis_sentinel/sess_redis_sentinel.go (99%) rename {pkg/server => server}/web/session/redis_sentinel/sess_redis_sentinel_test.go (97%) rename {pkg/server => server}/web/session/sess_cookie.go (100%) rename {pkg/server => server}/web/session/sess_cookie_test.go (100%) rename {pkg/server => server}/web/session/sess_file.go (100%) rename {pkg/server => server}/web/session/sess_file_test.go (100%) rename {pkg/server => server}/web/session/sess_mem.go (100%) rename {pkg/server => server}/web/session/sess_mem_test.go (100%) rename {pkg/server => server}/web/session/sess_test.go (100%) rename {pkg/server => server}/web/session/sess_utils.go (99%) rename {pkg/server => server}/web/session/session.go (100%) rename {pkg/server => server}/web/session/ssdb/sess_ssdb.go (98%) rename {pkg/server => server}/web/staticfile.go (98%) rename {pkg/server => server}/web/staticfile_test.go (100%) rename {pkg/server => server}/web/statistics.go (99%) rename {pkg/server => server}/web/statistics_test.go (100%) rename {pkg/server => server}/web/swagger/swagger.go (100%) rename {pkg/server => server}/web/template.go (99%) rename {pkg/server => server}/web/template_test.go (100%) rename {pkg/server => server}/web/templatefunc.go (100%) rename {pkg/server => server}/web/templatefunc_test.go (100%) rename {pkg/server => server}/web/tree.go (99%) rename {pkg/server => server}/web/tree_test.go (99%) rename {pkg/server => server}/web/unregroute_test.go (100%) rename {pkg/task => task}/govenor_command.go (97%) rename {pkg/task => task}/governor_command_test.go (100%) rename {pkg/task => task}/task.go (100%) rename {pkg/task => task}/task_test.go (100%) diff --git a/.travis.yml b/.travis.yml index 67efe057..973b40ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -96,7 +96,7 @@ after_script: - rm -rf ./res/var/* script: - go test ./... - - staticcheck -show-ignored -checks "-ST1017,-U1000,-ST1005,-S1034,-S1012,-SA4006,-SA6005,-SA1019,-SA1024" ./pkg + - staticcheck -show-ignored -checks "-ST1017,-U1000,-ST1005,-S1034,-S1012,-SA4006,-SA6005,-SA1019,-SA1024" ./ - unconvert $(go list ./... | grep -v /vendor/) - ineffassign . - find . ! \( -path './vendor' -prune \) -type f -name '*.go' -print0 | xargs -0 gofmt -l -s diff --git a/pkg/adapter/admin.go b/adapter/admin.go similarity index 93% rename from pkg/adapter/admin.go rename to adapter/admin.go index 5ba78511..e555f59e 100644 --- a/pkg/adapter/admin.go +++ b/adapter/admin.go @@ -17,8 +17,8 @@ package adapter import ( "time" - _ "github.com/astaxie/beego/pkg/core/governor" - "github.com/astaxie/beego/pkg/server/web" + _ "github.com/astaxie/beego/core/governor" + "github.com/astaxie/beego/server/web" ) // FilterMonitorFunc is default monitor filter when admin module is enable. diff --git a/pkg/adapter/app.go b/adapter/app.go similarity index 98% rename from pkg/adapter/app.go rename to adapter/app.go index 10ffa96a..e20cd9d2 100644 --- a/pkg/adapter/app.go +++ b/adapter/app.go @@ -17,9 +17,9 @@ package adapter import ( "net/http" - context2 "github.com/astaxie/beego/pkg/adapter/context" - "github.com/astaxie/beego/pkg/server/web" - "github.com/astaxie/beego/pkg/server/web/context" + context2 "github.com/astaxie/beego/adapter/context" + "github.com/astaxie/beego/server/web" + "github.com/astaxie/beego/server/web/context" ) var ( diff --git a/pkg/adapter/beego.go b/adapter/beego.go similarity index 95% rename from pkg/adapter/beego.go rename to adapter/beego.go index eb7be3f6..bbe37db8 100644 --- a/pkg/adapter/beego.go +++ b/adapter/beego.go @@ -15,14 +15,14 @@ package adapter import ( - "github.com/astaxie/beego/pkg" - "github.com/astaxie/beego/pkg/server/web" + "github.com/astaxie/beego" + "github.com/astaxie/beego/server/web" ) const ( // VERSION represent beego web framework version. - VERSION = pkg.VERSION + VERSION = beego.VERSION // DEV is for develop DEV = web.DEV diff --git a/pkg/adapter/build_info.go b/adapter/build_info.go similarity index 100% rename from pkg/adapter/build_info.go rename to adapter/build_info.go diff --git a/pkg/adapter/cache/cache.go b/adapter/cache/cache.go similarity index 100% rename from pkg/adapter/cache/cache.go rename to adapter/cache/cache.go diff --git a/pkg/adapter/cache/cache_adapter.go b/adapter/cache/cache_adapter.go similarity index 98% rename from pkg/adapter/cache/cache_adapter.go rename to adapter/cache/cache_adapter.go index f1441ac8..3bfd0bf8 100644 --- a/pkg/adapter/cache/cache_adapter.go +++ b/adapter/cache/cache_adapter.go @@ -18,7 +18,7 @@ import ( "context" "time" - "github.com/astaxie/beego/pkg/client/cache" + "github.com/astaxie/beego/client/cache" ) type newToOldCacheAdapter struct { diff --git a/pkg/adapter/cache/cache_test.go b/adapter/cache/cache_test.go similarity index 100% rename from pkg/adapter/cache/cache_test.go rename to adapter/cache/cache_test.go diff --git a/pkg/adapter/cache/conv.go b/adapter/cache/conv.go similarity index 96% rename from pkg/adapter/cache/conv.go rename to adapter/cache/conv.go index d46cc31c..18b8a255 100644 --- a/pkg/adapter/cache/conv.go +++ b/adapter/cache/conv.go @@ -15,7 +15,7 @@ package cache import ( - "github.com/astaxie/beego/pkg/client/cache" + "github.com/astaxie/beego/client/cache" ) // GetString convert interface to string. diff --git a/pkg/adapter/cache/conv_test.go b/adapter/cache/conv_test.go similarity index 100% rename from pkg/adapter/cache/conv_test.go rename to adapter/cache/conv_test.go diff --git a/pkg/adapter/cache/file.go b/adapter/cache/file.go similarity index 95% rename from pkg/adapter/cache/file.go rename to adapter/cache/file.go index 04598d27..74eb980a 100644 --- a/pkg/adapter/cache/file.go +++ b/adapter/cache/file.go @@ -15,7 +15,7 @@ package cache import ( - "github.com/astaxie/beego/pkg/client/cache" + "github.com/astaxie/beego/client/cache" ) // NewFileCache Create new file cache with no config. diff --git a/pkg/adapter/cache/memcache/memcache.go b/adapter/cache/memcache/memcache.go similarity index 92% rename from pkg/adapter/cache/memcache/memcache.go rename to adapter/cache/memcache/memcache.go index f2acffca..b4da1bfe 100644 --- a/pkg/adapter/cache/memcache/memcache.go +++ b/adapter/cache/memcache/memcache.go @@ -30,8 +30,8 @@ package memcache import ( - "github.com/astaxie/beego/pkg/adapter/cache" - "github.com/astaxie/beego/pkg/client/cache/memcache" + "github.com/astaxie/beego/adapter/cache" + "github.com/astaxie/beego/client/cache/memcache" ) // NewMemCache create new memcache adapter. diff --git a/pkg/adapter/cache/memcache/memcache_test.go b/adapter/cache/memcache/memcache_test.go similarity index 98% rename from pkg/adapter/cache/memcache/memcache_test.go rename to adapter/cache/memcache/memcache_test.go index e6e605a4..b9b6dc6b 100644 --- a/pkg/adapter/cache/memcache/memcache_test.go +++ b/adapter/cache/memcache/memcache_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/astaxie/beego/pkg/adapter/cache" + "github.com/astaxie/beego/adapter/cache" ) func TestMemcacheCache(t *testing.T) { diff --git a/pkg/adapter/cache/memory.go b/adapter/cache/memory.go similarity index 94% rename from pkg/adapter/cache/memory.go rename to adapter/cache/memory.go index 2d734bc0..cf6e3992 100644 --- a/pkg/adapter/cache/memory.go +++ b/adapter/cache/memory.go @@ -15,7 +15,7 @@ package cache import ( - "github.com/astaxie/beego/pkg/client/cache" + "github.com/astaxie/beego/client/cache" ) // NewMemoryCache returns a new MemoryCache. diff --git a/pkg/adapter/cache/redis/redis.go b/adapter/cache/redis/redis.go similarity index 92% rename from pkg/adapter/cache/redis/redis.go rename to adapter/cache/redis/redis.go index 3aeb8691..3562057d 100644 --- a/pkg/adapter/cache/redis/redis.go +++ b/adapter/cache/redis/redis.go @@ -30,8 +30,8 @@ package redis import ( - "github.com/astaxie/beego/pkg/adapter/cache" - redis2 "github.com/astaxie/beego/pkg/client/cache/redis" + "github.com/astaxie/beego/adapter/cache" + redis2 "github.com/astaxie/beego/client/cache/redis" ) var ( diff --git a/pkg/adapter/cache/redis/redis_test.go b/adapter/cache/redis/redis_test.go similarity index 98% rename from pkg/adapter/cache/redis/redis_test.go rename to adapter/cache/redis/redis_test.go index 165ad0a7..7ae12197 100644 --- a/pkg/adapter/cache/redis/redis_test.go +++ b/adapter/cache/redis/redis_test.go @@ -22,7 +22,7 @@ import ( "github.com/gomodule/redigo/redis" - "github.com/astaxie/beego/pkg/adapter/cache" + "github.com/astaxie/beego/adapter/cache" ) func TestRedisCache(t *testing.T) { diff --git a/pkg/adapter/cache/ssdb/ssdb.go b/adapter/cache/ssdb/ssdb.go similarity index 68% rename from pkg/adapter/cache/ssdb/ssdb.go rename to adapter/cache/ssdb/ssdb.go index 9a252b55..df552043 100644 --- a/pkg/adapter/cache/ssdb/ssdb.go +++ b/adapter/cache/ssdb/ssdb.go @@ -1,8 +1,8 @@ package ssdb import ( - "github.com/astaxie/beego/pkg/adapter/cache" - ssdb2 "github.com/astaxie/beego/pkg/client/cache/ssdb" + "github.com/astaxie/beego/adapter/cache" + ssdb2 "github.com/astaxie/beego/client/cache/ssdb" ) // NewSsdbCache create new ssdb adapter. diff --git a/pkg/adapter/cache/ssdb/ssdb_test.go b/adapter/cache/ssdb/ssdb_test.go similarity index 98% rename from pkg/adapter/cache/ssdb/ssdb_test.go rename to adapter/cache/ssdb/ssdb_test.go index 0f9dabba..080167cd 100644 --- a/pkg/adapter/cache/ssdb/ssdb_test.go +++ b/adapter/cache/ssdb/ssdb_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/astaxie/beego/pkg/adapter/cache" + "github.com/astaxie/beego/adapter/cache" ) func TestSsdbcacheCache(t *testing.T) { diff --git a/pkg/adapter/config.go b/adapter/config.go similarity index 97% rename from pkg/adapter/config.go rename to adapter/config.go index 3975f5eb..46f965ee 100644 --- a/pkg/adapter/config.go +++ b/adapter/config.go @@ -17,9 +17,9 @@ package adapter import ( context2 "context" - "github.com/astaxie/beego/pkg/adapter/session" - newCfg "github.com/astaxie/beego/pkg/core/config" - "github.com/astaxie/beego/pkg/server/web" + "github.com/astaxie/beego/adapter/session" + newCfg "github.com/astaxie/beego/core/config" + "github.com/astaxie/beego/server/web" ) // Config is the main struct for BConfig diff --git a/pkg/adapter/config/adapter.go b/adapter/config/adapter.go similarity index 99% rename from pkg/adapter/config/adapter.go rename to adapter/config/adapter.go index 8506228f..6dc538ea 100644 --- a/pkg/adapter/config/adapter.go +++ b/adapter/config/adapter.go @@ -19,7 +19,7 @@ import ( "github.com/pkg/errors" - "github.com/astaxie/beego/pkg/core/config" + "github.com/astaxie/beego/core/config" ) type newToOldConfigerAdapter struct { diff --git a/pkg/adapter/config/config.go b/adapter/config/config.go similarity index 99% rename from pkg/adapter/config/config.go rename to adapter/config/config.go index 821379f4..703555cd 100644 --- a/pkg/adapter/config/config.go +++ b/adapter/config/config.go @@ -41,7 +41,7 @@ package config import ( - "github.com/astaxie/beego/pkg/core/config" + "github.com/astaxie/beego/core/config" ) // Configer defines how to get and set value from configuration raw data. diff --git a/pkg/adapter/config/config_test.go b/adapter/config/config_test.go similarity index 100% rename from pkg/adapter/config/config_test.go rename to adapter/config/config_test.go diff --git a/pkg/adapter/config/env/env.go b/adapter/config/env/env.go similarity index 97% rename from pkg/adapter/config/env/env.go rename to adapter/config/env/env.go index bac80576..839c60c1 100644 --- a/pkg/adapter/config/env/env.go +++ b/adapter/config/env/env.go @@ -17,7 +17,7 @@ package env import ( - "github.com/astaxie/beego/pkg/core/config/env" + "github.com/astaxie/beego/core/config/env" ) // Get returns a value by key. diff --git a/pkg/adapter/config/env/env_test.go b/adapter/config/env/env_test.go similarity index 100% rename from pkg/adapter/config/env/env_test.go rename to adapter/config/env/env_test.go diff --git a/pkg/adapter/config/fake.go b/adapter/config/fake.go similarity index 94% rename from pkg/adapter/config/fake.go rename to adapter/config/fake.go index acbd52e5..050f0252 100644 --- a/pkg/adapter/config/fake.go +++ b/adapter/config/fake.go @@ -15,7 +15,7 @@ package config import ( - "github.com/astaxie/beego/pkg/core/config" + "github.com/astaxie/beego/core/config" ) // NewFakeConfig return a fake Configer diff --git a/pkg/adapter/config/ini_test.go b/adapter/config/ini_test.go similarity index 100% rename from pkg/adapter/config/ini_test.go rename to adapter/config/ini_test.go diff --git a/pkg/adapter/config/json.go b/adapter/config/json.go similarity index 92% rename from pkg/adapter/config/json.go rename to adapter/config/json.go index 69c87568..d77e6146 100644 --- a/pkg/adapter/config/json.go +++ b/adapter/config/json.go @@ -15,5 +15,5 @@ package config import ( - _ "github.com/astaxie/beego/pkg/core/config/json" + _ "github.com/astaxie/beego/core/config/json" ) diff --git a/pkg/adapter/config/json_test.go b/adapter/config/json_test.go similarity index 100% rename from pkg/adapter/config/json_test.go rename to adapter/config/json_test.go diff --git a/pkg/adapter/config/xml/xml.go b/adapter/config/xml/xml.go similarity index 95% rename from pkg/adapter/config/xml/xml.go rename to adapter/config/xml/xml.go index 2744e335..28d5f44e 100644 --- a/pkg/adapter/config/xml/xml.go +++ b/adapter/config/xml/xml.go @@ -30,5 +30,5 @@ package xml import ( - _ "github.com/astaxie/beego/pkg/core/config/xml" + _ "github.com/astaxie/beego/core/config/xml" ) diff --git a/pkg/adapter/config/xml/xml_test.go b/adapter/config/xml/xml_test.go similarity index 98% rename from pkg/adapter/config/xml/xml_test.go rename to adapter/config/xml/xml_test.go index 122c5027..ae9b209e 100644 --- a/pkg/adapter/config/xml/xml_test.go +++ b/adapter/config/xml/xml_test.go @@ -19,7 +19,7 @@ import ( "os" "testing" - "github.com/astaxie/beego/pkg/adapter/config" + "github.com/astaxie/beego/adapter/config" ) func TestXML(t *testing.T) { diff --git a/pkg/adapter/config/yaml/yaml.go b/adapter/config/yaml/yaml.go similarity index 95% rename from pkg/adapter/config/yaml/yaml.go rename to adapter/config/yaml/yaml.go index c5325ccd..196c9725 100644 --- a/pkg/adapter/config/yaml/yaml.go +++ b/adapter/config/yaml/yaml.go @@ -30,5 +30,5 @@ package yaml import ( - _ "github.com/astaxie/beego/pkg/core/config/yaml" + _ "github.com/astaxie/beego/core/config/yaml" ) diff --git a/pkg/adapter/config/yaml/yaml_test.go b/adapter/config/yaml/yaml_test.go similarity index 98% rename from pkg/adapter/config/yaml/yaml_test.go rename to adapter/config/yaml/yaml_test.go index e4e309a2..a72e435e 100644 --- a/pkg/adapter/config/yaml/yaml_test.go +++ b/adapter/config/yaml/yaml_test.go @@ -19,7 +19,7 @@ import ( "os" "testing" - "github.com/astaxie/beego/pkg/adapter/config" + "github.com/astaxie/beego/adapter/config" ) func TestYaml(t *testing.T) { diff --git a/pkg/adapter/context/acceptencoder.go b/adapter/context/acceptencoder.go similarity index 96% rename from pkg/adapter/context/acceptencoder.go rename to adapter/context/acceptencoder.go index e578de45..4bfef95e 100644 --- a/pkg/adapter/context/acceptencoder.go +++ b/adapter/context/acceptencoder.go @@ -19,7 +19,7 @@ import ( "net/http" "os" - "github.com/astaxie/beego/pkg/server/web/context" + "github.com/astaxie/beego/server/web/context" ) // InitGzip init the gzipcompress diff --git a/pkg/adapter/context/context.go b/adapter/context/context.go similarity index 98% rename from pkg/adapter/context/context.go rename to adapter/context/context.go index f9d8c624..123fdb2c 100644 --- a/pkg/adapter/context/context.go +++ b/adapter/context/context.go @@ -27,7 +27,7 @@ import ( "net" "net/http" - "github.com/astaxie/beego/pkg/server/web/context" + "github.com/astaxie/beego/server/web/context" ) // commonly used mime-types diff --git a/pkg/adapter/context/input.go b/adapter/context/input.go similarity index 99% rename from pkg/adapter/context/input.go rename to adapter/context/input.go index a1d08855..4d62d3c1 100644 --- a/pkg/adapter/context/input.go +++ b/adapter/context/input.go @@ -15,7 +15,7 @@ package context import ( - "github.com/astaxie/beego/pkg/server/web/context" + "github.com/astaxie/beego/server/web/context" ) // BeegoInput operates the http request header, data, cookie and body. diff --git a/pkg/adapter/context/output.go b/adapter/context/output.go similarity index 99% rename from pkg/adapter/context/output.go rename to adapter/context/output.go index 8e2a7f7d..0223679b 100644 --- a/pkg/adapter/context/output.go +++ b/adapter/context/output.go @@ -15,7 +15,7 @@ package context import ( - "github.com/astaxie/beego/pkg/server/web/context" + "github.com/astaxie/beego/server/web/context" ) // BeegoOutput does work for sending response header. diff --git a/pkg/adapter/context/renderer.go b/adapter/context/renderer.go similarity index 67% rename from pkg/adapter/context/renderer.go rename to adapter/context/renderer.go index 763fb9c4..1309365a 100644 --- a/pkg/adapter/context/renderer.go +++ b/adapter/context/renderer.go @@ -1,7 +1,7 @@ package context import ( - "github.com/astaxie/beego/pkg/server/web/context" + "github.com/astaxie/beego/server/web/context" ) // Renderer defines an http response renderer diff --git a/pkg/adapter/context/response.go b/adapter/context/response.go similarity index 100% rename from pkg/adapter/context/response.go rename to adapter/context/response.go diff --git a/pkg/adapter/controller.go b/adapter/controller.go similarity index 98% rename from pkg/adapter/controller.go rename to adapter/controller.go index c0616962..14dc9b97 100644 --- a/pkg/adapter/controller.go +++ b/adapter/controller.go @@ -18,10 +18,10 @@ import ( "mime/multipart" "net/url" - "github.com/astaxie/beego/pkg/adapter/session" - webContext "github.com/astaxie/beego/pkg/server/web/context" + "github.com/astaxie/beego/adapter/session" + webContext "github.com/astaxie/beego/server/web/context" - "github.com/astaxie/beego/pkg/server/web" + "github.com/astaxie/beego/server/web" ) var ( diff --git a/pkg/adapter/doc.go b/adapter/doc.go similarity index 100% rename from pkg/adapter/doc.go rename to adapter/doc.go diff --git a/pkg/adapter/error.go b/adapter/error.go similarity index 96% rename from pkg/adapter/error.go rename to adapter/error.go index 4f08aa8c..35ff7f35 100644 --- a/pkg/adapter/error.go +++ b/adapter/error.go @@ -17,10 +17,10 @@ package adapter import ( "net/http" - "github.com/astaxie/beego/pkg/adapter/context" - beecontext "github.com/astaxie/beego/pkg/server/web/context" + "github.com/astaxie/beego/adapter/context" + beecontext "github.com/astaxie/beego/server/web/context" - "github.com/astaxie/beego/pkg/server/web" + "github.com/astaxie/beego/server/web" ) const ( diff --git a/pkg/adapter/filter.go b/adapter/filter.go similarity index 90% rename from pkg/adapter/filter.go rename to adapter/filter.go index cafed773..283d8879 100644 --- a/pkg/adapter/filter.go +++ b/adapter/filter.go @@ -15,9 +15,9 @@ package adapter import ( - "github.com/astaxie/beego/pkg/adapter/context" - "github.com/astaxie/beego/pkg/server/web" - beecontext "github.com/astaxie/beego/pkg/server/web/context" + "github.com/astaxie/beego/adapter/context" + "github.com/astaxie/beego/server/web" + beecontext "github.com/astaxie/beego/server/web/context" ) // FilterFunc defines a filter function which is invoked before the controller handler is executed. diff --git a/pkg/adapter/flash.go b/adapter/flash.go similarity index 97% rename from pkg/adapter/flash.go rename to adapter/flash.go index 02e75ed6..2b47ee62 100644 --- a/pkg/adapter/flash.go +++ b/adapter/flash.go @@ -15,7 +15,7 @@ package adapter import ( - "github.com/astaxie/beego/pkg/server/web" + "github.com/astaxie/beego/server/web" ) // FlashData is a tools to maintain data when using across request. diff --git a/pkg/adapter/fs.go b/adapter/fs.go similarity index 96% rename from pkg/adapter/fs.go rename to adapter/fs.go index 07054ca3..e48e75b5 100644 --- a/pkg/adapter/fs.go +++ b/adapter/fs.go @@ -18,7 +18,7 @@ import ( "net/http" "path/filepath" - "github.com/astaxie/beego/pkg/server/web" + "github.com/astaxie/beego/server/web" ) type FileSystem web.FileSystem diff --git a/pkg/adapter/grace/grace.go b/adapter/grace/grace.go similarity index 98% rename from pkg/adapter/grace/grace.go rename to adapter/grace/grace.go index 3775e395..75ceef21 100644 --- a/pkg/adapter/grace/grace.go +++ b/adapter/grace/grace.go @@ -46,7 +46,7 @@ import ( "net/http" "time" - "github.com/astaxie/beego/pkg/server/web/grace" + "github.com/astaxie/beego/server/web/grace" ) const ( diff --git a/pkg/adapter/grace/server.go b/adapter/grace/server.go similarity index 97% rename from pkg/adapter/grace/server.go rename to adapter/grace/server.go index 31c13f18..0dfb2fd6 100644 --- a/pkg/adapter/grace/server.go +++ b/adapter/grace/server.go @@ -3,7 +3,7 @@ package grace import ( "os" - "github.com/astaxie/beego/pkg/server/web/grace" + "github.com/astaxie/beego/server/web/grace" ) // Server embedded http.Server diff --git a/pkg/adapter/httplib/httplib.go b/adapter/httplib/httplib.go similarity index 99% rename from pkg/adapter/httplib/httplib.go rename to adapter/httplib/httplib.go index d2ef36c1..d9ff1ea5 100644 --- a/pkg/adapter/httplib/httplib.go +++ b/adapter/httplib/httplib.go @@ -38,7 +38,7 @@ import ( "net/url" "time" - "github.com/astaxie/beego/pkg/client/httplib" + "github.com/astaxie/beego/client/httplib" ) // SetDefaultSetting Overwrite default settings diff --git a/pkg/adapter/httplib/httplib_test.go b/adapter/httplib/httplib_test.go similarity index 100% rename from pkg/adapter/httplib/httplib_test.go rename to adapter/httplib/httplib_test.go diff --git a/pkg/adapter/log.go b/adapter/log.go similarity index 97% rename from pkg/adapter/log.go rename to adapter/log.go index 0d7d94c0..9d07ec1a 100644 --- a/pkg/adapter/log.go +++ b/adapter/log.go @@ -17,9 +17,9 @@ package adapter import ( "strings" - "github.com/astaxie/beego/pkg/core/logs" + "github.com/astaxie/beego/core/logs" - webLog "github.com/astaxie/beego/pkg/core/logs" + webLog "github.com/astaxie/beego/core/logs" ) // Log levels to control the logging output. diff --git a/pkg/adapter/logs/accesslog.go b/adapter/logs/accesslog.go similarity index 95% rename from pkg/adapter/logs/accesslog.go rename to adapter/logs/accesslog.go index cebee92b..a2150884 100644 --- a/pkg/adapter/logs/accesslog.go +++ b/adapter/logs/accesslog.go @@ -15,7 +15,7 @@ package logs import ( - "github.com/astaxie/beego/pkg/core/logs" + "github.com/astaxie/beego/core/logs" ) // AccessLogRecord struct for holding access log data. diff --git a/adapter/logs/alils/alils.go b/adapter/logs/alils/alils.go new file mode 100644 index 00000000..941cba4c --- /dev/null +++ b/adapter/logs/alils/alils.go @@ -0,0 +1,5 @@ +package alils + +import ( + _ "github.com/astaxie/beego/core/logs/alils" +) diff --git a/adapter/logs/es/es.go b/adapter/logs/es/es.go new file mode 100644 index 00000000..0f0fd607 --- /dev/null +++ b/adapter/logs/es/es.go @@ -0,0 +1,5 @@ +package es + +import ( + _ "github.com/astaxie/beego/core/logs/es" +) diff --git a/pkg/adapter/logs/log.go b/adapter/logs/log.go similarity index 99% rename from pkg/adapter/logs/log.go rename to adapter/logs/log.go index 185b2a47..54eb24d5 100644 --- a/pkg/adapter/logs/log.go +++ b/adapter/logs/log.go @@ -37,7 +37,7 @@ import ( "log" "time" - "github.com/astaxie/beego/pkg/core/logs" + "github.com/astaxie/beego/core/logs" ) // RFC5424 log message levels. diff --git a/pkg/adapter/logs/log_adapter.go b/adapter/logs/log_adapter.go similarity index 97% rename from pkg/adapter/logs/log_adapter.go rename to adapter/logs/log_adapter.go index ee517bf0..6b7022d6 100644 --- a/pkg/adapter/logs/log_adapter.go +++ b/adapter/logs/log_adapter.go @@ -17,7 +17,7 @@ package logs import ( "time" - "github.com/astaxie/beego/pkg/core/logs" + "github.com/astaxie/beego/core/logs" ) type oldToNewAdapter struct { diff --git a/pkg/adapter/logs/logger.go b/adapter/logs/logger.go similarity index 96% rename from pkg/adapter/logs/logger.go rename to adapter/logs/logger.go index 419ac9c4..5a8e0a1c 100644 --- a/pkg/adapter/logs/logger.go +++ b/adapter/logs/logger.go @@ -15,7 +15,7 @@ package logs import ( - "github.com/astaxie/beego/pkg/core/logs" + "github.com/astaxie/beego/core/logs" ) // ColorByStatus return color by http code diff --git a/pkg/adapter/logs/logger_test.go b/adapter/logs/logger_test.go similarity index 100% rename from pkg/adapter/logs/logger_test.go rename to adapter/logs/logger_test.go diff --git a/pkg/adapter/metric/prometheus.go b/adapter/metric/prometheus.go similarity index 87% rename from pkg/adapter/metric/prometheus.go rename to adapter/metric/prometheus.go index df5db84f..4660f626 100644 --- a/pkg/adapter/metric/prometheus.go +++ b/adapter/metric/prometheus.go @@ -23,9 +23,9 @@ import ( "github.com/prometheus/client_golang/prometheus" - "github.com/astaxie/beego/pkg" - "github.com/astaxie/beego/pkg/core/logs" - "github.com/astaxie/beego/pkg/server/web" + "github.com/astaxie/beego" + "github.com/astaxie/beego/core/logs" + "github.com/astaxie/beego/server/web" ) func PrometheusMiddleWare(next http.Handler) http.Handler { @@ -59,13 +59,13 @@ func registerBuildInfo() { Help: "The building information", ConstLabels: map[string]string{ "appname": web.BConfig.AppName, - "build_version": pkg.BuildVersion, - "build_revision": pkg.BuildGitRevision, - "build_status": pkg.BuildStatus, - "build_tag": pkg.BuildTag, - "build_time": strings.Replace(pkg.BuildTime, "--", " ", 1), - "go_version": pkg.GoVersion, - "git_branch": pkg.GitBranch, + "build_version": beego.BuildVersion, + "build_revision": beego.BuildGitRevision, + "build_status": beego.BuildStatus, + "build_tag": beego.BuildTag, + "build_time": strings.Replace(beego.BuildTime, "--", " ", 1), + "go_version": beego.GoVersion, + "git_branch": beego.GitBranch, "start_time": time.Now().Format("2006-01-02 15:04:05"), }, }, []string{}) diff --git a/pkg/adapter/metric/prometheus_test.go b/adapter/metric/prometheus_test.go similarity index 96% rename from pkg/adapter/metric/prometheus_test.go rename to adapter/metric/prometheus_test.go index 87286e02..751348bf 100644 --- a/pkg/adapter/metric/prometheus_test.go +++ b/adapter/metric/prometheus_test.go @@ -22,7 +22,7 @@ import ( "github.com/prometheus/client_golang/prometheus" - "github.com/astaxie/beego/pkg/adapter/context" + "github.com/astaxie/beego/adapter/context" ) func TestPrometheusMiddleWare(t *testing.T) { diff --git a/pkg/adapter/migration/ddl.go b/adapter/migration/ddl.go similarity index 99% rename from pkg/adapter/migration/ddl.go rename to adapter/migration/ddl.go index 97e45dec..b43b4d34 100644 --- a/pkg/adapter/migration/ddl.go +++ b/adapter/migration/ddl.go @@ -15,7 +15,7 @@ package migration import ( - "github.com/astaxie/beego/pkg/client/orm/migration" + "github.com/astaxie/beego/client/orm/migration" ) // Index struct defines the structure of Index Columns diff --git a/pkg/adapter/migration/doc.go b/adapter/migration/doc.go similarity index 100% rename from pkg/adapter/migration/doc.go rename to adapter/migration/doc.go diff --git a/pkg/adapter/migration/migration.go b/adapter/migration/migration.go similarity index 98% rename from pkg/adapter/migration/migration.go rename to adapter/migration/migration.go index 4ee22e5a..677c35ca 100644 --- a/pkg/adapter/migration/migration.go +++ b/adapter/migration/migration.go @@ -28,7 +28,7 @@ package migration import ( - "github.com/astaxie/beego/pkg/client/orm/migration" + "github.com/astaxie/beego/client/orm/migration" ) // const the data format for the bee generate migration datatype diff --git a/pkg/adapter/namespace.go b/adapter/namespace.go similarity index 98% rename from pkg/adapter/namespace.go rename to adapter/namespace.go index 609402cf..98cbd8a5 100644 --- a/pkg/adapter/namespace.go +++ b/adapter/namespace.go @@ -17,10 +17,10 @@ package adapter import ( "net/http" - adtContext "github.com/astaxie/beego/pkg/adapter/context" - "github.com/astaxie/beego/pkg/server/web/context" + adtContext "github.com/astaxie/beego/adapter/context" + "github.com/astaxie/beego/server/web/context" - "github.com/astaxie/beego/pkg/server/web" + "github.com/astaxie/beego/server/web" ) type namespaceCond func(*adtContext.Context) bool diff --git a/pkg/adapter/orm/cmd.go b/adapter/orm/cmd.go similarity index 95% rename from pkg/adapter/orm/cmd.go rename to adapter/orm/cmd.go index 6fee237c..fcbd1be4 100644 --- a/pkg/adapter/orm/cmd.go +++ b/adapter/orm/cmd.go @@ -15,7 +15,7 @@ package orm import ( - "github.com/astaxie/beego/pkg/client/orm" + "github.com/astaxie/beego/client/orm" ) // RunCommand listen for orm command and then run it if command arguments passed. diff --git a/pkg/adapter/orm/db.go b/adapter/orm/db.go similarity index 94% rename from pkg/adapter/orm/db.go rename to adapter/orm/db.go index 74bca8c0..fd878732 100644 --- a/pkg/adapter/orm/db.go +++ b/adapter/orm/db.go @@ -15,7 +15,7 @@ package orm import ( - "github.com/astaxie/beego/pkg/client/orm" + "github.com/astaxie/beego/client/orm" ) var ( diff --git a/pkg/adapter/orm/db_alias.go b/adapter/orm/db_alias.go similarity index 98% rename from pkg/adapter/orm/db_alias.go rename to adapter/orm/db_alias.go index 523b6aee..81a07207 100644 --- a/pkg/adapter/orm/db_alias.go +++ b/adapter/orm/db_alias.go @@ -19,7 +19,7 @@ import ( "database/sql" "time" - "github.com/astaxie/beego/pkg/client/orm" + "github.com/astaxie/beego/client/orm" ) // DriverType database driver constant int. diff --git a/pkg/adapter/orm/models.go b/adapter/orm/models.go similarity index 94% rename from pkg/adapter/orm/models.go rename to adapter/orm/models.go index 3215f5b5..5df64d6d 100644 --- a/pkg/adapter/orm/models.go +++ b/adapter/orm/models.go @@ -15,7 +15,7 @@ package orm import ( - "github.com/astaxie/beego/pkg/client/orm" + "github.com/astaxie/beego/client/orm" ) // ResetModelCache Clean model cache. Then you can re-RegisterModel. diff --git a/pkg/adapter/orm/models_boot.go b/adapter/orm/models_boot.go similarity index 96% rename from pkg/adapter/orm/models_boot.go rename to adapter/orm/models_boot.go index 8888ef65..0b07de59 100644 --- a/pkg/adapter/orm/models_boot.go +++ b/adapter/orm/models_boot.go @@ -15,7 +15,7 @@ package orm import ( - "github.com/astaxie/beego/pkg/client/orm" + "github.com/astaxie/beego/client/orm" ) // RegisterModel register models diff --git a/pkg/adapter/orm/models_fields.go b/adapter/orm/models_fields.go similarity index 99% rename from pkg/adapter/orm/models_fields.go rename to adapter/orm/models_fields.go index 666a97dc..6210567b 100644 --- a/pkg/adapter/orm/models_fields.go +++ b/adapter/orm/models_fields.go @@ -17,7 +17,7 @@ package orm import ( "time" - "github.com/astaxie/beego/pkg/client/orm" + "github.com/astaxie/beego/client/orm" ) // Define the Type enum diff --git a/pkg/adapter/orm/orm.go b/adapter/orm/orm.go similarity index 98% rename from pkg/adapter/orm/orm.go rename to adapter/orm/orm.go index 61990256..15df76ed 100644 --- a/pkg/adapter/orm/orm.go +++ b/adapter/orm/orm.go @@ -58,9 +58,9 @@ import ( "database/sql" "errors" - "github.com/astaxie/beego/pkg/client/orm" - "github.com/astaxie/beego/pkg/client/orm/hints" - "github.com/astaxie/beego/pkg/core/utils" + "github.com/astaxie/beego/client/orm" + "github.com/astaxie/beego/client/orm/hints" + "github.com/astaxie/beego/core/utils" ) // DebugQueries define the debug diff --git a/pkg/adapter/orm/orm_conds.go b/adapter/orm/orm_conds.go similarity index 98% rename from pkg/adapter/orm/orm_conds.go rename to adapter/orm/orm_conds.go index 986b4858..f70f0f5b 100644 --- a/pkg/adapter/orm/orm_conds.go +++ b/adapter/orm/orm_conds.go @@ -15,7 +15,7 @@ package orm import ( - "github.com/astaxie/beego/pkg/client/orm" + "github.com/astaxie/beego/client/orm" ) // ExprSep define the expression separation diff --git a/pkg/adapter/orm/orm_log.go b/adapter/orm/orm_log.go similarity index 95% rename from pkg/adapter/orm/orm_log.go rename to adapter/orm/orm_log.go index 6b2b4a9b..3ff7f01c 100644 --- a/pkg/adapter/orm/orm_log.go +++ b/adapter/orm/orm_log.go @@ -17,7 +17,7 @@ package orm import ( "io" - "github.com/astaxie/beego/pkg/client/orm" + "github.com/astaxie/beego/client/orm" ) // Log implement the log.Logger diff --git a/pkg/adapter/orm/orm_queryset.go b/adapter/orm/orm_queryset.go similarity index 95% rename from pkg/adapter/orm/orm_queryset.go rename to adapter/orm/orm_queryset.go index 5f211644..1926a6c0 100644 --- a/pkg/adapter/orm/orm_queryset.go +++ b/adapter/orm/orm_queryset.go @@ -15,7 +15,7 @@ package orm import ( - "github.com/astaxie/beego/pkg/client/orm" + "github.com/astaxie/beego/client/orm" ) // define Col operations diff --git a/pkg/adapter/orm/qb.go b/adapter/orm/qb.go similarity index 95% rename from pkg/adapter/orm/qb.go rename to adapter/orm/qb.go index 90b97797..63eaed8a 100644 --- a/pkg/adapter/orm/qb.go +++ b/adapter/orm/qb.go @@ -15,7 +15,7 @@ package orm import ( - "github.com/astaxie/beego/pkg/client/orm" + "github.com/astaxie/beego/client/orm" ) // QueryBuilder is the Query builder interface diff --git a/pkg/adapter/orm/qb_mysql.go b/adapter/orm/qb_mysql.go similarity index 99% rename from pkg/adapter/orm/qb_mysql.go rename to adapter/orm/qb_mysql.go index 9566068f..ef87ebab 100644 --- a/pkg/adapter/orm/qb_mysql.go +++ b/adapter/orm/qb_mysql.go @@ -15,7 +15,7 @@ package orm import ( - "github.com/astaxie/beego/pkg/client/orm" + "github.com/astaxie/beego/client/orm" ) // CommaSpace is the separation diff --git a/pkg/adapter/orm/qb_tidb.go b/adapter/orm/qb_tidb.go similarity index 99% rename from pkg/adapter/orm/qb_tidb.go rename to adapter/orm/qb_tidb.go index 05c91a26..18631ef0 100644 --- a/pkg/adapter/orm/qb_tidb.go +++ b/adapter/orm/qb_tidb.go @@ -15,7 +15,7 @@ package orm import ( - "github.com/astaxie/beego/pkg/client/orm" + "github.com/astaxie/beego/client/orm" ) // TiDBQueryBuilder is the SQL build diff --git a/pkg/adapter/orm/query_setter_adapter.go b/adapter/orm/query_setter_adapter.go similarity index 95% rename from pkg/adapter/orm/query_setter_adapter.go rename to adapter/orm/query_setter_adapter.go index cc24ef6b..d6c268b6 100644 --- a/pkg/adapter/orm/query_setter_adapter.go +++ b/adapter/orm/query_setter_adapter.go @@ -15,7 +15,7 @@ package orm import ( - "github.com/astaxie/beego/pkg/client/orm" + "github.com/astaxie/beego/client/orm" ) type baseQuerySetter struct { diff --git a/pkg/adapter/orm/types.go b/adapter/orm/types.go similarity index 99% rename from pkg/adapter/orm/types.go rename to adapter/orm/types.go index 3372e301..6db5066c 100644 --- a/pkg/adapter/orm/types.go +++ b/adapter/orm/types.go @@ -18,7 +18,7 @@ import ( "context" "database/sql" - "github.com/astaxie/beego/pkg/client/orm" + "github.com/astaxie/beego/client/orm" ) // Params stores the Params diff --git a/pkg/adapter/orm/utils.go b/adapter/orm/utils.go similarity index 99% rename from pkg/adapter/orm/utils.go rename to adapter/orm/utils.go index 16d0e4e5..37ba86d8 100644 --- a/pkg/adapter/orm/utils.go +++ b/adapter/orm/utils.go @@ -21,7 +21,7 @@ import ( "strings" "time" - "github.com/astaxie/beego/pkg/client/orm" + "github.com/astaxie/beego/client/orm" ) type fn func(string) string diff --git a/pkg/adapter/orm/utils_test.go b/adapter/orm/utils_test.go similarity index 100% rename from pkg/adapter/orm/utils_test.go rename to adapter/orm/utils_test.go diff --git a/pkg/adapter/plugins/apiauth/apiauth.go b/adapter/plugins/apiauth/apiauth.go similarity index 92% rename from pkg/adapter/plugins/apiauth/apiauth.go rename to adapter/plugins/apiauth/apiauth.go index ed43f8a0..90311d8f 100644 --- a/pkg/adapter/plugins/apiauth/apiauth.go +++ b/adapter/plugins/apiauth/apiauth.go @@ -58,10 +58,10 @@ package apiauth import ( "net/url" - beego "github.com/astaxie/beego/pkg/adapter" - "github.com/astaxie/beego/pkg/adapter/context" - beecontext "github.com/astaxie/beego/pkg/server/web/context" - "github.com/astaxie/beego/pkg/server/web/filter/apiauth" + beego "github.com/astaxie/beego/adapter" + "github.com/astaxie/beego/adapter/context" + beecontext "github.com/astaxie/beego/server/web/context" + "github.com/astaxie/beego/server/web/filter/apiauth" ) // AppIDToAppSecret is used to get appsecret throw appid diff --git a/pkg/adapter/plugins/apiauth/apiauth_test.go b/adapter/plugins/apiauth/apiauth_test.go similarity index 100% rename from pkg/adapter/plugins/apiauth/apiauth_test.go rename to adapter/plugins/apiauth/apiauth_test.go diff --git a/pkg/adapter/plugins/auth/basic.go b/adapter/plugins/auth/basic.go similarity index 92% rename from pkg/adapter/plugins/auth/basic.go rename to adapter/plugins/auth/basic.go index 7a9cd326..578a16d9 100644 --- a/pkg/adapter/plugins/auth/basic.go +++ b/adapter/plugins/auth/basic.go @@ -38,10 +38,10 @@ package auth import ( "net/http" - beego "github.com/astaxie/beego/pkg/adapter" - "github.com/astaxie/beego/pkg/adapter/context" - beecontext "github.com/astaxie/beego/pkg/server/web/context" - "github.com/astaxie/beego/pkg/server/web/filter/auth" + beego "github.com/astaxie/beego/adapter" + "github.com/astaxie/beego/adapter/context" + beecontext "github.com/astaxie/beego/server/web/context" + "github.com/astaxie/beego/server/web/filter/auth" ) // Basic is the http basic auth diff --git a/pkg/adapter/plugins/authz/authz.go b/adapter/plugins/authz/authz.go similarity index 91% rename from pkg/adapter/plugins/authz/authz.go rename to adapter/plugins/authz/authz.go index c38be9cb..3f84467e 100644 --- a/pkg/adapter/plugins/authz/authz.go +++ b/adapter/plugins/authz/authz.go @@ -44,10 +44,10 @@ import ( "github.com/casbin/casbin" - beego "github.com/astaxie/beego/pkg/adapter" - "github.com/astaxie/beego/pkg/adapter/context" - beecontext "github.com/astaxie/beego/pkg/server/web/context" - "github.com/astaxie/beego/pkg/server/web/filter/authz" + beego "github.com/astaxie/beego/adapter" + "github.com/astaxie/beego/adapter/context" + beecontext "github.com/astaxie/beego/server/web/context" + "github.com/astaxie/beego/server/web/filter/authz" ) // NewAuthorizer returns the authorizer. diff --git a/pkg/adapter/plugins/authz/authz_model.conf b/adapter/plugins/authz/authz_model.conf similarity index 100% rename from pkg/adapter/plugins/authz/authz_model.conf rename to adapter/plugins/authz/authz_model.conf diff --git a/pkg/adapter/plugins/authz/authz_policy.csv b/adapter/plugins/authz/authz_policy.csv similarity index 100% rename from pkg/adapter/plugins/authz/authz_policy.csv rename to adapter/plugins/authz/authz_policy.csv diff --git a/pkg/adapter/plugins/authz/authz_test.go b/adapter/plugins/authz/authz_test.go similarity index 96% rename from pkg/adapter/plugins/authz/authz_test.go rename to adapter/plugins/authz/authz_test.go index ddbda5f4..9b4f21c2 100644 --- a/pkg/adapter/plugins/authz/authz_test.go +++ b/adapter/plugins/authz/authz_test.go @@ -19,9 +19,9 @@ import ( "net/http/httptest" "testing" - beego "github.com/astaxie/beego/pkg/adapter" - "github.com/astaxie/beego/pkg/adapter/context" - "github.com/astaxie/beego/pkg/adapter/plugins/auth" + beego "github.com/astaxie/beego/adapter" + "github.com/astaxie/beego/adapter/context" + "github.com/astaxie/beego/adapter/plugins/auth" "github.com/casbin/casbin" ) diff --git a/pkg/adapter/plugins/cors/cors.go b/adapter/plugins/cors/cors.go similarity index 91% rename from pkg/adapter/plugins/cors/cors.go rename to adapter/plugins/cors/cors.go index 65af8b8f..a15d5417 100644 --- a/pkg/adapter/plugins/cors/cors.go +++ b/adapter/plugins/cors/cors.go @@ -36,11 +36,11 @@ package cors import ( - beego "github.com/astaxie/beego/pkg/adapter" - beecontext "github.com/astaxie/beego/pkg/server/web/context" - "github.com/astaxie/beego/pkg/server/web/filter/cors" + beego "github.com/astaxie/beego/adapter" + beecontext "github.com/astaxie/beego/server/web/context" + "github.com/astaxie/beego/server/web/filter/cors" - "github.com/astaxie/beego/pkg/adapter/context" + "github.com/astaxie/beego/adapter/context" ) // Options represents Access Control options. diff --git a/pkg/adapter/policy.go b/adapter/policy.go similarity index 91% rename from pkg/adapter/policy.go rename to adapter/policy.go index f3759c76..6f334d2d 100644 --- a/pkg/adapter/policy.go +++ b/adapter/policy.go @@ -15,9 +15,9 @@ package adapter import ( - "github.com/astaxie/beego/pkg/adapter/context" - "github.com/astaxie/beego/pkg/server/web" - beecontext "github.com/astaxie/beego/pkg/server/web/context" + "github.com/astaxie/beego/adapter/context" + "github.com/astaxie/beego/server/web" + beecontext "github.com/astaxie/beego/server/web/context" ) // PolicyFunc defines a policy function which is invoked before the controller handler is executed. diff --git a/pkg/adapter/router.go b/adapter/router.go similarity index 98% rename from pkg/adapter/router.go rename to adapter/router.go index 8e8d9fdb..c91a09f1 100644 --- a/pkg/adapter/router.go +++ b/adapter/router.go @@ -18,10 +18,10 @@ import ( "net/http" "time" - beecontext "github.com/astaxie/beego/pkg/adapter/context" - "github.com/astaxie/beego/pkg/server/web/context" + beecontext "github.com/astaxie/beego/adapter/context" + "github.com/astaxie/beego/server/web/context" - "github.com/astaxie/beego/pkg/server/web" + "github.com/astaxie/beego/server/web" ) // default filter execution points diff --git a/pkg/adapter/session/couchbase/sess_couchbase.go b/adapter/session/couchbase/sess_couchbase.go similarity index 97% rename from pkg/adapter/session/couchbase/sess_couchbase.go rename to adapter/session/couchbase/sess_couchbase.go index 2903dae5..b6afb612 100644 --- a/pkg/adapter/session/couchbase/sess_couchbase.go +++ b/adapter/session/couchbase/sess_couchbase.go @@ -36,8 +36,8 @@ import ( "context" "net/http" - "github.com/astaxie/beego/pkg/adapter/session" - beecb "github.com/astaxie/beego/pkg/server/web/session/couchbase" + "github.com/astaxie/beego/adapter/session" + beecb "github.com/astaxie/beego/server/web/session/couchbase" ) // SessionStore store each session diff --git a/pkg/adapter/session/ledis/ledis_session.go b/adapter/session/ledis/ledis_session.go similarity index 95% rename from pkg/adapter/session/ledis/ledis_session.go rename to adapter/session/ledis/ledis_session.go index 92d3c96a..350cbdaa 100644 --- a/pkg/adapter/session/ledis/ledis_session.go +++ b/adapter/session/ledis/ledis_session.go @@ -5,8 +5,8 @@ import ( "context" "net/http" - "github.com/astaxie/beego/pkg/adapter/session" - beeLedis "github.com/astaxie/beego/pkg/server/web/session/ledis" + "github.com/astaxie/beego/adapter/session" + beeLedis "github.com/astaxie/beego/server/web/session/ledis" ) // SessionStore ledis session store diff --git a/pkg/adapter/session/memcache/sess_memcache.go b/adapter/session/memcache/sess_memcache.go similarity index 97% rename from pkg/adapter/session/memcache/sess_memcache.go rename to adapter/session/memcache/sess_memcache.go index ae985881..772839cd 100644 --- a/pkg/adapter/session/memcache/sess_memcache.go +++ b/adapter/session/memcache/sess_memcache.go @@ -36,9 +36,9 @@ import ( "context" "net/http" - "github.com/astaxie/beego/pkg/adapter/session" + "github.com/astaxie/beego/adapter/session" - beemem "github.com/astaxie/beego/pkg/server/web/session/memcache" + beemem "github.com/astaxie/beego/server/web/session/memcache" ) // SessionStore memcache session store diff --git a/pkg/adapter/session/mysql/sess_mysql.go b/adapter/session/mysql/sess_mysql.go similarity index 97% rename from pkg/adapter/session/mysql/sess_mysql.go rename to adapter/session/mysql/sess_mysql.go index 73113792..5d7e1dac 100644 --- a/pkg/adapter/session/mysql/sess_mysql.go +++ b/adapter/session/mysql/sess_mysql.go @@ -44,8 +44,8 @@ import ( "context" "net/http" - "github.com/astaxie/beego/pkg/adapter/session" - "github.com/astaxie/beego/pkg/server/web/session/mysql" + "github.com/astaxie/beego/adapter/session" + "github.com/astaxie/beego/server/web/session/mysql" // import mysql driver _ "github.com/go-sql-driver/mysql" diff --git a/pkg/adapter/session/postgres/sess_postgresql.go b/adapter/session/postgres/sess_postgresql.go similarity index 97% rename from pkg/adapter/session/postgres/sess_postgresql.go rename to adapter/session/postgres/sess_postgresql.go index 21a360e8..879b2b83 100644 --- a/pkg/adapter/session/postgres/sess_postgresql.go +++ b/adapter/session/postgres/sess_postgresql.go @@ -54,11 +54,11 @@ import ( "context" "net/http" - "github.com/astaxie/beego/pkg/adapter/session" + "github.com/astaxie/beego/adapter/session" // import postgresql Driver _ "github.com/lib/pq" - "github.com/astaxie/beego/pkg/server/web/session/postgres" + "github.com/astaxie/beego/server/web/session/postgres" ) // SessionStore postgresql session store diff --git a/pkg/adapter/session/provider_adapter.go b/adapter/session/provider_adapter.go similarity index 98% rename from pkg/adapter/session/provider_adapter.go rename to adapter/session/provider_adapter.go index 84cb4c85..596bc6a6 100644 --- a/pkg/adapter/session/provider_adapter.go +++ b/adapter/session/provider_adapter.go @@ -17,7 +17,7 @@ package session import ( "context" - "github.com/astaxie/beego/pkg/server/web/session" + "github.com/astaxie/beego/server/web/session" ) type oldToNewProviderAdapter struct { diff --git a/pkg/adapter/session/redis/sess_redis.go b/adapter/session/redis/sess_redis.go similarity index 97% rename from pkg/adapter/session/redis/sess_redis.go rename to adapter/session/redis/sess_redis.go index 47c9d437..bb8e8be4 100644 --- a/pkg/adapter/session/redis/sess_redis.go +++ b/adapter/session/redis/sess_redis.go @@ -36,9 +36,9 @@ import ( "context" "net/http" - "github.com/astaxie/beego/pkg/adapter/session" + "github.com/astaxie/beego/adapter/session" - beeRedis "github.com/astaxie/beego/pkg/server/web/session/redis" + beeRedis "github.com/astaxie/beego/server/web/session/redis" ) // MaxPoolSize redis max pool size diff --git a/pkg/adapter/session/redis_cluster/redis_cluster.go b/adapter/session/redis_cluster/redis_cluster.go similarity index 97% rename from pkg/adapter/session/redis_cluster/redis_cluster.go rename to adapter/session/redis_cluster/redis_cluster.go index b741b9ff..1be22cd4 100644 --- a/pkg/adapter/session/redis_cluster/redis_cluster.go +++ b/adapter/session/redis_cluster/redis_cluster.go @@ -36,8 +36,8 @@ import ( "context" "net/http" - "github.com/astaxie/beego/pkg/adapter/session" - cluster "github.com/astaxie/beego/pkg/server/web/session/redis_cluster" + "github.com/astaxie/beego/adapter/session" + cluster "github.com/astaxie/beego/server/web/session/redis_cluster" ) // MaxPoolSize redis_cluster max pool size diff --git a/pkg/adapter/session/redis_sentinel/sess_redis_sentinel.go b/adapter/session/redis_sentinel/sess_redis_sentinel.go similarity index 97% rename from pkg/adapter/session/redis_sentinel/sess_redis_sentinel.go rename to adapter/session/redis_sentinel/sess_redis_sentinel.go index 99ff7898..7ab9e7c5 100644 --- a/pkg/adapter/session/redis_sentinel/sess_redis_sentinel.go +++ b/adapter/session/redis_sentinel/sess_redis_sentinel.go @@ -36,9 +36,9 @@ import ( "context" "net/http" - "github.com/astaxie/beego/pkg/adapter/session" + "github.com/astaxie/beego/adapter/session" - sentinel "github.com/astaxie/beego/pkg/server/web/session/redis_sentinel" + sentinel "github.com/astaxie/beego/server/web/session/redis_sentinel" ) // DefaultPoolSize redis_sentinel default pool size diff --git a/pkg/adapter/session/redis_sentinel/sess_redis_sentinel_test.go b/adapter/session/redis_sentinel/sess_redis_sentinel_test.go similarity index 97% rename from pkg/adapter/session/redis_sentinel/sess_redis_sentinel_test.go rename to adapter/session/redis_sentinel/sess_redis_sentinel_test.go index 7c33985f..407d32ab 100644 --- a/pkg/adapter/session/redis_sentinel/sess_redis_sentinel_test.go +++ b/adapter/session/redis_sentinel/sess_redis_sentinel_test.go @@ -5,7 +5,7 @@ import ( "net/http/httptest" "testing" - "github.com/astaxie/beego/pkg/adapter/session" + "github.com/astaxie/beego/adapter/session" ) func TestRedisSentinel(t *testing.T) { diff --git a/pkg/adapter/session/sess_cookie.go b/adapter/session/sess_cookie.go similarity index 98% rename from pkg/adapter/session/sess_cookie.go rename to adapter/session/sess_cookie.go index 8c6c1dc7..3fcbd28e 100644 --- a/pkg/adapter/session/sess_cookie.go +++ b/adapter/session/sess_cookie.go @@ -18,7 +18,7 @@ import ( "context" "net/http" - "github.com/astaxie/beego/pkg/server/web/session" + "github.com/astaxie/beego/server/web/session" ) // CookieSessionStore Cookie SessionStore diff --git a/pkg/adapter/session/sess_cookie_test.go b/adapter/session/sess_cookie_test.go similarity index 100% rename from pkg/adapter/session/sess_cookie_test.go rename to adapter/session/sess_cookie_test.go diff --git a/pkg/adapter/session/sess_file.go b/adapter/session/sess_file.go similarity index 98% rename from pkg/adapter/session/sess_file.go rename to adapter/session/sess_file.go index 870b62a6..2ba33e6d 100644 --- a/pkg/adapter/session/sess_file.go +++ b/adapter/session/sess_file.go @@ -18,7 +18,7 @@ import ( "context" "net/http" - "github.com/astaxie/beego/pkg/server/web/session" + "github.com/astaxie/beego/server/web/session" ) // FileSessionStore File session store diff --git a/pkg/adapter/session/sess_file_test.go b/adapter/session/sess_file_test.go similarity index 100% rename from pkg/adapter/session/sess_file_test.go rename to adapter/session/sess_file_test.go diff --git a/pkg/adapter/session/sess_mem.go b/adapter/session/sess_mem.go similarity index 98% rename from pkg/adapter/session/sess_mem.go rename to adapter/session/sess_mem.go index faaab548..febed719 100644 --- a/pkg/adapter/session/sess_mem.go +++ b/adapter/session/sess_mem.go @@ -18,7 +18,7 @@ import ( "context" "net/http" - "github.com/astaxie/beego/pkg/server/web/session" + "github.com/astaxie/beego/server/web/session" ) // MemSessionStore memory session store. diff --git a/pkg/adapter/session/sess_mem_test.go b/adapter/session/sess_mem_test.go similarity index 100% rename from pkg/adapter/session/sess_mem_test.go rename to adapter/session/sess_mem_test.go diff --git a/pkg/adapter/session/sess_test.go b/adapter/session/sess_test.go similarity index 100% rename from pkg/adapter/session/sess_test.go rename to adapter/session/sess_test.go diff --git a/pkg/adapter/session/sess_utils.go b/adapter/session/sess_utils.go similarity index 94% rename from pkg/adapter/session/sess_utils.go rename to adapter/session/sess_utils.go index 8cf036e4..4cfdc760 100644 --- a/pkg/adapter/session/sess_utils.go +++ b/adapter/session/sess_utils.go @@ -15,7 +15,7 @@ package session import ( - "github.com/astaxie/beego/pkg/server/web/session" + "github.com/astaxie/beego/server/web/session" ) // EncodeGob encode the obj to gob diff --git a/pkg/adapter/session/session.go b/adapter/session/session.go similarity index 99% rename from pkg/adapter/session/session.go rename to adapter/session/session.go index 24f587b6..d8b151b7 100644 --- a/pkg/adapter/session/session.go +++ b/adapter/session/session.go @@ -32,7 +32,7 @@ import ( "net/http" "os" - "github.com/astaxie/beego/pkg/server/web/session" + "github.com/astaxie/beego/server/web/session" ) // Store contains all data for one session process with specific id. diff --git a/pkg/adapter/session/ssdb/sess_ssdb.go b/adapter/session/ssdb/sess_ssdb.go similarity index 95% rename from pkg/adapter/session/ssdb/sess_ssdb.go rename to adapter/session/ssdb/sess_ssdb.go index 3f2d08d9..cd9c4a24 100644 --- a/pkg/adapter/session/ssdb/sess_ssdb.go +++ b/adapter/session/ssdb/sess_ssdb.go @@ -4,9 +4,9 @@ import ( "context" "net/http" - "github.com/astaxie/beego/pkg/adapter/session" + "github.com/astaxie/beego/adapter/session" - beeSsdb "github.com/astaxie/beego/pkg/server/web/session/ssdb" + beeSsdb "github.com/astaxie/beego/server/web/session/ssdb" ) // Provider holds ssdb client and configs diff --git a/pkg/adapter/session/store_adapter.go b/adapter/session/store_adapter.go similarity index 97% rename from pkg/adapter/session/store_adapter.go rename to adapter/session/store_adapter.go index c0de6ac3..70ad83e2 100644 --- a/pkg/adapter/session/store_adapter.go +++ b/adapter/session/store_adapter.go @@ -18,7 +18,7 @@ import ( "context" "net/http" - "github.com/astaxie/beego/pkg/server/web/session" + "github.com/astaxie/beego/server/web/session" ) type NewToOldStoreAdapter struct { diff --git a/pkg/adapter/swagger/swagger.go b/adapter/swagger/swagger.go similarity index 98% rename from pkg/adapter/swagger/swagger.go rename to adapter/swagger/swagger.go index 214959d9..7a44b770 100644 --- a/pkg/adapter/swagger/swagger.go +++ b/adapter/swagger/swagger.go @@ -21,7 +21,7 @@ package swagger import ( - "github.com/astaxie/beego/pkg/server/web/swagger" + "github.com/astaxie/beego/server/web/swagger" ) // Swagger list the resource diff --git a/pkg/adapter/template.go b/adapter/template.go similarity index 98% rename from pkg/adapter/template.go rename to adapter/template.go index 1f943caf..67f5a33b 100644 --- a/pkg/adapter/template.go +++ b/adapter/template.go @@ -19,7 +19,7 @@ import ( "io" "net/http" - "github.com/astaxie/beego/pkg/server/web" + "github.com/astaxie/beego/server/web" ) // ExecuteTemplate applies the template with name to the specified data object, diff --git a/pkg/adapter/templatefunc.go b/adapter/templatefunc.go similarity index 98% rename from pkg/adapter/templatefunc.go rename to adapter/templatefunc.go index 5130d590..0c805393 100644 --- a/pkg/adapter/templatefunc.go +++ b/adapter/templatefunc.go @@ -19,7 +19,7 @@ import ( "net/url" "time" - "github.com/astaxie/beego/pkg/server/web" + "github.com/astaxie/beego/server/web" ) const ( diff --git a/pkg/adapter/templatefunc_test.go b/adapter/templatefunc_test.go similarity index 100% rename from pkg/adapter/templatefunc_test.go rename to adapter/templatefunc_test.go diff --git a/pkg/adapter/testing/client.go b/adapter/testing/client.go similarity index 96% rename from pkg/adapter/testing/client.go rename to adapter/testing/client.go index 688aa6f3..5c138167 100644 --- a/pkg/adapter/testing/client.go +++ b/adapter/testing/client.go @@ -15,7 +15,7 @@ package testing import ( - "github.com/astaxie/beego/pkg/client/httplib/testing" + "github.com/astaxie/beego/client/httplib/testing" ) var port = "" diff --git a/pkg/adapter/toolbox/healthcheck.go b/adapter/toolbox/healthcheck.go similarity index 96% rename from pkg/adapter/toolbox/healthcheck.go rename to adapter/toolbox/healthcheck.go index 42b9e7d0..7d89c2fb 100644 --- a/pkg/adapter/toolbox/healthcheck.go +++ b/adapter/toolbox/healthcheck.go @@ -31,7 +31,7 @@ package toolbox import ( - "github.com/astaxie/beego/pkg/core/governor" + "github.com/astaxie/beego/core/governor" ) // AdminCheckList holds health checker map diff --git a/pkg/adapter/toolbox/profile.go b/adapter/toolbox/profile.go similarity index 96% rename from pkg/adapter/toolbox/profile.go rename to adapter/toolbox/profile.go index 97da05ac..a5434360 100644 --- a/pkg/adapter/toolbox/profile.go +++ b/adapter/toolbox/profile.go @@ -19,7 +19,7 @@ import ( "os" "time" - "github.com/astaxie/beego/pkg/core/governor" + "github.com/astaxie/beego/core/governor" ) var startTime = time.Now() diff --git a/pkg/adapter/toolbox/profile_test.go b/adapter/toolbox/profile_test.go similarity index 100% rename from pkg/adapter/toolbox/profile_test.go rename to adapter/toolbox/profile_test.go diff --git a/pkg/adapter/toolbox/statistics.go b/adapter/toolbox/statistics.go similarity index 97% rename from pkg/adapter/toolbox/statistics.go rename to adapter/toolbox/statistics.go index b7d3bda9..7c8cd75e 100644 --- a/pkg/adapter/toolbox/statistics.go +++ b/adapter/toolbox/statistics.go @@ -17,7 +17,7 @@ package toolbox import ( "time" - "github.com/astaxie/beego/pkg/server/web" + "github.com/astaxie/beego/server/web" ) // Statistics struct diff --git a/pkg/adapter/toolbox/statistics_test.go b/adapter/toolbox/statistics_test.go similarity index 100% rename from pkg/adapter/toolbox/statistics_test.go rename to adapter/toolbox/statistics_test.go diff --git a/pkg/adapter/toolbox/task.go b/adapter/toolbox/task.go similarity index 99% rename from pkg/adapter/toolbox/task.go rename to adapter/toolbox/task.go index 5b2fa14c..7f1bfc45 100644 --- a/pkg/adapter/toolbox/task.go +++ b/adapter/toolbox/task.go @@ -19,7 +19,7 @@ import ( "sort" "time" - "github.com/astaxie/beego/pkg/task" + "github.com/astaxie/beego/task" ) // The bounds for each field. diff --git a/pkg/adapter/toolbox/task_test.go b/adapter/toolbox/task_test.go similarity index 100% rename from pkg/adapter/toolbox/task_test.go rename to adapter/toolbox/task_test.go diff --git a/pkg/adapter/tree.go b/adapter/tree.go similarity index 90% rename from pkg/adapter/tree.go rename to adapter/tree.go index 2e3cd0d0..36f763ea 100644 --- a/pkg/adapter/tree.go +++ b/adapter/tree.go @@ -15,10 +15,10 @@ package adapter import ( - "github.com/astaxie/beego/pkg/adapter/context" - beecontext "github.com/astaxie/beego/pkg/server/web/context" + "github.com/astaxie/beego/adapter/context" + beecontext "github.com/astaxie/beego/server/web/context" - "github.com/astaxie/beego/pkg/server/web" + "github.com/astaxie/beego/server/web" ) // Tree has three elements: FixRouter/wildcard/leaves diff --git a/pkg/adapter/tree_test.go b/adapter/tree_test.go similarity index 99% rename from pkg/adapter/tree_test.go rename to adapter/tree_test.go index 309ed072..2315d829 100644 --- a/pkg/adapter/tree_test.go +++ b/adapter/tree_test.go @@ -17,8 +17,8 @@ package adapter import ( "testing" - "github.com/astaxie/beego/pkg/adapter/context" - beecontext "github.com/astaxie/beego/pkg/server/web/context" + "github.com/astaxie/beego/adapter/context" + beecontext "github.com/astaxie/beego/server/web/context" ) type testinfo struct { diff --git a/pkg/adapter/utils/caller.go b/adapter/utils/caller.go similarity index 94% rename from pkg/adapter/utils/caller.go rename to adapter/utils/caller.go index 124c68df..419f11d6 100644 --- a/pkg/adapter/utils/caller.go +++ b/adapter/utils/caller.go @@ -15,7 +15,7 @@ package utils import ( - "github.com/astaxie/beego/pkg/core/utils" + "github.com/astaxie/beego/core/utils" ) // GetFuncName get function name diff --git a/pkg/adapter/utils/caller_test.go b/adapter/utils/caller_test.go similarity index 100% rename from pkg/adapter/utils/caller_test.go rename to adapter/utils/caller_test.go diff --git a/pkg/adapter/utils/captcha/LICENSE b/adapter/utils/captcha/LICENSE similarity index 100% rename from pkg/adapter/utils/captcha/LICENSE rename to adapter/utils/captcha/LICENSE diff --git a/pkg/adapter/utils/captcha/README.md b/adapter/utils/captcha/README.md similarity index 100% rename from pkg/adapter/utils/captcha/README.md rename to adapter/utils/captcha/README.md diff --git a/pkg/adapter/utils/captcha/captcha.go b/adapter/utils/captcha/captcha.go similarity index 93% rename from pkg/adapter/utils/captcha/captcha.go rename to adapter/utils/captcha/captcha.go index aad3994b..71aad0f2 100644 --- a/pkg/adapter/utils/captcha/captcha.go +++ b/adapter/utils/captcha/captcha.go @@ -63,11 +63,11 @@ import ( "net/http" "time" - "github.com/astaxie/beego/pkg/server/web/captcha" - beecontext "github.com/astaxie/beego/pkg/server/web/context" + "github.com/astaxie/beego/server/web/captcha" + beecontext "github.com/astaxie/beego/server/web/context" - "github.com/astaxie/beego/pkg/adapter/cache" - "github.com/astaxie/beego/pkg/adapter/context" + "github.com/astaxie/beego/adapter/cache" + "github.com/astaxie/beego/adapter/context" ) var ( diff --git a/pkg/adapter/utils/captcha/image.go b/adapter/utils/captcha/image.go similarity index 95% rename from pkg/adapter/utils/captcha/image.go rename to adapter/utils/captcha/image.go index 9979db84..6a1b696b 100644 --- a/pkg/adapter/utils/captcha/image.go +++ b/adapter/utils/captcha/image.go @@ -17,7 +17,7 @@ package captcha import ( "io" - "github.com/astaxie/beego/pkg/server/web/captcha" + "github.com/astaxie/beego/server/web/captcha" ) // Image struct diff --git a/pkg/adapter/utils/captcha/image_test.go b/adapter/utils/captcha/image_test.go similarity index 96% rename from pkg/adapter/utils/captcha/image_test.go rename to adapter/utils/captcha/image_test.go index bce2134a..5d298573 100644 --- a/pkg/adapter/utils/captcha/image_test.go +++ b/adapter/utils/captcha/image_test.go @@ -17,7 +17,7 @@ package captcha import ( "testing" - "github.com/astaxie/beego/pkg/adapter/utils" + "github.com/astaxie/beego/adapter/utils" ) const ( diff --git a/pkg/adapter/utils/debug.go b/adapter/utils/debug.go similarity index 95% rename from pkg/adapter/utils/debug.go rename to adapter/utils/debug.go index 6bb381a1..3f4d2759 100644 --- a/pkg/adapter/utils/debug.go +++ b/adapter/utils/debug.go @@ -15,7 +15,7 @@ package utils import ( - "github.com/astaxie/beego/pkg/core/utils" + "github.com/astaxie/beego/core/utils" ) // Display print the data in console diff --git a/pkg/adapter/utils/debug_test.go b/adapter/utils/debug_test.go similarity index 100% rename from pkg/adapter/utils/debug_test.go rename to adapter/utils/debug_test.go diff --git a/pkg/adapter/utils/file.go b/adapter/utils/file.go similarity index 97% rename from pkg/adapter/utils/file.go rename to adapter/utils/file.go index 4ed2a8e3..aa9ac316 100644 --- a/pkg/adapter/utils/file.go +++ b/adapter/utils/file.go @@ -15,7 +15,7 @@ package utils import ( - "github.com/astaxie/beego/pkg/core/utils" + "github.com/astaxie/beego/core/utils" ) // SelfPath gets compiled executable file absolute path diff --git a/pkg/adapter/utils/mail.go b/adapter/utils/mail.go similarity index 97% rename from pkg/adapter/utils/mail.go rename to adapter/utils/mail.go index 74ebe25c..74a8f403 100644 --- a/pkg/adapter/utils/mail.go +++ b/adapter/utils/mail.go @@ -17,7 +17,7 @@ package utils import ( "io" - "github.com/astaxie/beego/pkg/core/utils" + "github.com/astaxie/beego/core/utils" ) // Email is the type used for email messages diff --git a/pkg/adapter/utils/mail_test.go b/adapter/utils/mail_test.go similarity index 100% rename from pkg/adapter/utils/mail_test.go rename to adapter/utils/mail_test.go diff --git a/pkg/adapter/utils/pagination/controller.go b/adapter/utils/pagination/controller.go similarity index 84% rename from pkg/adapter/utils/pagination/controller.go rename to adapter/utils/pagination/controller.go index a908d8b0..c82c54f9 100644 --- a/pkg/adapter/utils/pagination/controller.go +++ b/adapter/utils/pagination/controller.go @@ -15,9 +15,9 @@ package pagination import ( - "github.com/astaxie/beego/pkg/adapter/context" - beecontext "github.com/astaxie/beego/pkg/server/web/context" - "github.com/astaxie/beego/pkg/server/web/pagination" + "github.com/astaxie/beego/adapter/context" + beecontext "github.com/astaxie/beego/server/web/context" + "github.com/astaxie/beego/server/web/pagination" ) // SetPaginator Instantiates a Paginator and assigns it to context.Input.Data("paginator"). diff --git a/pkg/adapter/utils/pagination/doc.go b/adapter/utils/pagination/doc.go similarity index 100% rename from pkg/adapter/utils/pagination/doc.go rename to adapter/utils/pagination/doc.go diff --git a/pkg/adapter/utils/pagination/paginator.go b/adapter/utils/pagination/paginator.go similarity index 98% rename from pkg/adapter/utils/pagination/paginator.go rename to adapter/utils/pagination/paginator.go index 1fefb9e0..73d9157f 100644 --- a/pkg/adapter/utils/pagination/paginator.go +++ b/adapter/utils/pagination/paginator.go @@ -17,7 +17,7 @@ package pagination import ( "net/http" - "github.com/astaxie/beego/pkg/core/utils/pagination" + "github.com/astaxie/beego/core/utils/pagination" ) // Paginator within the state of a http request. diff --git a/pkg/adapter/utils/rand.go b/adapter/utils/rand.go similarity index 94% rename from pkg/adapter/utils/rand.go rename to adapter/utils/rand.go index c31b633e..0fcca580 100644 --- a/pkg/adapter/utils/rand.go +++ b/adapter/utils/rand.go @@ -15,7 +15,7 @@ package utils import ( - "github.com/astaxie/beego/pkg/core/utils" + "github.com/astaxie/beego/core/utils" ) // RandomCreateBytes generate random []byte by specify chars. diff --git a/pkg/adapter/utils/rand_test.go b/adapter/utils/rand_test.go similarity index 100% rename from pkg/adapter/utils/rand_test.go rename to adapter/utils/rand_test.go diff --git a/pkg/adapter/utils/safemap.go b/adapter/utils/safemap.go similarity index 97% rename from pkg/adapter/utils/safemap.go rename to adapter/utils/safemap.go index 6771aca4..bb50f3cd 100644 --- a/pkg/adapter/utils/safemap.go +++ b/adapter/utils/safemap.go @@ -15,7 +15,7 @@ package utils import ( - "github.com/astaxie/beego/pkg/core/utils" + "github.com/astaxie/beego/core/utils" ) // BeeMap is a map with lock diff --git a/pkg/adapter/utils/safemap_test.go b/adapter/utils/safemap_test.go similarity index 100% rename from pkg/adapter/utils/safemap_test.go rename to adapter/utils/safemap_test.go diff --git a/pkg/adapter/utils/slice.go b/adapter/utils/slice.go similarity index 98% rename from pkg/adapter/utils/slice.go rename to adapter/utils/slice.go index a5b852b9..44b782b4 100644 --- a/pkg/adapter/utils/slice.go +++ b/adapter/utils/slice.go @@ -15,7 +15,7 @@ package utils import ( - "github.com/astaxie/beego/pkg/core/utils" + "github.com/astaxie/beego/core/utils" ) type reducetype func(interface{}) interface{} diff --git a/pkg/adapter/utils/slice_test.go b/adapter/utils/slice_test.go similarity index 100% rename from pkg/adapter/utils/slice_test.go rename to adapter/utils/slice_test.go diff --git a/pkg/adapter/utils/utils.go b/adapter/utils/utils.go similarity index 76% rename from pkg/adapter/utils/utils.go rename to adapter/utils/utils.go index 21ed49dc..8ba21bc4 100644 --- a/pkg/adapter/utils/utils.go +++ b/adapter/utils/utils.go @@ -1,7 +1,7 @@ package utils import ( - "github.com/astaxie/beego/pkg/core/utils" + "github.com/astaxie/beego/core/utils" ) // GetGOPATHs returns all paths in GOPATH variable. diff --git a/pkg/adapter/validation/util.go b/adapter/validation/util.go similarity index 97% rename from pkg/adapter/validation/util.go rename to adapter/validation/util.go index fb5370bf..431ce80d 100644 --- a/pkg/adapter/validation/util.go +++ b/adapter/validation/util.go @@ -17,7 +17,7 @@ package validation import ( "reflect" - "github.com/astaxie/beego/pkg/core/validation" + "github.com/astaxie/beego/core/validation" ) const ( diff --git a/pkg/adapter/validation/validation.go b/adapter/validation/validation.go similarity index 99% rename from pkg/adapter/validation/validation.go rename to adapter/validation/validation.go index e95fd408..e90c9f5b 100644 --- a/pkg/adapter/validation/validation.go +++ b/adapter/validation/validation.go @@ -50,7 +50,7 @@ import ( "fmt" "regexp" - "github.com/astaxie/beego/pkg/core/validation" + "github.com/astaxie/beego/core/validation" ) // ValidFormer valid interface diff --git a/pkg/adapter/validation/validation_test.go b/adapter/validation/validation_test.go similarity index 100% rename from pkg/adapter/validation/validation_test.go rename to adapter/validation/validation_test.go diff --git a/pkg/adapter/validation/validators.go b/adapter/validation/validators.go similarity index 99% rename from pkg/adapter/validation/validators.go rename to adapter/validation/validators.go index 152e8aef..5cd5d286 100644 --- a/pkg/adapter/validation/validators.go +++ b/adapter/validation/validators.go @@ -17,7 +17,7 @@ package validation import ( "sync" - "github.com/astaxie/beego/pkg/core/validation" + "github.com/astaxie/beego/core/validation" ) // CanSkipFuncs will skip valid if RequiredFirst is true and the struct field's value is empty diff --git a/build/gobuild-sample.sh b/build/gobuild-sample.sh deleted file mode 100755 index 031eafc2..00000000 --- a/build/gobuild-sample.sh +++ /dev/null @@ -1,112 +0,0 @@ -#!/bin/bash - -# WARNING: DO NOT EDIT, THIS FILE IS PROBABLY A COPY -# -# The original version of this file is located in the https://github.com/istio/common-files repo. -# If you're looking at this file in a different repo and want to make a change, please go to the -# common-files repo, make the change there and check it in. Then come back to this repo and run -# "make update-common". - -# Copyright Istio Authors. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# This script builds and version stamps the output - -# adatp to beego - -VERBOSE=${VERBOSE:-"0"} -V="" -if [[ "${VERBOSE}" == "1" ]];then - V="-x" - set -x -fi - -SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - -OUT=${1:?"output path"} -shift - -set -e - -BUILD_GOOS=${GOOS:-linux} -BUILD_GOARCH=${GOARCH:-amd64} -GOBINARY=${GOBINARY:-go} -GOPKG="$GOPATH/pkg" -BUILDINFO=${BUILDINFO:-""} -STATIC=${STATIC:-1} -LDFLAGS=${LDFLAGS:--extldflags -static} -GOBUILDFLAGS=${GOBUILDFLAGS:-""} -# Split GOBUILDFLAGS by spaces into an array called GOBUILDFLAGS_ARRAY. -IFS=' ' read -r -a GOBUILDFLAGS_ARRAY <<< "$GOBUILDFLAGS" - -GCFLAGS=${GCFLAGS:-} -export CGO_ENABLED=0 - -if [[ "${STATIC}" != "1" ]];then - LDFLAGS="" -fi - -# gather buildinfo if not already provided -# For a release build BUILDINFO should be produced -# at the beginning of the build and used throughout -if [[ -z ${BUILDINFO} ]];then - BUILDINFO=$(mktemp) - "${SCRIPTPATH}/report_build_info.sh" > "${BUILDINFO}" -fi - - -# BUILD LD_EXTRAFLAGS -LD_EXTRAFLAGS="" - -while read -r line; do - LD_EXTRAFLAGS="${LD_EXTRAFLAGS} -X ${line}" -done < "${BUILDINFO}" - -# verify go version before build -# NB. this was copied verbatim from Kubernetes hack -minimum_go_version=go1.13 # supported patterns: go1.x, go1.x.x (x should be a number) -IFS=" " read -ra go_version <<< "$(${GOBINARY} version)" -if [[ "${minimum_go_version}" != $(echo -e "${minimum_go_version}\n${go_version[2]}" | sort -s -t. -k 1,1 -k 2,2n -k 3,3n | head -n1) && "${go_version[2]}" != "devel" ]]; then - echo "Warning: Detected that you are using an older version of the Go compiler. Beego requires ${minimum_go_version} or greater." -fi - -CURRENT_BRANCH=$(git branch | grep '*') -CURRENT_BRANCH=${CURRENT_BRANCH:2} - -BUILD_TIME=$(date +%Y-%m-%d--%T) - -LD_EXTRAFLAGS="${LD_EXTRAFLAGS} -X github.com/astaxie/beego.GoVersion=${go_version[2]:2}" -LD_EXTRAFLAGS="${LD_EXTRAFLAGS} -X github.com/astaxie/beego.GitBranch=${CURRENT_BRANCH}" -LD_EXTRAFLAGS="${LD_EXTRAFLAGS} -X github.com/astaxie/beego.BuildTime=$BUILD_TIME" - -OPTIMIZATION_FLAGS="-trimpath" -if [ "${DEBUG}" == "1" ]; then - OPTIMIZATION_FLAGS="" -fi - - - -echo "BUILD_GOARCH: $BUILD_GOARCH" -echo "GOPKG: $GOPKG" -echo "LD_EXTRAFLAGS: $LD_EXTRAFLAGS" -echo "GO_VERSION: ${go_version[2]}" -echo "BRANCH: $CURRENT_BRANCH" -echo "BUILD_TIME: $BUILD_TIME" - -time GOOS=${BUILD_GOOS} GOARCH=${BUILD_GOARCH} ${GOBINARY} build \ - ${V} "${GOBUILDFLAGS_ARRAY[@]}" ${GCFLAGS:+-gcflags "${GCFLAGS}"} \ - -o "${OUT}" \ - ${OPTIMIZATION_FLAGS} \ - -pkgdir="${GOPKG}/${BUILD_GOOS}_${BUILD_GOARCH}" \ - -ldflags "${LDFLAGS} ${LD_EXTRAFLAGS}" "${@}" \ No newline at end of file diff --git a/build/report_build_info.sh b/build/report_build_info.sh deleted file mode 100755 index 65ba3748..00000000 --- a/build/report_build_info.sh +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash - -# WARNING: DO NOT EDIT, THIS FILE IS PROBABLY A COPY -# -# The original version of this file is located in the https://github.com/istio/common-files repo. -# If you're looking at this file in a different repo and want to make a change, please go to the -# common-files repo, make the change there and check it in. Then come back to this repo and run -# "make update-common". - -# Copyright Istio Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# adapt to beego - -if BUILD_GIT_REVISION=$(git rev-parse HEAD 2> /dev/null); then - if [[ -n "$(git status --porcelain 2>/dev/null)" ]]; then - BUILD_GIT_REVISION=${BUILD_GIT_REVISION}"-dirty" - fi -else - BUILD_GIT_REVISION=unknown -fi - -# Check for local changes -if git diff-index --quiet HEAD --; then - tree_status="Clean" -else - tree_status="Modified" -fi - -# security wanted VERSION='unknown' -VERSION="${BUILD_GIT_REVISION}" -if [[ -n ${BEEGO_VERSION} ]]; then - VERSION="${BEEGO_VERSION}" -fi - -GIT_DESCRIBE_TAG=$(git describe --tags) - -echo "github.com/astaxie/beego.BuildVersion=${VERSION}" -echo "github.com/astaxie/beego.BuildGitRevision=${BUILD_GIT_REVISION}" -echo "github.com/astaxie/beego.BuildStatus=${tree_status}" -echo "github.com/astaxie/beego.BuildTag=${GIT_DESCRIBE_TAG}" \ No newline at end of file diff --git a/pkg/build_info.go b/build_info.go similarity index 98% rename from pkg/build_info.go rename to build_info.go index 778856c6..33287090 100644 --- a/pkg/build_info.go +++ b/build_info.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package pkg +package beego var ( BuildVersion string diff --git a/pkg/client/cache/README.md b/client/cache/README.md similarity index 100% rename from pkg/client/cache/README.md rename to client/cache/README.md diff --git a/pkg/client/cache/cache.go b/client/cache/cache.go similarity index 100% rename from pkg/client/cache/cache.go rename to client/cache/cache.go diff --git a/pkg/client/cache/cache_test.go b/client/cache/cache_test.go similarity index 100% rename from pkg/client/cache/cache_test.go rename to client/cache/cache_test.go diff --git a/pkg/client/cache/conv.go b/client/cache/conv.go similarity index 100% rename from pkg/client/cache/conv.go rename to client/cache/conv.go diff --git a/pkg/client/cache/conv_test.go b/client/cache/conv_test.go similarity index 100% rename from pkg/client/cache/conv_test.go rename to client/cache/conv_test.go diff --git a/pkg/client/cache/file.go b/client/cache/file.go similarity index 100% rename from pkg/client/cache/file.go rename to client/cache/file.go diff --git a/pkg/client/cache/memcache/memcache.go b/client/cache/memcache/memcache.go similarity index 98% rename from pkg/client/cache/memcache/memcache.go rename to client/cache/memcache/memcache.go index d3b7e767..f3774571 100644 --- a/pkg/client/cache/memcache/memcache.go +++ b/client/cache/memcache/memcache.go @@ -38,7 +38,7 @@ import ( "github.com/bradfitz/gomemcache/memcache" - "github.com/astaxie/beego/pkg/client/cache" + "github.com/astaxie/beego/client/cache" ) // Cache Memcache adapter. diff --git a/pkg/client/cache/memcache/memcache_test.go b/client/cache/memcache/memcache_test.go similarity index 98% rename from pkg/client/cache/memcache/memcache_test.go rename to client/cache/memcache/memcache_test.go index 64679671..bc8936a7 100644 --- a/pkg/client/cache/memcache/memcache_test.go +++ b/client/cache/memcache/memcache_test.go @@ -24,7 +24,7 @@ import ( _ "github.com/bradfitz/gomemcache/memcache" - "github.com/astaxie/beego/pkg/client/cache" + "github.com/astaxie/beego/client/cache" ) func TestMemcacheCache(t *testing.T) { diff --git a/pkg/client/cache/memory.go b/client/cache/memory.go similarity index 100% rename from pkg/client/cache/memory.go rename to client/cache/memory.go diff --git a/pkg/client/cache/redis/redis.go b/client/cache/redis/redis.go similarity index 99% rename from pkg/client/cache/redis/redis.go rename to client/cache/redis/redis.go index e2785297..34059835 100644 --- a/pkg/client/cache/redis/redis.go +++ b/client/cache/redis/redis.go @@ -40,7 +40,7 @@ import ( "github.com/gomodule/redigo/redis" - "github.com/astaxie/beego/pkg/client/cache" + "github.com/astaxie/beego/client/cache" ) var ( diff --git a/pkg/client/cache/redis/redis_test.go b/client/cache/redis/redis_test.go similarity index 98% rename from pkg/client/cache/redis/redis_test.go rename to client/cache/redis/redis_test.go index f7308365..f82b2c40 100644 --- a/pkg/client/cache/redis/redis_test.go +++ b/client/cache/redis/redis_test.go @@ -24,7 +24,7 @@ import ( "github.com/gomodule/redigo/redis" "github.com/stretchr/testify/assert" - "github.com/astaxie/beego/pkg/client/cache" + "github.com/astaxie/beego/client/cache" ) func TestRedisCache(t *testing.T) { diff --git a/pkg/client/cache/ssdb/ssdb.go b/client/cache/ssdb/ssdb.go similarity index 99% rename from pkg/client/cache/ssdb/ssdb.go rename to client/cache/ssdb/ssdb.go index 2e4f2815..1acee861 100644 --- a/pkg/client/cache/ssdb/ssdb.go +++ b/client/cache/ssdb/ssdb.go @@ -10,7 +10,7 @@ import ( "github.com/ssdb/gossdb/ssdb" - "github.com/astaxie/beego/pkg/client/cache" + "github.com/astaxie/beego/client/cache" ) // Cache SSDB adapter diff --git a/pkg/client/cache/ssdb/ssdb_test.go b/client/cache/ssdb/ssdb_test.go similarity index 98% rename from pkg/client/cache/ssdb/ssdb_test.go rename to client/cache/ssdb/ssdb_test.go index f675d1ab..cebaa975 100644 --- a/pkg/client/cache/ssdb/ssdb_test.go +++ b/client/cache/ssdb/ssdb_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/astaxie/beego/pkg/client/cache" + "github.com/astaxie/beego/client/cache" ) func TestSsdbcacheCache(t *testing.T) { diff --git a/pkg/client/httplib/README.md b/client/httplib/README.md similarity index 100% rename from pkg/client/httplib/README.md rename to client/httplib/README.md diff --git a/pkg/client/httplib/filter.go b/client/httplib/filter.go similarity index 100% rename from pkg/client/httplib/filter.go rename to client/httplib/filter.go diff --git a/pkg/client/httplib/filter/opentracing/filter.go b/client/httplib/filter/opentracing/filter.go similarity index 98% rename from pkg/client/httplib/filter/opentracing/filter.go rename to client/httplib/filter/opentracing/filter.go index 93376843..765a82a9 100644 --- a/pkg/client/httplib/filter/opentracing/filter.go +++ b/client/httplib/filter/opentracing/filter.go @@ -18,7 +18,7 @@ import ( "context" "net/http" - "github.com/astaxie/beego/pkg/client/httplib" + "github.com/astaxie/beego/client/httplib" logKit "github.com/go-kit/kit/log" opentracingKit "github.com/go-kit/kit/tracing/opentracing" "github.com/opentracing/opentracing-go" diff --git a/pkg/client/httplib/filter/opentracing/filter_test.go b/client/httplib/filter/opentracing/filter_test.go similarity index 96% rename from pkg/client/httplib/filter/opentracing/filter_test.go rename to client/httplib/filter/opentracing/filter_test.go index 46937803..7281f93f 100644 --- a/pkg/client/httplib/filter/opentracing/filter_test.go +++ b/client/httplib/filter/opentracing/filter_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/astaxie/beego/pkg/client/httplib" + "github.com/astaxie/beego/client/httplib" ) func TestFilterChainBuilder_FilterChain(t *testing.T) { diff --git a/pkg/client/httplib/filter/prometheus/filter.go b/client/httplib/filter/prometheus/filter.go similarity index 97% rename from pkg/client/httplib/filter/prometheus/filter.go rename to client/httplib/filter/prometheus/filter.go index b4a418e0..ce88b70e 100644 --- a/pkg/client/httplib/filter/prometheus/filter.go +++ b/client/httplib/filter/prometheus/filter.go @@ -22,7 +22,7 @@ import ( "github.com/prometheus/client_golang/prometheus" - "github.com/astaxie/beego/pkg/client/httplib" + "github.com/astaxie/beego/client/httplib" ) type FilterChainBuilder struct { diff --git a/pkg/client/httplib/filter/prometheus/filter_test.go b/client/httplib/filter/prometheus/filter_test.go similarity index 96% rename from pkg/client/httplib/filter/prometheus/filter_test.go rename to client/httplib/filter/prometheus/filter_test.go index 2964a4a2..46edc3d2 100644 --- a/pkg/client/httplib/filter/prometheus/filter_test.go +++ b/client/httplib/filter/prometheus/filter_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/astaxie/beego/pkg/client/httplib" + "github.com/astaxie/beego/client/httplib" ) func TestFilterChainBuilder_FilterChain(t *testing.T) { diff --git a/pkg/client/httplib/httplib.go b/client/httplib/httplib.go similarity index 100% rename from pkg/client/httplib/httplib.go rename to client/httplib/httplib.go diff --git a/pkg/client/httplib/httplib_test.go b/client/httplib/httplib_test.go similarity index 100% rename from pkg/client/httplib/httplib_test.go rename to client/httplib/httplib_test.go diff --git a/pkg/client/httplib/testing/client.go b/client/httplib/testing/client.go similarity index 97% rename from pkg/client/httplib/testing/client.go rename to client/httplib/testing/client.go index 107b28cc..34e49f2d 100644 --- a/pkg/client/httplib/testing/client.go +++ b/client/httplib/testing/client.go @@ -15,7 +15,7 @@ package testing import ( - "github.com/astaxie/beego/pkg/client/httplib" + "github.com/astaxie/beego/client/httplib" ) var port = "" diff --git a/pkg/client/orm/README.md b/client/orm/README.md similarity index 100% rename from pkg/client/orm/README.md rename to client/orm/README.md diff --git a/pkg/client/orm/cmd.go b/client/orm/cmd.go similarity index 100% rename from pkg/client/orm/cmd.go rename to client/orm/cmd.go diff --git a/pkg/client/orm/cmd_utils.go b/client/orm/cmd_utils.go similarity index 100% rename from pkg/client/orm/cmd_utils.go rename to client/orm/cmd_utils.go diff --git a/pkg/client/orm/db.go b/client/orm/db.go similarity index 99% rename from pkg/client/orm/db.go rename to client/orm/db.go index 2bd1308f..b103d218 100644 --- a/pkg/client/orm/db.go +++ b/client/orm/db.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "github.com/astaxie/beego/pkg/client/orm/hints" + "github.com/astaxie/beego/client/orm/hints" ) const ( diff --git a/pkg/client/orm/db_alias.go b/client/orm/db_alias.go similarity index 100% rename from pkg/client/orm/db_alias.go rename to client/orm/db_alias.go diff --git a/pkg/client/orm/db_alias_test.go b/client/orm/db_alias_test.go similarity index 100% rename from pkg/client/orm/db_alias_test.go rename to client/orm/db_alias_test.go diff --git a/pkg/client/orm/db_mysql.go b/client/orm/db_mysql.go similarity index 100% rename from pkg/client/orm/db_mysql.go rename to client/orm/db_mysql.go diff --git a/pkg/client/orm/db_oracle.go b/client/orm/db_oracle.go similarity index 98% rename from pkg/client/orm/db_oracle.go rename to client/orm/db_oracle.go index 7c1bf1b3..cb0d5052 100644 --- a/pkg/client/orm/db_oracle.go +++ b/client/orm/db_oracle.go @@ -18,7 +18,7 @@ import ( "fmt" "strings" - "github.com/astaxie/beego/pkg/client/orm/hints" + "github.com/astaxie/beego/client/orm/hints" ) // oracle operators. diff --git a/pkg/client/orm/db_postgres.go b/client/orm/db_postgres.go similarity index 100% rename from pkg/client/orm/db_postgres.go rename to client/orm/db_postgres.go diff --git a/pkg/client/orm/db_sqlite.go b/client/orm/db_sqlite.go similarity index 99% rename from pkg/client/orm/db_sqlite.go rename to client/orm/db_sqlite.go index 6d7a5617..961f2535 100644 --- a/pkg/client/orm/db_sqlite.go +++ b/client/orm/db_sqlite.go @@ -21,7 +21,7 @@ import ( "strings" "time" - "github.com/astaxie/beego/pkg/client/orm/hints" + "github.com/astaxie/beego/client/orm/hints" ) // sqlite operators. diff --git a/pkg/client/orm/db_tables.go b/client/orm/db_tables.go similarity index 100% rename from pkg/client/orm/db_tables.go rename to client/orm/db_tables.go diff --git a/pkg/client/orm/db_tidb.go b/client/orm/db_tidb.go similarity index 100% rename from pkg/client/orm/db_tidb.go rename to client/orm/db_tidb.go diff --git a/pkg/client/orm/db_utils.go b/client/orm/db_utils.go similarity index 100% rename from pkg/client/orm/db_utils.go rename to client/orm/db_utils.go diff --git a/pkg/client/orm/do_nothing_orm.go b/client/orm/do_nothing_orm.go similarity index 99% rename from pkg/client/orm/do_nothing_orm.go rename to client/orm/do_nothing_orm.go index 42775b54..fc5b2159 100644 --- a/pkg/client/orm/do_nothing_orm.go +++ b/client/orm/do_nothing_orm.go @@ -18,7 +18,7 @@ import ( "context" "database/sql" - "github.com/astaxie/beego/pkg/core/utils" + "github.com/astaxie/beego/core/utils" ) // DoNothingOrm won't do anything, usually you use this to custom your mock Ormer implementation diff --git a/pkg/client/orm/do_nothing_orm_test.go b/client/orm/do_nothing_orm_test.go similarity index 100% rename from pkg/client/orm/do_nothing_orm_test.go rename to client/orm/do_nothing_orm_test.go diff --git a/pkg/client/orm/filter.go b/client/orm/filter.go similarity index 100% rename from pkg/client/orm/filter.go rename to client/orm/filter.go diff --git a/pkg/client/orm/filter/bean/default_value_filter.go b/client/orm/filter/bean/default_value_filter.go similarity index 97% rename from pkg/client/orm/filter/bean/default_value_filter.go rename to client/orm/filter/bean/default_value_filter.go index 7da9408d..3dac5c74 100644 --- a/pkg/client/orm/filter/bean/default_value_filter.go +++ b/client/orm/filter/bean/default_value_filter.go @@ -19,10 +19,10 @@ import ( "reflect" "strings" - "github.com/astaxie/beego/pkg/core/logs" + "github.com/astaxie/beego/core/logs" - "github.com/astaxie/beego/pkg/client/orm" - "github.com/astaxie/beego/pkg/core/bean" + "github.com/astaxie/beego/client/orm" + "github.com/astaxie/beego/core/bean" ) // DefaultValueFilterChainBuilder only works for InsertXXX method, diff --git a/pkg/client/orm/filter/bean/default_value_filter_test.go b/client/orm/filter/bean/default_value_filter_test.go similarity index 97% rename from pkg/client/orm/filter/bean/default_value_filter_test.go rename to client/orm/filter/bean/default_value_filter_test.go index fde7abf8..2a6ed1f4 100644 --- a/pkg/client/orm/filter/bean/default_value_filter_test.go +++ b/client/orm/filter/bean/default_value_filter_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/astaxie/beego/pkg/client/orm" + "github.com/astaxie/beego/client/orm" ) func TestDefaultValueFilterChainBuilder_FilterChain(t *testing.T) { diff --git a/pkg/client/orm/filter/opentracing/filter.go b/client/orm/filter/opentracing/filter.go similarity index 98% rename from pkg/client/orm/filter/opentracing/filter.go rename to client/orm/filter/opentracing/filter.go index 1a2ee541..7f9658b4 100644 --- a/pkg/client/orm/filter/opentracing/filter.go +++ b/client/orm/filter/opentracing/filter.go @@ -20,7 +20,7 @@ import ( "github.com/opentracing/opentracing-go" - "github.com/astaxie/beego/pkg/client/orm" + "github.com/astaxie/beego/client/orm" ) // FilterChainBuilder provides an extension point diff --git a/pkg/client/orm/filter/opentracing/filter_test.go b/client/orm/filter/opentracing/filter_test.go similarity index 96% rename from pkg/client/orm/filter/opentracing/filter_test.go rename to client/orm/filter/opentracing/filter_test.go index 9e89e5da..428dacda 100644 --- a/pkg/client/orm/filter/opentracing/filter_test.go +++ b/client/orm/filter/opentracing/filter_test.go @@ -21,7 +21,7 @@ import ( "github.com/opentracing/opentracing-go" - "github.com/astaxie/beego/pkg/client/orm" + "github.com/astaxie/beego/client/orm" ) func TestFilterChainBuilder_FilterChain(t *testing.T) { diff --git a/pkg/client/orm/filter/prometheus/filter.go b/client/orm/filter/prometheus/filter.go similarity index 98% rename from pkg/client/orm/filter/prometheus/filter.go rename to client/orm/filter/prometheus/filter.go index 2d819ef7..e74e946a 100644 --- a/pkg/client/orm/filter/prometheus/filter.go +++ b/client/orm/filter/prometheus/filter.go @@ -22,7 +22,7 @@ import ( "github.com/prometheus/client_golang/prometheus" - "github.com/astaxie/beego/pkg/client/orm" + "github.com/astaxie/beego/client/orm" ) // FilterChainBuilder is an extension point, diff --git a/pkg/client/orm/filter/prometheus/filter_test.go b/client/orm/filter/prometheus/filter_test.go similarity index 97% rename from pkg/client/orm/filter/prometheus/filter_test.go rename to client/orm/filter/prometheus/filter_test.go index 0368d321..72b16038 100644 --- a/pkg/client/orm/filter/prometheus/filter_test.go +++ b/client/orm/filter/prometheus/filter_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/astaxie/beego/pkg/client/orm" + "github.com/astaxie/beego/client/orm" ) func TestFilterChainBuilder_FilterChain1(t *testing.T) { diff --git a/pkg/client/orm/filter_orm_decorator.go b/client/orm/filter_orm_decorator.go similarity index 99% rename from pkg/client/orm/filter_orm_decorator.go rename to client/orm/filter_orm_decorator.go index 729c1698..9f837cba 100644 --- a/pkg/client/orm/filter_orm_decorator.go +++ b/client/orm/filter_orm_decorator.go @@ -20,7 +20,7 @@ import ( "reflect" "time" - "github.com/astaxie/beego/pkg/core/utils" + "github.com/astaxie/beego/core/utils" ) const ( diff --git a/pkg/client/orm/filter_orm_decorator_test.go b/client/orm/filter_orm_decorator_test.go similarity index 99% rename from pkg/client/orm/filter_orm_decorator_test.go rename to client/orm/filter_orm_decorator_test.go index 40a3fa2e..671ca001 100644 --- a/pkg/client/orm/filter_orm_decorator_test.go +++ b/client/orm/filter_orm_decorator_test.go @@ -21,7 +21,7 @@ import ( "sync" "testing" - "github.com/astaxie/beego/pkg/core/utils" + "github.com/astaxie/beego/core/utils" "github.com/stretchr/testify/assert" ) diff --git a/pkg/client/orm/filter_test.go b/client/orm/filter_test.go similarity index 100% rename from pkg/client/orm/filter_test.go rename to client/orm/filter_test.go diff --git a/pkg/client/orm/hints/db_hints.go b/client/orm/hints/db_hints.go similarity index 98% rename from pkg/client/orm/hints/db_hints.go rename to client/orm/hints/db_hints.go index c6180529..7bfe8eb0 100644 --- a/pkg/client/orm/hints/db_hints.go +++ b/client/orm/hints/db_hints.go @@ -15,7 +15,7 @@ package hints import ( - "github.com/astaxie/beego/pkg/core/utils" + "github.com/astaxie/beego/core/utils" ) const ( diff --git a/pkg/client/orm/hints/db_hints_test.go b/client/orm/hints/db_hints_test.go similarity index 100% rename from pkg/client/orm/hints/db_hints_test.go rename to client/orm/hints/db_hints_test.go diff --git a/pkg/client/orm/invocation.go b/client/orm/invocation.go similarity index 100% rename from pkg/client/orm/invocation.go rename to client/orm/invocation.go diff --git a/pkg/client/orm/migration/ddl.go b/client/orm/migration/ddl.go similarity index 99% rename from pkg/client/orm/migration/ddl.go rename to client/orm/migration/ddl.go index e351b4cc..a396d39a 100644 --- a/pkg/client/orm/migration/ddl.go +++ b/client/orm/migration/ddl.go @@ -17,7 +17,7 @@ package migration import ( "fmt" - "github.com/astaxie/beego/pkg/core/logs" + "github.com/astaxie/beego/core/logs" ) // Index struct defines the structure of Index Columns diff --git a/pkg/client/orm/migration/doc.go b/client/orm/migration/doc.go similarity index 100% rename from pkg/client/orm/migration/doc.go rename to client/orm/migration/doc.go diff --git a/pkg/client/orm/migration/migration.go b/client/orm/migration/migration.go similarity index 98% rename from pkg/client/orm/migration/migration.go rename to client/orm/migration/migration.go index 4a56be58..aeea12c6 100644 --- a/pkg/client/orm/migration/migration.go +++ b/client/orm/migration/migration.go @@ -33,8 +33,8 @@ import ( "strings" "time" - "github.com/astaxie/beego/pkg/client/orm" - "github.com/astaxie/beego/pkg/core/logs" + "github.com/astaxie/beego/client/orm" + "github.com/astaxie/beego/core/logs" ) // const the data format for the bee generate migration datatype diff --git a/pkg/client/orm/model_utils_test.go b/client/orm/model_utils_test.go similarity index 100% rename from pkg/client/orm/model_utils_test.go rename to client/orm/model_utils_test.go diff --git a/pkg/client/orm/models.go b/client/orm/models.go similarity index 100% rename from pkg/client/orm/models.go rename to client/orm/models.go diff --git a/pkg/client/orm/models_boot.go b/client/orm/models_boot.go similarity index 100% rename from pkg/client/orm/models_boot.go rename to client/orm/models_boot.go diff --git a/pkg/client/orm/models_fields.go b/client/orm/models_fields.go similarity index 100% rename from pkg/client/orm/models_fields.go rename to client/orm/models_fields.go diff --git a/pkg/client/orm/models_info_f.go b/client/orm/models_info_f.go similarity index 100% rename from pkg/client/orm/models_info_f.go rename to client/orm/models_info_f.go diff --git a/pkg/client/orm/models_info_m.go b/client/orm/models_info_m.go similarity index 100% rename from pkg/client/orm/models_info_m.go rename to client/orm/models_info_m.go diff --git a/pkg/client/orm/models_test.go b/client/orm/models_test.go similarity index 97% rename from pkg/client/orm/models_test.go rename to client/orm/models_test.go index f0044f6d..d5aa2fa0 100644 --- a/pkg/client/orm/models_test.go +++ b/client/orm/models_test.go @@ -318,7 +318,7 @@ type Post struct { Created time.Time `orm:"auto_now_add"` Updated time.Time `orm:"auto_now"` UpdatedPrecision time.Time `orm:"auto_now;type(datetime);precision(4)"` - Tags []*Tag `orm:"rel(m2m);rel_through(github.com/astaxie/beego/pkg/client/orm.PostTags)"` + Tags []*Tag `orm:"rel(m2m);rel_through(github.com/astaxie/beego/client/orm.PostTags)"` } func (u *Post) TableIndex() [][]string { @@ -376,7 +376,7 @@ type Group struct { type Permission struct { ID int `orm:"column(id)"` Name string - Groups []*Group `orm:"rel(m2m);rel_through(github.com/astaxie/beego/pkg/client/orm.GroupPermissions)"` + Groups []*Group `orm:"rel(m2m);rel_through(github.com/astaxie/beego/client/orm.GroupPermissions)"` } type GroupPermissions struct { @@ -485,7 +485,7 @@ var ( usage: - go get -u github.com/astaxie/beego/pkg/client/orm + go get -u github.com/astaxie/beego/client/orm go get -u github.com/go-sql-driver/mysql go get -u github.com/mattn/go-sqlite3 go get -u github.com/lib/pq @@ -495,20 +495,20 @@ var ( mysql -u root -e 'create database orm_test;' export ORM_DRIVER=mysql export ORM_SOURCE="root:@/orm_test?charset=utf8" - go test -v github.com/astaxie/beego/pkg/client/orm + go test -v github.com/astaxie/beego/client/orm #### Sqlite3 export ORM_DRIVER=sqlite3 export ORM_SOURCE='file:memory_test?mode=memory' - go test -v github.com/astaxie/beego/pkg/client/orm + go test -v github.com/astaxie/beego/client/orm #### PostgreSQL psql -c 'create database orm_test;' -U postgres export ORM_DRIVER=postgres export ORM_SOURCE="user=postgres dbname=orm_test sslmode=disable" - go test -v github.com/astaxie/beego/pkg/client/orm + go test -v github.com/astaxie/beego/client/orm #### TiDB export ORM_DRIVER=tidb diff --git a/pkg/client/orm/models_utils.go b/client/orm/models_utils.go similarity index 100% rename from pkg/client/orm/models_utils.go rename to client/orm/models_utils.go diff --git a/pkg/client/orm/models_utils_test.go b/client/orm/models_utils_test.go similarity index 100% rename from pkg/client/orm/models_utils_test.go rename to client/orm/models_utils_test.go diff --git a/pkg/client/orm/orm.go b/client/orm/orm.go similarity index 98% rename from pkg/client/orm/orm.go rename to client/orm/orm.go index 7d1aace0..a83faeb2 100644 --- a/pkg/client/orm/orm.go +++ b/client/orm/orm.go @@ -21,7 +21,7 @@ // // import ( // "fmt" -// "github.com/astaxie/beego/pkg/client/orm" +// "github.com/astaxie/beego/client/orm" // _ "github.com/go-sql-driver/mysql" // import your used driver // ) // @@ -62,10 +62,10 @@ import ( "reflect" "time" - "github.com/astaxie/beego/pkg/client/orm/hints" - "github.com/astaxie/beego/pkg/core/utils" + "github.com/astaxie/beego/client/orm/hints" + "github.com/astaxie/beego/core/utils" - "github.com/astaxie/beego/pkg/core/logs" + "github.com/astaxie/beego/core/logs" ) // DebugQueries define the debug diff --git a/pkg/client/orm/orm_conds.go b/client/orm/orm_conds.go similarity index 100% rename from pkg/client/orm/orm_conds.go rename to client/orm/orm_conds.go diff --git a/pkg/client/orm/orm_log.go b/client/orm/orm_log.go similarity index 100% rename from pkg/client/orm/orm_log.go rename to client/orm/orm_log.go diff --git a/pkg/client/orm/orm_object.go b/client/orm/orm_object.go similarity index 100% rename from pkg/client/orm/orm_object.go rename to client/orm/orm_object.go diff --git a/pkg/client/orm/orm_querym2m.go b/client/orm/orm_querym2m.go similarity index 100% rename from pkg/client/orm/orm_querym2m.go rename to client/orm/orm_querym2m.go diff --git a/pkg/client/orm/orm_queryset.go b/client/orm/orm_queryset.go similarity index 99% rename from pkg/client/orm/orm_queryset.go rename to client/orm/orm_queryset.go index 906505de..ed223e24 100644 --- a/pkg/client/orm/orm_queryset.go +++ b/client/orm/orm_queryset.go @@ -18,7 +18,7 @@ import ( "context" "fmt" - "github.com/astaxie/beego/pkg/client/orm/hints" + "github.com/astaxie/beego/client/orm/hints" ) type colValue struct { diff --git a/pkg/client/orm/orm_raw.go b/client/orm/orm_raw.go similarity index 100% rename from pkg/client/orm/orm_raw.go rename to client/orm/orm_raw.go diff --git a/pkg/client/orm/orm_test.go b/client/orm/orm_test.go similarity index 99% rename from pkg/client/orm/orm_test.go rename to client/orm/orm_test.go index bd92f46f..565f6c60 100644 --- a/pkg/client/orm/orm_test.go +++ b/client/orm/orm_test.go @@ -31,7 +31,7 @@ import ( "testing" "time" - "github.com/astaxie/beego/pkg/client/orm/hints" + "github.com/astaxie/beego/client/orm/hints" "github.com/stretchr/testify/assert" ) diff --git a/pkg/client/orm/qb.go b/client/orm/qb.go similarity index 100% rename from pkg/client/orm/qb.go rename to client/orm/qb.go diff --git a/pkg/client/orm/qb_mysql.go b/client/orm/qb_mysql.go similarity index 100% rename from pkg/client/orm/qb_mysql.go rename to client/orm/qb_mysql.go diff --git a/pkg/client/orm/qb_postgres.go b/client/orm/qb_postgres.go similarity index 100% rename from pkg/client/orm/qb_postgres.go rename to client/orm/qb_postgres.go diff --git a/pkg/client/orm/qb_tidb.go b/client/orm/qb_tidb.go similarity index 100% rename from pkg/client/orm/qb_tidb.go rename to client/orm/qb_tidb.go diff --git a/pkg/client/orm/types.go b/client/orm/types.go similarity index 99% rename from pkg/client/orm/types.go rename to client/orm/types.go index e43bfd2c..34c61d51 100644 --- a/pkg/client/orm/types.go +++ b/client/orm/types.go @@ -20,7 +20,7 @@ import ( "reflect" "time" - "github.com/astaxie/beego/pkg/core/utils" + "github.com/astaxie/beego/core/utils" ) // TableNaming is usually used by model diff --git a/pkg/client/orm/utils.go b/client/orm/utils.go similarity index 100% rename from pkg/client/orm/utils.go rename to client/orm/utils.go diff --git a/pkg/client/orm/utils_test.go b/client/orm/utils_test.go similarity index 100% rename from pkg/client/orm/utils_test.go rename to client/orm/utils_test.go diff --git a/pkg/core/bean/context.go b/core/bean/context.go similarity index 100% rename from pkg/core/bean/context.go rename to core/bean/context.go diff --git a/pkg/core/bean/doc.go b/core/bean/doc.go similarity index 100% rename from pkg/core/bean/doc.go rename to core/bean/doc.go diff --git a/pkg/core/bean/factory.go b/core/bean/factory.go similarity index 100% rename from pkg/core/bean/factory.go rename to core/bean/factory.go diff --git a/pkg/core/bean/metadata.go b/core/bean/metadata.go similarity index 100% rename from pkg/core/bean/metadata.go rename to core/bean/metadata.go diff --git a/pkg/core/bean/tag_auto_wire_bean_factory.go b/core/bean/tag_auto_wire_bean_factory.go similarity index 99% rename from pkg/core/bean/tag_auto_wire_bean_factory.go rename to core/bean/tag_auto_wire_bean_factory.go index 595b3a02..b88a42ff 100644 --- a/pkg/core/bean/tag_auto_wire_bean_factory.go +++ b/core/bean/tag_auto_wire_bean_factory.go @@ -22,7 +22,7 @@ import ( "github.com/pkg/errors" - "github.com/astaxie/beego/pkg/core/logs" + "github.com/astaxie/beego/core/logs" ) const DefaultValueTagKey = "default" diff --git a/pkg/core/bean/tag_auto_wire_bean_factory_test.go b/core/bean/tag_auto_wire_bean_factory_test.go similarity index 100% rename from pkg/core/bean/tag_auto_wire_bean_factory_test.go rename to core/bean/tag_auto_wire_bean_factory_test.go diff --git a/pkg/core/bean/time_type_adapter.go b/core/bean/time_type_adapter.go similarity index 100% rename from pkg/core/bean/time_type_adapter.go rename to core/bean/time_type_adapter.go diff --git a/pkg/core/bean/time_type_adapter_test.go b/core/bean/time_type_adapter_test.go similarity index 100% rename from pkg/core/bean/time_type_adapter_test.go rename to core/bean/time_type_adapter_test.go diff --git a/pkg/core/bean/type_adapter.go b/core/bean/type_adapter.go similarity index 100% rename from pkg/core/bean/type_adapter.go rename to core/bean/type_adapter.go diff --git a/pkg/core/config/base_config_test.go b/core/config/base_config_test.go similarity index 100% rename from pkg/core/config/base_config_test.go rename to core/config/base_config_test.go diff --git a/pkg/core/config/config.go b/core/config/config.go similarity index 100% rename from pkg/core/config/config.go rename to core/config/config.go diff --git a/pkg/core/config/config_test.go b/core/config/config_test.go similarity index 100% rename from pkg/core/config/config_test.go rename to core/config/config_test.go diff --git a/pkg/core/config/env/env.go b/core/config/env/env.go similarity index 98% rename from pkg/core/config/env/env.go rename to core/config/env/env.go index 0cf1582b..d3903d74 100644 --- a/pkg/core/config/env/env.go +++ b/core/config/env/env.go @@ -21,7 +21,7 @@ import ( "os" "strings" - "github.com/astaxie/beego/pkg/core/utils" + "github.com/astaxie/beego/core/utils" ) var env *utils.BeeMap diff --git a/pkg/core/config/env/env_test.go b/core/config/env/env_test.go similarity index 100% rename from pkg/core/config/env/env_test.go rename to core/config/env/env_test.go diff --git a/pkg/core/config/etcd/config.go b/core/config/etcd/config.go similarity index 98% rename from pkg/core/config/etcd/config.go rename to core/config/etcd/config.go index 278cbaa9..37dba9de 100644 --- a/pkg/core/config/etcd/config.go +++ b/core/config/etcd/config.go @@ -26,8 +26,8 @@ import ( "github.com/pkg/errors" "google.golang.org/grpc" - "github.com/astaxie/beego/pkg/core/config" - "github.com/astaxie/beego/pkg/core/logs" + "github.com/astaxie/beego/core/config" + "github.com/astaxie/beego/core/logs" ) const etcdOpts = "etcdOpts" diff --git a/pkg/core/config/etcd/config_test.go b/core/config/etcd/config_test.go similarity index 100% rename from pkg/core/config/etcd/config_test.go rename to core/config/etcd/config_test.go diff --git a/pkg/core/config/fake.go b/core/config/fake.go similarity index 100% rename from pkg/core/config/fake.go rename to core/config/fake.go diff --git a/pkg/core/config/ini.go b/core/config/ini.go similarity index 100% rename from pkg/core/config/ini.go rename to core/config/ini.go diff --git a/pkg/core/config/ini_test.go b/core/config/ini_test.go similarity index 100% rename from pkg/core/config/ini_test.go rename to core/config/ini_test.go diff --git a/pkg/core/config/json/json.go b/core/config/json/json.go similarity index 98% rename from pkg/core/config/json/json.go rename to core/config/json/json.go index 66546d89..f58e70f5 100644 --- a/pkg/core/config/json/json.go +++ b/core/config/json/json.go @@ -27,8 +27,8 @@ import ( "github.com/mitchellh/mapstructure" - "github.com/astaxie/beego/pkg/core/config" - "github.com/astaxie/beego/pkg/core/logs" + "github.com/astaxie/beego/core/config" + "github.com/astaxie/beego/core/logs" ) // JSONConfig is a json config parser and implements Config interface. diff --git a/pkg/core/config/json/json_test.go b/core/config/json/json_test.go similarity index 99% rename from pkg/core/config/json/json_test.go rename to core/config/json/json_test.go index d4601e39..b615c19a 100644 --- a/pkg/core/config/json/json_test.go +++ b/core/config/json/json_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/astaxie/beego/pkg/core/config" + "github.com/astaxie/beego/core/config" ) func TestJsonStartsWithArray(t *testing.T) { diff --git a/pkg/core/config/xml/xml.go b/core/config/xml/xml.go similarity index 98% rename from pkg/core/config/xml/xml.go rename to core/config/xml/xml.go index 47d4b8c8..3b1a7051 100644 --- a/pkg/core/config/xml/xml.go +++ b/core/config/xml/xml.go @@ -42,8 +42,8 @@ import ( "github.com/mitchellh/mapstructure" - "github.com/astaxie/beego/pkg/core/config" - "github.com/astaxie/beego/pkg/core/logs" + "github.com/astaxie/beego/core/config" + "github.com/astaxie/beego/core/logs" "github.com/beego/x2j" ) diff --git a/pkg/core/config/xml/xml_test.go b/core/config/xml/xml_test.go similarity index 98% rename from pkg/core/config/xml/xml_test.go rename to core/config/xml/xml_test.go index b110f813..0266e270 100644 --- a/pkg/core/config/xml/xml_test.go +++ b/core/config/xml/xml_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/astaxie/beego/pkg/core/config" + "github.com/astaxie/beego/core/config" ) func TestXML(t *testing.T) { diff --git a/pkg/core/config/yaml/yaml.go b/core/config/yaml/yaml.go similarity index 99% rename from pkg/core/config/yaml/yaml.go rename to core/config/yaml/yaml.go index 5a4bfad0..6d9abb4e 100644 --- a/pkg/core/config/yaml/yaml.go +++ b/core/config/yaml/yaml.go @@ -41,11 +41,10 @@ import ( "strings" "sync" + "github.com/astaxie/beego/core/config" + "github.com/astaxie/beego/core/logs" "github.com/beego/goyaml2" "gopkg.in/yaml.v2" - - "github.com/astaxie/beego/pkg/core/config" - "github.com/astaxie/beego/pkg/core/logs" ) // Config is a yaml config parser and implements Config interface. diff --git a/pkg/core/config/yaml/yaml_test.go b/core/config/yaml/yaml_test.go similarity index 98% rename from pkg/core/config/yaml/yaml_test.go rename to core/config/yaml/yaml_test.go index 130ce6a2..a7c3a92e 100644 --- a/pkg/core/config/yaml/yaml_test.go +++ b/core/config/yaml/yaml_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/astaxie/beego/pkg/core/config" + "github.com/astaxie/beego/core/config" ) func TestYaml(t *testing.T) { diff --git a/pkg/core/governor/command.go b/core/governor/command.go similarity index 100% rename from pkg/core/governor/command.go rename to core/governor/command.go diff --git a/pkg/core/governor/healthcheck.go b/core/governor/healthcheck.go similarity index 100% rename from pkg/core/governor/healthcheck.go rename to core/governor/healthcheck.go diff --git a/pkg/core/governor/profile.go b/core/governor/profile.go similarity index 99% rename from pkg/core/governor/profile.go rename to core/governor/profile.go index de6e1995..17f1f375 100644 --- a/pkg/core/governor/profile.go +++ b/core/governor/profile.go @@ -26,7 +26,7 @@ import ( "strconv" "time" - "github.com/astaxie/beego/pkg/core/utils" + "github.com/astaxie/beego/core/utils" ) var startTime = time.Now() diff --git a/pkg/core/governor/profile_test.go b/core/governor/profile_test.go similarity index 100% rename from pkg/core/governor/profile_test.go rename to core/governor/profile_test.go diff --git a/pkg/core/logs/README.md b/core/logs/README.md similarity index 100% rename from pkg/core/logs/README.md rename to core/logs/README.md diff --git a/pkg/core/logs/access_log.go b/core/logs/access_log.go similarity index 100% rename from pkg/core/logs/access_log.go rename to core/logs/access_log.go diff --git a/pkg/core/logs/access_log_test.go b/core/logs/access_log_test.go similarity index 100% rename from pkg/core/logs/access_log_test.go rename to core/logs/access_log_test.go diff --git a/pkg/core/logs/alils/alils.go b/core/logs/alils/alils.go similarity index 98% rename from pkg/core/logs/alils/alils.go rename to core/logs/alils/alils.go index 812b1b3b..484d31e4 100644 --- a/pkg/core/logs/alils/alils.go +++ b/core/logs/alils/alils.go @@ -9,7 +9,7 @@ import ( "github.com/gogo/protobuf/proto" "github.com/pkg/errors" - "github.com/astaxie/beego/pkg/core/logs" + "github.com/astaxie/beego/core/logs" ) const ( diff --git a/pkg/core/logs/alils/config.go b/core/logs/alils/config.go similarity index 100% rename from pkg/core/logs/alils/config.go rename to core/logs/alils/config.go diff --git a/pkg/core/logs/alils/log.pb.go b/core/logs/alils/log.pb.go similarity index 100% rename from pkg/core/logs/alils/log.pb.go rename to core/logs/alils/log.pb.go diff --git a/pkg/core/logs/alils/log_config.go b/core/logs/alils/log_config.go similarity index 100% rename from pkg/core/logs/alils/log_config.go rename to core/logs/alils/log_config.go diff --git a/pkg/core/logs/alils/log_project.go b/core/logs/alils/log_project.go similarity index 100% rename from pkg/core/logs/alils/log_project.go rename to core/logs/alils/log_project.go diff --git a/pkg/core/logs/alils/log_store.go b/core/logs/alils/log_store.go similarity index 100% rename from pkg/core/logs/alils/log_store.go rename to core/logs/alils/log_store.go diff --git a/pkg/core/logs/alils/machine_group.go b/core/logs/alils/machine_group.go similarity index 100% rename from pkg/core/logs/alils/machine_group.go rename to core/logs/alils/machine_group.go diff --git a/pkg/core/logs/alils/request.go b/core/logs/alils/request.go similarity index 100% rename from pkg/core/logs/alils/request.go rename to core/logs/alils/request.go diff --git a/pkg/core/logs/alils/signature.go b/core/logs/alils/signature.go similarity index 100% rename from pkg/core/logs/alils/signature.go rename to core/logs/alils/signature.go diff --git a/pkg/core/logs/conn.go b/core/logs/conn.go similarity index 100% rename from pkg/core/logs/conn.go rename to core/logs/conn.go diff --git a/pkg/core/logs/conn_test.go b/core/logs/conn_test.go similarity index 100% rename from pkg/core/logs/conn_test.go rename to core/logs/conn_test.go diff --git a/pkg/core/logs/console.go b/core/logs/console.go similarity index 100% rename from pkg/core/logs/console.go rename to core/logs/console.go diff --git a/pkg/core/logs/console_test.go b/core/logs/console_test.go similarity index 100% rename from pkg/core/logs/console_test.go rename to core/logs/console_test.go diff --git a/pkg/core/logs/es/es.go b/core/logs/es/es.go similarity index 98% rename from pkg/core/logs/es/es.go rename to core/logs/es/es.go index a150c7b3..6175f253 100644 --- a/pkg/core/logs/es/es.go +++ b/core/logs/es/es.go @@ -12,7 +12,7 @@ import ( "github.com/elastic/go-elasticsearch/v6" "github.com/elastic/go-elasticsearch/v6/esapi" - "github.com/astaxie/beego/pkg/core/logs" + "github.com/astaxie/beego/core/logs" ) // NewES returns a LoggerInterface diff --git a/pkg/core/logs/es/index.go b/core/logs/es/index.go similarity index 96% rename from pkg/core/logs/es/index.go rename to core/logs/es/index.go index 5b2d3d59..0dafef4c 100644 --- a/pkg/core/logs/es/index.go +++ b/core/logs/es/index.go @@ -17,7 +17,7 @@ package es import ( "fmt" - "github.com/astaxie/beego/pkg/core/logs" + "github.com/astaxie/beego/core/logs" ) // IndexNaming generate the index name diff --git a/pkg/core/logs/es/index_test.go b/core/logs/es/index_test.go similarity index 95% rename from pkg/core/logs/es/index_test.go rename to core/logs/es/index_test.go index 25cfa5ed..03e7a911 100644 --- a/pkg/core/logs/es/index_test.go +++ b/core/logs/es/index_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/astaxie/beego/pkg/core/logs" + "github.com/astaxie/beego/core/logs" ) func TestDefaultIndexNaming_IndexName(t *testing.T) { diff --git a/pkg/core/logs/file.go b/core/logs/file.go similarity index 100% rename from pkg/core/logs/file.go rename to core/logs/file.go diff --git a/pkg/core/logs/file_test.go b/core/logs/file_test.go similarity index 100% rename from pkg/core/logs/file_test.go rename to core/logs/file_test.go diff --git a/pkg/core/logs/formatter.go b/core/logs/formatter.go similarity index 100% rename from pkg/core/logs/formatter.go rename to core/logs/formatter.go diff --git a/pkg/core/logs/formatter_test.go b/core/logs/formatter_test.go similarity index 100% rename from pkg/core/logs/formatter_test.go rename to core/logs/formatter_test.go diff --git a/pkg/core/logs/jianliao.go b/core/logs/jianliao.go similarity index 100% rename from pkg/core/logs/jianliao.go rename to core/logs/jianliao.go diff --git a/pkg/core/logs/jianliao_test.go b/core/logs/jianliao_test.go similarity index 100% rename from pkg/core/logs/jianliao_test.go rename to core/logs/jianliao_test.go diff --git a/pkg/core/logs/log.go b/core/logs/log.go similarity index 100% rename from pkg/core/logs/log.go rename to core/logs/log.go diff --git a/pkg/core/logs/log_msg.go b/core/logs/log_msg.go similarity index 100% rename from pkg/core/logs/log_msg.go rename to core/logs/log_msg.go diff --git a/pkg/core/logs/log_msg_test.go b/core/logs/log_msg_test.go similarity index 100% rename from pkg/core/logs/log_msg_test.go rename to core/logs/log_msg_test.go diff --git a/pkg/core/logs/log_test.go b/core/logs/log_test.go similarity index 100% rename from pkg/core/logs/log_test.go rename to core/logs/log_test.go diff --git a/pkg/core/logs/logger.go b/core/logs/logger.go similarity index 100% rename from pkg/core/logs/logger.go rename to core/logs/logger.go diff --git a/pkg/core/logs/logger_test.go b/core/logs/logger_test.go similarity index 100% rename from pkg/core/logs/logger_test.go rename to core/logs/logger_test.go diff --git a/pkg/core/logs/multifile.go b/core/logs/multifile.go similarity index 100% rename from pkg/core/logs/multifile.go rename to core/logs/multifile.go diff --git a/pkg/core/logs/multifile_test.go b/core/logs/multifile_test.go similarity index 100% rename from pkg/core/logs/multifile_test.go rename to core/logs/multifile_test.go diff --git a/pkg/core/logs/slack.go b/core/logs/slack.go similarity index 100% rename from pkg/core/logs/slack.go rename to core/logs/slack.go diff --git a/pkg/core/logs/smtp.go b/core/logs/smtp.go similarity index 100% rename from pkg/core/logs/smtp.go rename to core/logs/smtp.go diff --git a/pkg/core/logs/smtp_test.go b/core/logs/smtp_test.go similarity index 100% rename from pkg/core/logs/smtp_test.go rename to core/logs/smtp_test.go diff --git a/pkg/core/utils/caller.go b/core/utils/caller.go similarity index 100% rename from pkg/core/utils/caller.go rename to core/utils/caller.go diff --git a/pkg/core/utils/caller_test.go b/core/utils/caller_test.go similarity index 100% rename from pkg/core/utils/caller_test.go rename to core/utils/caller_test.go diff --git a/pkg/core/utils/debug.go b/core/utils/debug.go similarity index 100% rename from pkg/core/utils/debug.go rename to core/utils/debug.go diff --git a/pkg/core/utils/debug_test.go b/core/utils/debug_test.go similarity index 100% rename from pkg/core/utils/debug_test.go rename to core/utils/debug_test.go diff --git a/pkg/core/utils/file.go b/core/utils/file.go similarity index 100% rename from pkg/core/utils/file.go rename to core/utils/file.go diff --git a/pkg/core/utils/file_test.go b/core/utils/file_test.go similarity index 100% rename from pkg/core/utils/file_test.go rename to core/utils/file_test.go diff --git a/pkg/core/utils/kv.go b/core/utils/kv.go similarity index 100% rename from pkg/core/utils/kv.go rename to core/utils/kv.go diff --git a/pkg/core/utils/kv_test.go b/core/utils/kv_test.go similarity index 100% rename from pkg/core/utils/kv_test.go rename to core/utils/kv_test.go diff --git a/pkg/core/utils/mail.go b/core/utils/mail.go similarity index 100% rename from pkg/core/utils/mail.go rename to core/utils/mail.go diff --git a/pkg/core/utils/mail_test.go b/core/utils/mail_test.go similarity index 100% rename from pkg/core/utils/mail_test.go rename to core/utils/mail_test.go diff --git a/pkg/core/utils/pagination/doc.go b/core/utils/pagination/doc.go similarity index 96% rename from pkg/core/utils/pagination/doc.go rename to core/utils/pagination/doc.go index fb044ff9..b9c604b9 100644 --- a/pkg/core/utils/pagination/doc.go +++ b/core/utils/pagination/doc.go @@ -8,7 +8,7 @@ In your beego.Controller: package controllers - import "github.com/astaxie/beego/pkg/core/utils/pagination" + import "github.com/astaxie/beego/core/utils/pagination" type PostsController struct { beego.Controller diff --git a/pkg/core/utils/pagination/paginator.go b/core/utils/pagination/paginator.go similarity index 100% rename from pkg/core/utils/pagination/paginator.go rename to core/utils/pagination/paginator.go diff --git a/pkg/core/utils/pagination/utils.go b/core/utils/pagination/utils.go similarity index 100% rename from pkg/core/utils/pagination/utils.go rename to core/utils/pagination/utils.go diff --git a/pkg/core/utils/rand.go b/core/utils/rand.go similarity index 100% rename from pkg/core/utils/rand.go rename to core/utils/rand.go diff --git a/pkg/core/utils/rand_test.go b/core/utils/rand_test.go similarity index 100% rename from pkg/core/utils/rand_test.go rename to core/utils/rand_test.go diff --git a/pkg/core/utils/safemap.go b/core/utils/safemap.go similarity index 100% rename from pkg/core/utils/safemap.go rename to core/utils/safemap.go diff --git a/pkg/core/utils/safemap_test.go b/core/utils/safemap_test.go similarity index 100% rename from pkg/core/utils/safemap_test.go rename to core/utils/safemap_test.go diff --git a/pkg/core/utils/slice.go b/core/utils/slice.go similarity index 100% rename from pkg/core/utils/slice.go rename to core/utils/slice.go diff --git a/pkg/core/utils/slice_test.go b/core/utils/slice_test.go similarity index 100% rename from pkg/core/utils/slice_test.go rename to core/utils/slice_test.go diff --git a/pkg/core/utils/testdata/grepe.test b/core/utils/testdata/grepe.test similarity index 100% rename from pkg/core/utils/testdata/grepe.test rename to core/utils/testdata/grepe.test diff --git a/pkg/core/utils/time.go b/core/utils/time.go similarity index 100% rename from pkg/core/utils/time.go rename to core/utils/time.go diff --git a/pkg/core/utils/utils.go b/core/utils/utils.go similarity index 100% rename from pkg/core/utils/utils.go rename to core/utils/utils.go diff --git a/pkg/core/utils/utils_test.go b/core/utils/utils_test.go similarity index 100% rename from pkg/core/utils/utils_test.go rename to core/utils/utils_test.go diff --git a/pkg/core/validation/README.md b/core/validation/README.md similarity index 100% rename from pkg/core/validation/README.md rename to core/validation/README.md diff --git a/pkg/core/validation/util.go b/core/validation/util.go similarity index 100% rename from pkg/core/validation/util.go rename to core/validation/util.go diff --git a/pkg/core/validation/util_test.go b/core/validation/util_test.go similarity index 100% rename from pkg/core/validation/util_test.go rename to core/validation/util_test.go diff --git a/pkg/core/validation/validation.go b/core/validation/validation.go similarity index 100% rename from pkg/core/validation/validation.go rename to core/validation/validation.go diff --git a/pkg/core/validation/validation_test.go b/core/validation/validation_test.go similarity index 100% rename from pkg/core/validation/validation_test.go rename to core/validation/validation_test.go diff --git a/pkg/core/validation/validators.go b/core/validation/validators.go similarity index 99% rename from pkg/core/validation/validators.go rename to core/validation/validators.go index 1652ee2c..ec422d86 100644 --- a/pkg/core/validation/validators.go +++ b/core/validation/validators.go @@ -23,7 +23,7 @@ import ( "time" "unicode/utf8" - "github.com/astaxie/beego/pkg/core/logs" + "github.com/astaxie/beego/core/logs" ) // CanSkipFuncs will skip valid if RequiredFirst is true and the struct field's value is empty diff --git a/pkg/doc.go b/doc.go similarity index 97% rename from pkg/doc.go rename to doc.go index 2d9c2bfe..6975885a 100644 --- a/pkg/doc.go +++ b/doc.go @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -package pkg +package beego diff --git a/githook/pre-commit b/githook/pre-commit deleted file mode 100755 index 95b1009b..00000000 --- a/githook/pre-commit +++ /dev/null @@ -1,7 +0,0 @@ - -goimports -w -format-only pkg -goimports -w -format-only examples - -ineffassign . - -staticcheck -show-ignored -checks "-ST1017,-U1000,-ST1005,-S1034,-S1012,-SA4006,-SA6005,-SA1019,-SA1024" ./pkg \ No newline at end of file diff --git a/pkg/adapter/logs/alils/alils.go b/pkg/adapter/logs/alils/alils.go deleted file mode 100644 index 5abbc29f..00000000 --- a/pkg/adapter/logs/alils/alils.go +++ /dev/null @@ -1,5 +0,0 @@ -package alils - -import ( - _ "github.com/astaxie/beego/pkg/core/logs/alils" -) diff --git a/pkg/adapter/logs/es/es.go b/pkg/adapter/logs/es/es.go deleted file mode 100644 index e0759485..00000000 --- a/pkg/adapter/logs/es/es.go +++ /dev/null @@ -1,5 +0,0 @@ -package es - -import ( - _ "github.com/astaxie/beego/pkg/core/logs/es" -) diff --git a/pkg/server/web/LICENSE b/server/web/LICENSE similarity index 100% rename from pkg/server/web/LICENSE rename to server/web/LICENSE diff --git a/pkg/server/web/admin.go b/server/web/admin.go similarity index 98% rename from pkg/server/web/admin.go rename to server/web/admin.go index 4cac58ba..a1c47e0c 100644 --- a/pkg/server/web/admin.go +++ b/server/web/admin.go @@ -20,7 +20,7 @@ import ( "reflect" "time" - "github.com/astaxie/beego/pkg/core/logs" + "github.com/astaxie/beego/core/logs" ) // BeeAdminApp is the default adminApp used by admin module. diff --git a/pkg/server/web/admin_controller.go b/server/web/admin_controller.go similarity index 99% rename from pkg/server/web/admin_controller.go rename to server/web/admin_controller.go index 575362d7..2998c8d4 100644 --- a/pkg/server/web/admin_controller.go +++ b/server/web/admin_controller.go @@ -24,7 +24,7 @@ import ( "github.com/prometheus/client_golang/prometheus/promhttp" - "github.com/astaxie/beego/pkg/core/governor" + "github.com/astaxie/beego/core/governor" ) type adminController struct { diff --git a/pkg/server/web/admin_test.go b/server/web/admin_test.go similarity index 99% rename from pkg/server/web/admin_test.go rename to server/web/admin_test.go index c33bbf2f..5ef57323 100644 --- a/pkg/server/web/admin_test.go +++ b/server/web/admin_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/astaxie/beego/pkg/core/governor" + "github.com/astaxie/beego/core/governor" ) type SampleDatabaseCheck struct { diff --git a/pkg/server/web/adminui.go b/server/web/adminui.go similarity index 100% rename from pkg/server/web/adminui.go rename to server/web/adminui.go diff --git a/pkg/server/web/beego.go b/server/web/beego.go similarity index 100% rename from pkg/server/web/beego.go rename to server/web/beego.go diff --git a/pkg/server/web/captcha/LICENSE b/server/web/captcha/LICENSE similarity index 100% rename from pkg/server/web/captcha/LICENSE rename to server/web/captcha/LICENSE diff --git a/pkg/server/web/captcha/README.md b/server/web/captcha/README.md similarity index 100% rename from pkg/server/web/captcha/README.md rename to server/web/captcha/README.md diff --git a/pkg/server/web/captcha/captcha.go b/server/web/captcha/captcha.go similarity index 97% rename from pkg/server/web/captcha/captcha.go rename to server/web/captcha/captcha.go index 876e6074..8ce832f7 100644 --- a/pkg/server/web/captcha/captcha.go +++ b/server/web/captcha/captcha.go @@ -67,11 +67,11 @@ import ( "strings" "time" - "github.com/astaxie/beego/pkg/core/logs" + "github.com/astaxie/beego/core/logs" - "github.com/astaxie/beego/pkg/core/utils" - "github.com/astaxie/beego/pkg/server/web" - "github.com/astaxie/beego/pkg/server/web/context" + "github.com/astaxie/beego/core/utils" + "github.com/astaxie/beego/server/web" + "github.com/astaxie/beego/server/web/context" ) var ( diff --git a/pkg/server/web/captcha/image.go b/server/web/captcha/image.go similarity index 100% rename from pkg/server/web/captcha/image.go rename to server/web/captcha/image.go diff --git a/pkg/server/web/captcha/image_test.go b/server/web/captcha/image_test.go similarity index 96% rename from pkg/server/web/captcha/image_test.go rename to server/web/captcha/image_test.go index a6b82f56..4b4518a1 100644 --- a/pkg/server/web/captcha/image_test.go +++ b/server/web/captcha/image_test.go @@ -17,7 +17,7 @@ package captcha import ( "testing" - "github.com/astaxie/beego/pkg/core/utils" + "github.com/astaxie/beego/core/utils" ) type byteCounter struct { diff --git a/pkg/server/web/captcha/siprng.go b/server/web/captcha/siprng.go similarity index 100% rename from pkg/server/web/captcha/siprng.go rename to server/web/captcha/siprng.go diff --git a/pkg/server/web/captcha/siprng_test.go b/server/web/captcha/siprng_test.go similarity index 100% rename from pkg/server/web/captcha/siprng_test.go rename to server/web/captcha/siprng_test.go diff --git a/pkg/server/web/config.go b/server/web/config.go similarity index 97% rename from pkg/server/web/config.go rename to server/web/config.go index 9e2a2885..10dc9c97 100644 --- a/pkg/server/web/config.go +++ b/server/web/config.go @@ -24,13 +24,13 @@ import ( "runtime" "strings" - "github.com/astaxie/beego/pkg" - "github.com/astaxie/beego/pkg/core/config" - "github.com/astaxie/beego/pkg/core/logs" - "github.com/astaxie/beego/pkg/server/web/session" + "github.com/astaxie/beego" + "github.com/astaxie/beego/core/config" + "github.com/astaxie/beego/core/logs" + "github.com/astaxie/beego/server/web/session" - "github.com/astaxie/beego/pkg/core/utils" - "github.com/astaxie/beego/pkg/server/web/context" + "github.com/astaxie/beego/core/utils" + "github.com/astaxie/beego/server/web/context" ) // Config is the main struct for BConfig @@ -210,7 +210,7 @@ func newBConfig() *Config { AppName: "beego", RunMode: PROD, RouterCaseSensitive: true, - ServerName: "beegoServer:" + pkg.VERSION, + ServerName: "beegoServer:" + beego.VERSION, RecoverPanic: true, CopyRequestBody: false, diff --git a/pkg/server/web/config_test.go b/server/web/config_test.go similarity index 98% rename from pkg/server/web/config_test.go rename to server/web/config_test.go index ce4a4492..88fa8b8c 100644 --- a/pkg/server/web/config_test.go +++ b/server/web/config_test.go @@ -19,7 +19,7 @@ import ( "reflect" "testing" - beeJson "github.com/astaxie/beego/pkg/core/config/json" + beeJson "github.com/astaxie/beego/core/config/json" ) func TestDefaults(t *testing.T) { diff --git a/pkg/server/web/context/acceptencoder.go b/server/web/context/acceptencoder.go similarity index 100% rename from pkg/server/web/context/acceptencoder.go rename to server/web/context/acceptencoder.go diff --git a/pkg/server/web/context/acceptencoder_test.go b/server/web/context/acceptencoder_test.go similarity index 100% rename from pkg/server/web/context/acceptencoder_test.go rename to server/web/context/acceptencoder_test.go diff --git a/pkg/server/web/context/context.go b/server/web/context/context.go similarity index 99% rename from pkg/server/web/context/context.go rename to server/web/context/context.go index 1a6c00a8..53ed3d01 100644 --- a/pkg/server/web/context/context.go +++ b/server/web/context/context.go @@ -35,7 +35,7 @@ import ( "strings" "time" - "github.com/astaxie/beego/pkg/core/utils" + "github.com/astaxie/beego/core/utils" ) // Commonly used mime-types diff --git a/pkg/server/web/context/context_test.go b/server/web/context/context_test.go similarity index 100% rename from pkg/server/web/context/context_test.go rename to server/web/context/context_test.go diff --git a/pkg/server/web/context/input.go b/server/web/context/input.go similarity index 99% rename from pkg/server/web/context/input.go rename to server/web/context/input.go index 746822aa..641e15cc 100644 --- a/pkg/server/web/context/input.go +++ b/server/web/context/input.go @@ -29,7 +29,7 @@ import ( "strings" "sync" - "github.com/astaxie/beego/pkg/server/web/session" + "github.com/astaxie/beego/server/web/session" ) // Regexes for checking the accept headers diff --git a/pkg/server/web/context/input_test.go b/server/web/context/input_test.go similarity index 100% rename from pkg/server/web/context/input_test.go rename to server/web/context/input_test.go diff --git a/pkg/server/web/context/output.go b/server/web/context/output.go similarity index 100% rename from pkg/server/web/context/output.go rename to server/web/context/output.go diff --git a/pkg/server/web/context/param/conv.go b/server/web/context/param/conv.go similarity index 95% rename from pkg/server/web/context/param/conv.go rename to server/web/context/param/conv.go index 73e83e30..fe3388b6 100644 --- a/pkg/server/web/context/param/conv.go +++ b/server/web/context/param/conv.go @@ -4,8 +4,8 @@ import ( "fmt" "reflect" - "github.com/astaxie/beego/pkg/core/logs" - beecontext "github.com/astaxie/beego/pkg/server/web/context" + "github.com/astaxie/beego/core/logs" + beecontext "github.com/astaxie/beego/server/web/context" ) // ConvertParams converts http method params to values that will be passed to the method controller as arguments diff --git a/pkg/server/web/context/param/methodparams.go b/server/web/context/param/methodparams.go similarity index 100% rename from pkg/server/web/context/param/methodparams.go rename to server/web/context/param/methodparams.go diff --git a/pkg/server/web/context/param/options.go b/server/web/context/param/options.go similarity index 100% rename from pkg/server/web/context/param/options.go rename to server/web/context/param/options.go diff --git a/pkg/server/web/context/param/parsers.go b/server/web/context/param/parsers.go similarity index 100% rename from pkg/server/web/context/param/parsers.go rename to server/web/context/param/parsers.go diff --git a/pkg/server/web/context/param/parsers_test.go b/server/web/context/param/parsers_test.go similarity index 100% rename from pkg/server/web/context/param/parsers_test.go rename to server/web/context/param/parsers_test.go diff --git a/pkg/server/web/context/renderer.go b/server/web/context/renderer.go similarity index 100% rename from pkg/server/web/context/renderer.go rename to server/web/context/renderer.go diff --git a/pkg/server/web/context/response.go b/server/web/context/response.go similarity index 99% rename from pkg/server/web/context/response.go rename to server/web/context/response.go index d80cfe89..7bd9a7e8 100644 --- a/pkg/server/web/context/response.go +++ b/server/web/context/response.go @@ -1,9 +1,8 @@ package context import ( - "strconv" - "net/http" + "strconv" ) const ( diff --git a/pkg/server/web/controller.go b/server/web/controller.go similarity index 99% rename from pkg/server/web/controller.go rename to server/web/controller.go index a8e2ae63..3a1b9837 100644 --- a/pkg/server/web/controller.go +++ b/server/web/controller.go @@ -28,10 +28,10 @@ import ( "strconv" "strings" - "github.com/astaxie/beego/pkg/server/web/session" + "github.com/astaxie/beego/server/web/session" - "github.com/astaxie/beego/pkg/server/web/context" - "github.com/astaxie/beego/pkg/server/web/context/param" + "github.com/astaxie/beego/server/web/context" + "github.com/astaxie/beego/server/web/context/param" ) var ( diff --git a/pkg/server/web/controller_test.go b/server/web/controller_test.go similarity index 98% rename from pkg/server/web/controller_test.go rename to server/web/controller_test.go index 46da3629..0b711e0d 100644 --- a/pkg/server/web/controller_test.go +++ b/server/web/controller_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/astaxie/beego/pkg/server/web/context" + "github.com/astaxie/beego/server/web/context" ) func TestGetInt(t *testing.T) { diff --git a/pkg/server/web/doc.go b/server/web/doc.go similarity index 91% rename from pkg/server/web/doc.go rename to server/web/doc.go index 0ab10bfd..a32bc576 100644 --- a/pkg/server/web/doc.go +++ b/server/web/doc.go @@ -6,7 +6,7 @@ It is used for rapid development of RESTful APIs, web apps and backend services beego is inspired by Tornado, Sinatra and Flask with the added benefit of some Go-specific features such as interfaces and struct embedding. package main - import "github.com/astaxie/beego/pkg" + import "github.com/astaxie/beego" func main() { beego.Run() diff --git a/pkg/server/web/error.go b/server/web/error.go similarity index 98% rename from pkg/server/web/error.go rename to server/web/error.go index d0a8d778..b5ef1d2d 100644 --- a/pkg/server/web/error.go +++ b/server/web/error.go @@ -23,10 +23,10 @@ import ( "strconv" "strings" - "github.com/astaxie/beego/pkg" - "github.com/astaxie/beego/pkg/core/utils" + "github.com/astaxie/beego" + "github.com/astaxie/beego/core/utils" - "github.com/astaxie/beego/pkg/server/web/context" + "github.com/astaxie/beego/server/web/context" ) const ( @@ -92,7 +92,7 @@ func showErr(err interface{}, ctx *context.Context, stack string) { "RequestURL": ctx.Input.URI(), "RemoteAddr": ctx.Input.IP(), "Stack": stack, - "BeegoVersion": pkg.VERSION, + "BeegoVersion": beego.VERSION, "GoVersion": runtime.Version(), } t.Execute(ctx.ResponseWriter, data) @@ -379,7 +379,7 @@ func responseError(rw http.ResponseWriter, r *http.Request, errCode int, errCont t, _ := template.New("beegoerrortemp").Parse(errtpl) data := M{ "Title": http.StatusText(errCode), - "BeegoVersion": pkg.VERSION, + "BeegoVersion": beego.VERSION, "Content": template.HTML(errContent), } t.Execute(rw, data) diff --git a/pkg/server/web/error_test.go b/server/web/error_test.go similarity index 100% rename from pkg/server/web/error_test.go rename to server/web/error_test.go diff --git a/pkg/server/web/filter.go b/server/web/filter.go similarity index 98% rename from pkg/server/web/filter.go rename to server/web/filter.go index 9aab48d6..967de8c9 100644 --- a/pkg/server/web/filter.go +++ b/server/web/filter.go @@ -17,7 +17,7 @@ package web import ( "strings" - "github.com/astaxie/beego/pkg/server/web/context" + "github.com/astaxie/beego/server/web/context" ) // FilterChain is different from pure FilterFunc diff --git a/pkg/server/web/filter/apiauth/apiauth.go b/server/web/filter/apiauth/apiauth.go similarity index 97% rename from pkg/server/web/filter/apiauth/apiauth.go rename to server/web/filter/apiauth/apiauth.go index 8944db63..58153f1d 100644 --- a/pkg/server/web/filter/apiauth/apiauth.go +++ b/server/web/filter/apiauth/apiauth.go @@ -65,8 +65,8 @@ import ( "sort" "time" - "github.com/astaxie/beego/pkg/server/web" - "github.com/astaxie/beego/pkg/server/web/context" + "github.com/astaxie/beego/server/web" + "github.com/astaxie/beego/server/web/context" ) // AppIDToAppSecret gets appsecret through appid diff --git a/pkg/server/web/filter/apiauth/apiauth_test.go b/server/web/filter/apiauth/apiauth_test.go similarity index 100% rename from pkg/server/web/filter/apiauth/apiauth_test.go rename to server/web/filter/apiauth/apiauth_test.go diff --git a/pkg/server/web/filter/auth/basic.go b/server/web/filter/auth/basic.go similarity index 97% rename from pkg/server/web/filter/auth/basic.go rename to server/web/filter/auth/basic.go index 209cd97d..ee6af6c3 100644 --- a/pkg/server/web/filter/auth/basic.go +++ b/server/web/filter/auth/basic.go @@ -40,8 +40,8 @@ import ( "net/http" "strings" - "github.com/astaxie/beego/pkg/server/web" - "github.com/astaxie/beego/pkg/server/web/context" + "github.com/astaxie/beego/server/web" + "github.com/astaxie/beego/server/web/context" ) var defaultRealm = "Authorization Required" diff --git a/pkg/server/web/filter/authz/authz.go b/server/web/filter/authz/authz.go similarity index 96% rename from pkg/server/web/filter/authz/authz.go rename to server/web/filter/authz/authz.go index a3a8dca6..857c52f2 100644 --- a/pkg/server/web/filter/authz/authz.go +++ b/server/web/filter/authz/authz.go @@ -44,8 +44,8 @@ import ( "github.com/casbin/casbin" - "github.com/astaxie/beego/pkg/server/web" - "github.com/astaxie/beego/pkg/server/web/context" + "github.com/astaxie/beego/server/web" + "github.com/astaxie/beego/server/web/context" ) // NewAuthorizer returns the authorizer. diff --git a/pkg/server/web/filter/authz/authz_model.conf b/server/web/filter/authz/authz_model.conf similarity index 100% rename from pkg/server/web/filter/authz/authz_model.conf rename to server/web/filter/authz/authz_model.conf diff --git a/pkg/server/web/filter/authz/authz_policy.csv b/server/web/filter/authz/authz_policy.csv similarity index 100% rename from pkg/server/web/filter/authz/authz_policy.csv rename to server/web/filter/authz/authz_policy.csv diff --git a/pkg/server/web/filter/authz/authz_test.go b/server/web/filter/authz/authz_test.go similarity index 96% rename from pkg/server/web/filter/authz/authz_test.go rename to server/web/filter/authz/authz_test.go index e50596b4..c0d0dde5 100644 --- a/pkg/server/web/filter/authz/authz_test.go +++ b/server/web/filter/authz/authz_test.go @@ -21,9 +21,9 @@ import ( "github.com/casbin/casbin" - "github.com/astaxie/beego/pkg/server/web" - "github.com/astaxie/beego/pkg/server/web/context" - "github.com/astaxie/beego/pkg/server/web/filter/auth" + "github.com/astaxie/beego/server/web" + "github.com/astaxie/beego/server/web/context" + "github.com/astaxie/beego/server/web/filter/auth" ) func testRequest(t *testing.T, handler *web.ControllerRegister, user string, path string, method string, code int) { diff --git a/pkg/server/web/filter/cors/cors.go b/server/web/filter/cors/cors.go similarity index 98% rename from pkg/server/web/filter/cors/cors.go rename to server/web/filter/cors/cors.go index 800eeded..3a6905ea 100644 --- a/pkg/server/web/filter/cors/cors.go +++ b/server/web/filter/cors/cors.go @@ -42,8 +42,8 @@ import ( "strings" "time" - "github.com/astaxie/beego/pkg/server/web" - "github.com/astaxie/beego/pkg/server/web/context" + "github.com/astaxie/beego/server/web" + "github.com/astaxie/beego/server/web/context" ) const ( diff --git a/pkg/server/web/filter/cors/cors_test.go b/server/web/filter/cors/cors_test.go similarity index 98% rename from pkg/server/web/filter/cors/cors_test.go rename to server/web/filter/cors/cors_test.go index 60659fdd..7649de25 100644 --- a/pkg/server/web/filter/cors/cors_test.go +++ b/server/web/filter/cors/cors_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/astaxie/beego/pkg/server/web" - "github.com/astaxie/beego/pkg/server/web/context" + "github.com/astaxie/beego/server/web" + "github.com/astaxie/beego/server/web/context" ) // HTTPHeaderGuardRecorder is httptest.ResponseRecorder with own http.Header diff --git a/pkg/server/web/filter/opentracing/filter.go b/server/web/filter/opentracing/filter.go similarity index 96% rename from pkg/server/web/filter/opentracing/filter.go rename to server/web/filter/opentracing/filter.go index dd5663f9..c2defa18 100644 --- a/pkg/server/web/filter/opentracing/filter.go +++ b/server/web/filter/opentracing/filter.go @@ -17,12 +17,11 @@ package opentracing import ( "context" + "github.com/astaxie/beego/server/web" + beegoCtx "github.com/astaxie/beego/server/web/context" logKit "github.com/go-kit/kit/log" opentracingKit "github.com/go-kit/kit/tracing/opentracing" "github.com/opentracing/opentracing-go" - - "github.com/astaxie/beego/pkg/server/web" - beegoCtx "github.com/astaxie/beego/pkg/server/web/context" ) // FilterChainBuilder provides an extension point that we can support more configurations if necessary diff --git a/pkg/server/web/filter/opentracing/filter_test.go b/server/web/filter/opentracing/filter_test.go similarity index 96% rename from pkg/server/web/filter/opentracing/filter_test.go rename to server/web/filter/opentracing/filter_test.go index 04f44324..d7222c37 100644 --- a/pkg/server/web/filter/opentracing/filter_test.go +++ b/server/web/filter/opentracing/filter_test.go @@ -22,7 +22,7 @@ import ( "github.com/opentracing/opentracing-go" "github.com/stretchr/testify/assert" - "github.com/astaxie/beego/pkg/server/web/context" + "github.com/astaxie/beego/server/web/context" ) func TestFilterChainBuilder_FilterChain(t *testing.T) { diff --git a/pkg/server/web/filter/prometheus/filter.go b/server/web/filter/prometheus/filter.go similarity index 84% rename from pkg/server/web/filter/prometheus/filter.go rename to server/web/filter/prometheus/filter.go index eb5b0b78..7daabd5a 100644 --- a/pkg/server/web/filter/prometheus/filter.go +++ b/server/web/filter/prometheus/filter.go @@ -21,9 +21,9 @@ import ( "github.com/prometheus/client_golang/prometheus" - "github.com/astaxie/beego/pkg" - "github.com/astaxie/beego/pkg/server/web" - "github.com/astaxie/beego/pkg/server/web/context" + "github.com/astaxie/beego" + "github.com/astaxie/beego/server/web" + "github.com/astaxie/beego/server/web/context" ) // FilterChainBuilder is an extension point, @@ -64,13 +64,13 @@ func registerBuildInfo() { Help: "The building information", ConstLabels: map[string]string{ "appname": web.BConfig.AppName, - "build_version": pkg.BuildVersion, - "build_revision": pkg.BuildGitRevision, - "build_status": pkg.BuildStatus, - "build_tag": pkg.BuildTag, - "build_time": strings.Replace(pkg.BuildTime, "--", " ", 1), - "go_version": pkg.GoVersion, - "git_branch": pkg.GitBranch, + "build_version": beego.BuildVersion, + "build_revision": beego.BuildGitRevision, + "build_status": beego.BuildStatus, + "build_tag": beego.BuildTag, + "build_time": strings.Replace(beego.BuildTime, "--", " ", 1), + "go_version": beego.GoVersion, + "git_branch": beego.GitBranch, "start_time": time.Now().Format("2006-01-02 15:04:05"), }, }, []string{}) diff --git a/pkg/server/web/filter/prometheus/filter_test.go b/server/web/filter/prometheus/filter_test.go similarity index 95% rename from pkg/server/web/filter/prometheus/filter_test.go rename to server/web/filter/prometheus/filter_test.go index 08887839..cb133a64 100644 --- a/pkg/server/web/filter/prometheus/filter_test.go +++ b/server/web/filter/prometheus/filter_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/astaxie/beego/pkg/server/web/context" + "github.com/astaxie/beego/server/web/context" ) func TestFilterChain(t *testing.T) { diff --git a/pkg/server/web/filter_chain_test.go b/server/web/filter_chain_test.go similarity index 95% rename from pkg/server/web/filter_chain_test.go rename to server/web/filter_chain_test.go index 44d5f71e..e175ab29 100644 --- a/pkg/server/web/filter_chain_test.go +++ b/server/web/filter_chain_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/astaxie/beego/pkg/server/web/context" + "github.com/astaxie/beego/server/web/context" ) func TestControllerRegister_InsertFilterChain(t *testing.T) { diff --git a/pkg/server/web/filter_test.go b/server/web/filter_test.go similarity index 97% rename from pkg/server/web/filter_test.go rename to server/web/filter_test.go index eea50534..11f575d6 100644 --- a/pkg/server/web/filter_test.go +++ b/server/web/filter_test.go @@ -19,7 +19,7 @@ import ( "net/http/httptest" "testing" - "github.com/astaxie/beego/pkg/server/web/context" + "github.com/astaxie/beego/server/web/context" ) var FilterUser = func(ctx *context.Context) { diff --git a/pkg/server/web/flash.go b/server/web/flash.go similarity index 100% rename from pkg/server/web/flash.go rename to server/web/flash.go diff --git a/pkg/server/web/flash_test.go b/server/web/flash_test.go similarity index 100% rename from pkg/server/web/flash_test.go rename to server/web/flash_test.go diff --git a/pkg/server/web/fs.go b/server/web/fs.go similarity index 100% rename from pkg/server/web/fs.go rename to server/web/fs.go diff --git a/pkg/server/web/grace/grace.go b/server/web/grace/grace.go similarity index 100% rename from pkg/server/web/grace/grace.go rename to server/web/grace/grace.go diff --git a/pkg/server/web/grace/server.go b/server/web/grace/server.go similarity index 100% rename from pkg/server/web/grace/server.go rename to server/web/grace/server.go diff --git a/pkg/server/web/hooks.go b/server/web/hooks.go similarity index 95% rename from pkg/server/web/hooks.go rename to server/web/hooks.go index d7c6cf16..090e45d3 100644 --- a/pkg/server/web/hooks.go +++ b/server/web/hooks.go @@ -7,9 +7,9 @@ import ( "net/http" "path/filepath" - "github.com/astaxie/beego/pkg/core/logs" - "github.com/astaxie/beego/pkg/server/web/context" - "github.com/astaxie/beego/pkg/server/web/session" + "github.com/astaxie/beego/core/logs" + "github.com/astaxie/beego/server/web/context" + "github.com/astaxie/beego/server/web/session" ) // register MIME type with content type diff --git a/pkg/server/web/mime.go b/server/web/mime.go similarity index 100% rename from pkg/server/web/mime.go rename to server/web/mime.go diff --git a/pkg/server/web/namespace.go b/server/web/namespace.go similarity index 91% rename from pkg/server/web/namespace.go rename to server/web/namespace.go index a792aa60..58afb6c7 100644 --- a/pkg/server/web/namespace.go +++ b/server/web/namespace.go @@ -18,7 +18,7 @@ import ( "net/http" "strings" - beecontext "github.com/astaxie/beego/pkg/server/web/context" + beecontext "github.com/astaxie/beego/server/web/context" ) type namespaceCond func(*beecontext.Context) bool @@ -97,91 +97,91 @@ func (n *Namespace) Filter(action string, filter ...FilterFunc) *Namespace { } // Router same as beego.Rourer -// refer: https://godoc.org/github.com/astaxie/beego/pkg#Router +// refer: https://godoc.org/github.com/astaxie/beego#Router func (n *Namespace) Router(rootpath string, c ControllerInterface, mappingMethods ...string) *Namespace { n.handlers.Add(rootpath, c, mappingMethods...) return n } // AutoRouter same as beego.AutoRouter -// refer: https://godoc.org/github.com/astaxie/beego/pkg#AutoRouter +// refer: https://godoc.org/github.com/astaxie/beego#AutoRouter func (n *Namespace) AutoRouter(c ControllerInterface) *Namespace { n.handlers.AddAuto(c) return n } // AutoPrefix same as beego.AutoPrefix -// refer: https://godoc.org/github.com/astaxie/beego/pkg#AutoPrefix +// refer: https://godoc.org/github.com/astaxie/beego#AutoPrefix func (n *Namespace) AutoPrefix(prefix string, c ControllerInterface) *Namespace { n.handlers.AddAutoPrefix(prefix, c) return n } // Get same as beego.Get -// refer: https://godoc.org/github.com/astaxie/beego/pkg#Get +// refer: https://godoc.org/github.com/astaxie/beego#Get func (n *Namespace) Get(rootpath string, f FilterFunc) *Namespace { n.handlers.Get(rootpath, f) return n } // Post same as beego.Post -// refer: https://godoc.org/github.com/astaxie/beego/pkg#Post +// refer: https://godoc.org/github.com/astaxie/beego#Post func (n *Namespace) Post(rootpath string, f FilterFunc) *Namespace { n.handlers.Post(rootpath, f) return n } // Delete same as beego.Delete -// refer: https://godoc.org/github.com/astaxie/beego/pkg#Delete +// refer: https://godoc.org/github.com/astaxie/beego#Delete func (n *Namespace) Delete(rootpath string, f FilterFunc) *Namespace { n.handlers.Delete(rootpath, f) return n } // Put same as beego.Put -// refer: https://godoc.org/github.com/astaxie/beego/pkg#Put +// refer: https://godoc.org/github.com/astaxie/beego#Put func (n *Namespace) Put(rootpath string, f FilterFunc) *Namespace { n.handlers.Put(rootpath, f) return n } // Head same as beego.Head -// refer: https://godoc.org/github.com/astaxie/beego/pkg#Head +// refer: https://godoc.org/github.com/astaxie/beego#Head func (n *Namespace) Head(rootpath string, f FilterFunc) *Namespace { n.handlers.Head(rootpath, f) return n } // Options same as beego.Options -// refer: https://godoc.org/github.com/astaxie/beego/pkg#Options +// refer: https://godoc.org/github.com/astaxie/beego#Options func (n *Namespace) Options(rootpath string, f FilterFunc) *Namespace { n.handlers.Options(rootpath, f) return n } // Patch same as beego.Patch -// refer: https://godoc.org/github.com/astaxie/beego/pkg#Patch +// refer: https://godoc.org/github.com/astaxie/beego#Patch func (n *Namespace) Patch(rootpath string, f FilterFunc) *Namespace { n.handlers.Patch(rootpath, f) return n } // Any same as beego.Any -// refer: https://godoc.org/github.com/astaxie/beego/pkg#Any +// refer: https://godoc.org/github.com/astaxie/beego#Any func (n *Namespace) Any(rootpath string, f FilterFunc) *Namespace { n.handlers.Any(rootpath, f) return n } // Handler same as beego.Handler -// refer: https://godoc.org/github.com/astaxie/beego/pkg#Handler +// refer: https://godoc.org/github.com/astaxie/beego#Handler func (n *Namespace) Handler(rootpath string, h http.Handler) *Namespace { n.handlers.Handler(rootpath, h) return n } // Include add include class -// refer: https://godoc.org/github.com/astaxie/beego/pkg#Include +// refer: https://godoc.org/github.com/astaxie/beego#Include func (n *Namespace) Include(cList ...ControllerInterface) *Namespace { n.handlers.Include(cList...) return n diff --git a/pkg/server/web/namespace_test.go b/server/web/namespace_test.go similarity index 98% rename from pkg/server/web/namespace_test.go rename to server/web/namespace_test.go index 39d60041..a6f87bba 100644 --- a/pkg/server/web/namespace_test.go +++ b/server/web/namespace_test.go @@ -20,7 +20,7 @@ import ( "strconv" "testing" - "github.com/astaxie/beego/pkg/server/web/context" + "github.com/astaxie/beego/server/web/context" ) func TestNamespaceGet(t *testing.T) { diff --git a/pkg/server/web/pagination/controller.go b/server/web/pagination/controller.go similarity index 90% rename from pkg/server/web/pagination/controller.go rename to server/web/pagination/controller.go index 675437f8..f6b2f73d 100644 --- a/pkg/server/web/pagination/controller.go +++ b/server/web/pagination/controller.go @@ -15,8 +15,8 @@ package pagination import ( - "github.com/astaxie/beego/pkg/core/utils/pagination" - "github.com/astaxie/beego/pkg/server/web/context" + "github.com/astaxie/beego/core/utils/pagination" + "github.com/astaxie/beego/server/web/context" ) // SetPaginator Instantiates a Paginator and assigns it to context.Input.Data("paginator"). diff --git a/pkg/server/web/parser.go b/server/web/parser.go similarity index 98% rename from pkg/server/web/parser.go rename to server/web/parser.go index 9dfeca56..1a8a33df 100644 --- a/pkg/server/web/parser.go +++ b/server/web/parser.go @@ -31,17 +31,17 @@ import ( "golang.org/x/tools/go/packages" - "github.com/astaxie/beego/pkg/core/logs" + "github.com/astaxie/beego/core/logs" - "github.com/astaxie/beego/pkg/core/utils" - "github.com/astaxie/beego/pkg/server/web/context/param" + "github.com/astaxie/beego/core/utils" + "github.com/astaxie/beego/server/web/context/param" ) var globalRouterTemplate = `package {{.routersDir}} import ( - "github.com/astaxie/beego/pkg" - "github.com/astaxie/beego/pkg/server/web/context/param"{{.globalimport}} + "github.com/astaxie/beego" + "github.com/astaxie/beego/server/web/context/param"{{.globalimport}} ) func init() { diff --git a/pkg/server/web/policy.go b/server/web/policy.go similarity index 98% rename from pkg/server/web/policy.go rename to server/web/policy.go index 2099f99d..14673422 100644 --- a/pkg/server/web/policy.go +++ b/server/web/policy.go @@ -17,7 +17,7 @@ package web import ( "strings" - "github.com/astaxie/beego/pkg/server/web/context" + "github.com/astaxie/beego/server/web/context" ) // PolicyFunc defines a policy function which is invoked before the controller handler is executed. diff --git a/pkg/server/web/router.go b/server/web/router.go similarity index 99% rename from pkg/server/web/router.go rename to server/web/router.go index 07007a2b..0f383f99 100644 --- a/pkg/server/web/router.go +++ b/server/web/router.go @@ -25,11 +25,11 @@ import ( "sync" "time" - "github.com/astaxie/beego/pkg/core/logs" + "github.com/astaxie/beego/core/logs" - "github.com/astaxie/beego/pkg/core/utils" - beecontext "github.com/astaxie/beego/pkg/server/web/context" - "github.com/astaxie/beego/pkg/server/web/context/param" + "github.com/astaxie/beego/core/utils" + beecontext "github.com/astaxie/beego/server/web/context" + "github.com/astaxie/beego/server/web/context/param" ) // default filter execution points diff --git a/pkg/server/web/router_test.go b/server/web/router_test.go similarity index 99% rename from pkg/server/web/router_test.go rename to server/web/router_test.go index 2bc7990c..59ccd1fc 100644 --- a/pkg/server/web/router_test.go +++ b/server/web/router_test.go @@ -21,9 +21,9 @@ import ( "strings" "testing" - "github.com/astaxie/beego/pkg/core/logs" + "github.com/astaxie/beego/core/logs" - "github.com/astaxie/beego/pkg/server/web/context" + "github.com/astaxie/beego/server/web/context" ) type TestController struct { diff --git a/pkg/server/web/server.go b/server/web/server.go similarity index 99% rename from pkg/server/web/server.go rename to server/web/server.go index 75523d0c..f289fd9b 100644 --- a/pkg/server/web/server.go +++ b/server/web/server.go @@ -31,11 +31,11 @@ import ( "golang.org/x/crypto/acme/autocert" - "github.com/astaxie/beego/pkg/core/logs" - beecontext "github.com/astaxie/beego/pkg/server/web/context" + "github.com/astaxie/beego/core/logs" + beecontext "github.com/astaxie/beego/server/web/context" - "github.com/astaxie/beego/pkg/core/utils" - "github.com/astaxie/beego/pkg/server/web/grace" + "github.com/astaxie/beego/core/utils" + "github.com/astaxie/beego/server/web/grace" ) var ( diff --git a/pkg/server/web/server_test.go b/server/web/server_test.go similarity index 100% rename from pkg/server/web/server_test.go rename to server/web/server_test.go diff --git a/pkg/server/web/session/README.md b/server/web/session/README.md similarity index 100% rename from pkg/server/web/session/README.md rename to server/web/session/README.md diff --git a/pkg/server/web/session/couchbase/sess_couchbase.go b/server/web/session/couchbase/sess_couchbase.go similarity index 99% rename from pkg/server/web/session/couchbase/sess_couchbase.go rename to server/web/session/couchbase/sess_couchbase.go index dc616539..ddd46401 100644 --- a/pkg/server/web/session/couchbase/sess_couchbase.go +++ b/server/web/session/couchbase/sess_couchbase.go @@ -40,7 +40,7 @@ import ( couchbase "github.com/couchbase/go-couchbase" - "github.com/astaxie/beego/pkg/server/web/session" + "github.com/astaxie/beego/server/web/session" ) var couchbpder = &Provider{} diff --git a/pkg/server/web/session/ledis/ledis_session.go b/server/web/session/ledis/ledis_session.go similarity index 98% rename from pkg/server/web/session/ledis/ledis_session.go rename to server/web/session/ledis/ledis_session.go index e4061a39..a920ff7c 100644 --- a/pkg/server/web/session/ledis/ledis_session.go +++ b/server/web/session/ledis/ledis_session.go @@ -11,7 +11,7 @@ import ( "github.com/ledisdb/ledisdb/config" "github.com/ledisdb/ledisdb/ledis" - "github.com/astaxie/beego/pkg/server/web/session" + "github.com/astaxie/beego/server/web/session" ) var ( diff --git a/pkg/server/web/session/memcache/sess_memcache.go b/server/web/session/memcache/sess_memcache.go similarity index 99% rename from pkg/server/web/session/memcache/sess_memcache.go rename to server/web/session/memcache/sess_memcache.go index 731df01e..168116ef 100644 --- a/pkg/server/web/session/memcache/sess_memcache.go +++ b/server/web/session/memcache/sess_memcache.go @@ -38,7 +38,7 @@ import ( "strings" "sync" - "github.com/astaxie/beego/pkg/server/web/session" + "github.com/astaxie/beego/server/web/session" "github.com/bradfitz/gomemcache/memcache" ) diff --git a/pkg/server/web/session/mysql/sess_mysql.go b/server/web/session/mysql/sess_mysql.go similarity index 99% rename from pkg/server/web/session/mysql/sess_mysql.go rename to server/web/session/mysql/sess_mysql.go index d9b0f6b4..89da361d 100644 --- a/pkg/server/web/session/mysql/sess_mysql.go +++ b/server/web/session/mysql/sess_mysql.go @@ -47,7 +47,7 @@ import ( "sync" "time" - "github.com/astaxie/beego/pkg/server/web/session" + "github.com/astaxie/beego/server/web/session" // import mysql driver _ "github.com/go-sql-driver/mysql" ) diff --git a/pkg/server/web/session/postgres/sess_postgresql.go b/server/web/session/postgres/sess_postgresql.go similarity index 99% rename from pkg/server/web/session/postgres/sess_postgresql.go rename to server/web/session/postgres/sess_postgresql.go index c5f8f3fa..a83ac083 100644 --- a/pkg/server/web/session/postgres/sess_postgresql.go +++ b/server/web/session/postgres/sess_postgresql.go @@ -57,7 +57,7 @@ import ( "sync" "time" - "github.com/astaxie/beego/pkg/server/web/session" + "github.com/astaxie/beego/server/web/session" // import postgresql Driver _ "github.com/lib/pq" ) diff --git a/pkg/server/web/session/redis/sess_redis.go b/server/web/session/redis/sess_redis.go similarity index 99% rename from pkg/server/web/session/redis/sess_redis.go rename to server/web/session/redis/sess_redis.go index 3b25ae65..6ee28e2f 100644 --- a/pkg/server/web/session/redis/sess_redis.go +++ b/server/web/session/redis/sess_redis.go @@ -40,9 +40,9 @@ import ( "sync" "time" - "github.com/astaxie/beego/pkg/server/web/session" - "github.com/go-redis/redis/v7" + + "github.com/astaxie/beego/server/web/session" ) var redispder = &Provider{} diff --git a/pkg/server/web/session/redis/sess_redis_test.go b/server/web/session/redis/sess_redis_test.go similarity index 97% rename from pkg/server/web/session/redis/sess_redis_test.go rename to server/web/session/redis/sess_redis_test.go index 7e63361a..19c8c025 100644 --- a/pkg/server/web/session/redis/sess_redis_test.go +++ b/server/web/session/redis/sess_redis_test.go @@ -7,7 +7,7 @@ import ( "os" "testing" - "github.com/astaxie/beego/pkg/server/web/session" + "github.com/astaxie/beego/server/web/session" ) func TestRedis(t *testing.T) { diff --git a/pkg/server/web/session/redis_cluster/redis_cluster.go b/server/web/session/redis_cluster/redis_cluster.go similarity index 99% rename from pkg/server/web/session/redis_cluster/redis_cluster.go rename to server/web/session/redis_cluster/redis_cluster.go index 635ba915..17653d56 100644 --- a/pkg/server/web/session/redis_cluster/redis_cluster.go +++ b/server/web/session/redis_cluster/redis_cluster.go @@ -40,7 +40,7 @@ import ( "sync" "time" - "github.com/astaxie/beego/pkg/server/web/session" + "github.com/astaxie/beego/server/web/session" rediss "github.com/go-redis/redis/v7" ) diff --git a/pkg/server/web/session/redis_sentinel/sess_redis_sentinel.go b/server/web/session/redis_sentinel/sess_redis_sentinel.go similarity index 99% rename from pkg/server/web/session/redis_sentinel/sess_redis_sentinel.go rename to server/web/session/redis_sentinel/sess_redis_sentinel.go index 4b21242d..d68b8767 100644 --- a/pkg/server/web/session/redis_sentinel/sess_redis_sentinel.go +++ b/server/web/session/redis_sentinel/sess_redis_sentinel.go @@ -40,8 +40,9 @@ import ( "sync" "time" - "github.com/astaxie/beego/pkg/server/web/session" "github.com/go-redis/redis/v7" + + "github.com/astaxie/beego/server/web/session" ) var redispder = &Provider{} diff --git a/pkg/server/web/session/redis_sentinel/sess_redis_sentinel_test.go b/server/web/session/redis_sentinel/sess_redis_sentinel_test.go similarity index 97% rename from pkg/server/web/session/redis_sentinel/sess_redis_sentinel_test.go rename to server/web/session/redis_sentinel/sess_redis_sentinel_test.go index 8d565bf9..e4822d11 100644 --- a/pkg/server/web/session/redis_sentinel/sess_redis_sentinel_test.go +++ b/server/web/session/redis_sentinel/sess_redis_sentinel_test.go @@ -5,7 +5,7 @@ import ( "net/http/httptest" "testing" - "github.com/astaxie/beego/pkg/server/web/session" + "github.com/astaxie/beego/server/web/session" ) func TestRedisSentinel(t *testing.T) { diff --git a/pkg/server/web/session/sess_cookie.go b/server/web/session/sess_cookie.go similarity index 100% rename from pkg/server/web/session/sess_cookie.go rename to server/web/session/sess_cookie.go diff --git a/pkg/server/web/session/sess_cookie_test.go b/server/web/session/sess_cookie_test.go similarity index 100% rename from pkg/server/web/session/sess_cookie_test.go rename to server/web/session/sess_cookie_test.go diff --git a/pkg/server/web/session/sess_file.go b/server/web/session/sess_file.go similarity index 100% rename from pkg/server/web/session/sess_file.go rename to server/web/session/sess_file.go diff --git a/pkg/server/web/session/sess_file_test.go b/server/web/session/sess_file_test.go similarity index 100% rename from pkg/server/web/session/sess_file_test.go rename to server/web/session/sess_file_test.go diff --git a/pkg/server/web/session/sess_mem.go b/server/web/session/sess_mem.go similarity index 100% rename from pkg/server/web/session/sess_mem.go rename to server/web/session/sess_mem.go diff --git a/pkg/server/web/session/sess_mem_test.go b/server/web/session/sess_mem_test.go similarity index 100% rename from pkg/server/web/session/sess_mem_test.go rename to server/web/session/sess_mem_test.go diff --git a/pkg/server/web/session/sess_test.go b/server/web/session/sess_test.go similarity index 100% rename from pkg/server/web/session/sess_test.go rename to server/web/session/sess_test.go diff --git a/pkg/server/web/session/sess_utils.go b/server/web/session/sess_utils.go similarity index 99% rename from pkg/server/web/session/sess_utils.go rename to server/web/session/sess_utils.go index 5f97d1a4..8a031dd5 100644 --- a/pkg/server/web/session/sess_utils.go +++ b/server/web/session/sess_utils.go @@ -29,7 +29,7 @@ import ( "strconv" "time" - "github.com/astaxie/beego/pkg/core/utils" + "github.com/astaxie/beego/core/utils" ) func init() { diff --git a/pkg/server/web/session/session.go b/server/web/session/session.go similarity index 100% rename from pkg/server/web/session/session.go rename to server/web/session/session.go diff --git a/pkg/server/web/session/ssdb/sess_ssdb.go b/server/web/session/ssdb/sess_ssdb.go similarity index 98% rename from pkg/server/web/session/ssdb/sess_ssdb.go rename to server/web/session/ssdb/sess_ssdb.go index d15f2171..9d1230d0 100644 --- a/pkg/server/web/session/ssdb/sess_ssdb.go +++ b/server/web/session/ssdb/sess_ssdb.go @@ -10,7 +10,7 @@ import ( "github.com/ssdb/gossdb/ssdb" - "github.com/astaxie/beego/pkg/server/web/session" + "github.com/astaxie/beego/server/web/session" ) var ssdbProvider = &Provider{} diff --git a/pkg/server/web/staticfile.go b/server/web/staticfile.go similarity index 98% rename from pkg/server/web/staticfile.go rename to server/web/staticfile.go index 4aabbc60..aa3f35d8 100644 --- a/pkg/server/web/staticfile.go +++ b/server/web/staticfile.go @@ -26,10 +26,10 @@ import ( "sync" "time" - "github.com/astaxie/beego/pkg/core/logs" + "github.com/astaxie/beego/core/logs" lru "github.com/hashicorp/golang-lru" - "github.com/astaxie/beego/pkg/server/web/context" + "github.com/astaxie/beego/server/web/context" ) var errNotStaticRequest = errors.New("request not a static file request") diff --git a/pkg/server/web/staticfile_test.go b/server/web/staticfile_test.go similarity index 100% rename from pkg/server/web/staticfile_test.go rename to server/web/staticfile_test.go diff --git a/pkg/server/web/statistics.go b/server/web/statistics.go similarity index 99% rename from pkg/server/web/statistics.go rename to server/web/statistics.go index 7d5d5800..98f85e96 100644 --- a/pkg/server/web/statistics.go +++ b/server/web/statistics.go @@ -19,7 +19,7 @@ import ( "sync" "time" - "github.com/astaxie/beego/pkg/core/utils" + "github.com/astaxie/beego/core/utils" ) // Statistics struct diff --git a/pkg/server/web/statistics_test.go b/server/web/statistics_test.go similarity index 100% rename from pkg/server/web/statistics_test.go rename to server/web/statistics_test.go diff --git a/pkg/server/web/swagger/swagger.go b/server/web/swagger/swagger.go similarity index 100% rename from pkg/server/web/swagger/swagger.go rename to server/web/swagger/swagger.go diff --git a/pkg/server/web/template.go b/server/web/template.go similarity index 99% rename from pkg/server/web/template.go rename to server/web/template.go index 4a07b0da..d582dcda 100644 --- a/pkg/server/web/template.go +++ b/server/web/template.go @@ -27,8 +27,8 @@ import ( "strings" "sync" - "github.com/astaxie/beego/pkg/core/logs" - "github.com/astaxie/beego/pkg/core/utils" + "github.com/astaxie/beego/core/logs" + "github.com/astaxie/beego/core/utils" ) var ( diff --git a/pkg/server/web/template_test.go b/server/web/template_test.go similarity index 100% rename from pkg/server/web/template_test.go rename to server/web/template_test.go diff --git a/pkg/server/web/templatefunc.go b/server/web/templatefunc.go similarity index 100% rename from pkg/server/web/templatefunc.go rename to server/web/templatefunc.go diff --git a/pkg/server/web/templatefunc_test.go b/server/web/templatefunc_test.go similarity index 100% rename from pkg/server/web/templatefunc_test.go rename to server/web/templatefunc_test.go diff --git a/pkg/server/web/tree.go b/server/web/tree.go similarity index 99% rename from pkg/server/web/tree.go rename to server/web/tree.go index 9038c010..fc5a11a2 100644 --- a/pkg/server/web/tree.go +++ b/server/web/tree.go @@ -19,9 +19,9 @@ import ( "regexp" "strings" - "github.com/astaxie/beego/pkg/core/utils" + "github.com/astaxie/beego/core/utils" - "github.com/astaxie/beego/pkg/server/web/context" + "github.com/astaxie/beego/server/web/context" ) var ( diff --git a/pkg/server/web/tree_test.go b/server/web/tree_test.go similarity index 99% rename from pkg/server/web/tree_test.go rename to server/web/tree_test.go index d3091de0..e72bc1f9 100644 --- a/pkg/server/web/tree_test.go +++ b/server/web/tree_test.go @@ -18,7 +18,7 @@ import ( "strings" "testing" - "github.com/astaxie/beego/pkg/server/web/context" + "github.com/astaxie/beego/server/web/context" ) type testinfo struct { diff --git a/pkg/server/web/unregroute_test.go b/server/web/unregroute_test.go similarity index 100% rename from pkg/server/web/unregroute_test.go rename to server/web/unregroute_test.go diff --git a/pkg/task/govenor_command.go b/task/govenor_command.go similarity index 97% rename from pkg/task/govenor_command.go rename to task/govenor_command.go index a9583970..15e25e43 100644 --- a/pkg/task/govenor_command.go +++ b/task/govenor_command.go @@ -21,7 +21,7 @@ import ( "github.com/pkg/errors" - "github.com/astaxie/beego/pkg/core/governor" + "github.com/astaxie/beego/core/governor" ) type listTaskCommand struct { diff --git a/pkg/task/governor_command_test.go b/task/governor_command_test.go similarity index 100% rename from pkg/task/governor_command_test.go rename to task/governor_command_test.go diff --git a/pkg/task/task.go b/task/task.go similarity index 100% rename from pkg/task/task.go rename to task/task.go diff --git a/pkg/task/task_test.go b/task/task_test.go similarity index 100% rename from pkg/task/task_test.go rename to task/task_test.go