From 361a562f75b2b0ae8abae9ad4774290b360c7cc7 Mon Sep 17 00:00:00 2001 From: Yvan <8574526@qq,com> Date: Fri, 21 Aug 2026 00:10:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 3 +- {cmd/kratos-admin => app/system/cmd}/main.go | 12 ++++---- .../system/cmd}/main_test.go | 2 +- {cmd/kratos-admin => app/system/cmd}/wire.go | 22 +++++++------- .../system/cmd}/wire_gen.go | 30 +++++++++---------- {configs => app/system/configs}/config.yaml | 0 app/{admin => system/internal/app}/catalog.go | 6 ++-- .../{ => internal}/biz/access_control.go | 0 app/system/{ => internal}/biz/actor.go | 0 app/system/{ => internal}/biz/announcement.go | 0 app/system/{ => internal}/biz/api.go | 0 app/system/{ => internal}/biz/api_token.go | 0 app/system/{ => internal}/biz/audit.go | 0 .../{ => internal}/biz/authentication.go | 0 .../{ => internal}/biz/authentication_test.go | 0 app/system/{ => internal}/biz/authority.go | 0 app/system/{ => internal}/biz/biz.go | 0 app/system/{ => internal}/biz/data_scope.go | 0 app/system/{ => internal}/biz/department.go | 0 app/system/{ => internal}/biz/dictionary.go | 0 app/system/{ => internal}/biz/email.go | 0 app/system/{ => internal}/biz/errors.go | 0 app/system/{ => internal}/biz/export.go | 0 .../{ => internal}/biz/infrastructure.go | 0 app/system/{ => internal}/biz/media.go | 0 .../{ => internal}/biz/media_metadata.go | 0 app/system/{ => internal}/biz/media_test.go | 0 app/system/{ => internal}/biz/media_upload.go | 0 app/system/{ => internal}/biz/menu.go | 0 app/system/{ => internal}/biz/pagination.go | 0 app/system/{ => internal}/biz/parameter.go | 0 app/system/{ => internal}/biz/payment.go | 0 app/system/{ => internal}/biz/payment_log.go | 0 .../{ => internal}/biz/payment_order.go | 0 app/system/{ => internal}/biz/payment_test.go | 0 app/system/{ => internal}/biz/permission.go | 0 app/system/{ => internal}/biz/position.go | 0 app/system/{ => internal}/biz/security.go | 0 .../{ => internal}/biz/security_test.go | 0 app/system/{ => internal}/biz/system_init.go | 0 app/system/{ => internal}/biz/task.go | 0 .../{ => internal}/biz/task_registry.go | 0 app/system/{ => internal}/biz/task_test.go | 0 .../{ => internal}/biz/upload_session.go | 0 app/system/{ => internal}/biz/user.go | 0 app/system/{ => internal}/biz/user_test.go | 0 app/system/{ => internal}/biz/version.go | 0 .../system/internal}/conf/conf.pb.go | 6 ++-- .../system/internal}/conf/conf.proto | 3 +- .../system/internal}/conf/runtime.go | 0 .../system/internal}/conf/runtime_test.go | 0 .../{ => internal}/data/config_helpers.go | 2 +- .../{ => internal}/data/config_store.go | 4 +-- .../{ => internal}/data/config_watch.go | 0 app/system/{ => internal}/data/data.go | 8 ++--- app/system/{ => internal}/data/data_scope.go | 2 +- .../{ => internal}/data/data_scope_audit.go | 0 .../data/data_scope_audit_test.go | 0 .../{ => internal}/data/data_scope_record.go | 0 .../{ => internal}/data/data_scope_test.go | 2 +- app/system/{ => internal}/data/database.go | 2 +- .../{ => internal}/data/gorm_logger_test.go | 2 +- .../data/initialization_backend.go | 6 ++-- .../data/initialization_backend_test.go | 2 +- .../{ => internal}/data/integration_config.go | 2 +- .../data/integration_config_test.go | 4 +-- app/system/{ => internal}/data/migrations.go | 4 +-- .../{ => internal}/data/migrations_test.go | 0 app/system/{ => internal}/data/mongo.go | 2 +- .../{ => internal}/data/payment/migrations.go | 0 .../{ => internal}/data/payment/models.go | 0 .../{ => internal}/data/payment/payment.go | 4 +-- .../data/payment/payment_config_test.go | 2 +- .../data/payment/payment_helpers.go | 2 +- .../data/payment/payment_native_test.go | 2 +- .../data/payment/payment_order.go | 2 +- .../data/payment/payment_order_test.go | 2 +- .../{ => internal}/data/payment/provider.go | 0 .../data/payment/testing_support_test.go | 0 .../data/repository/announcement.go | 2 +- .../data/repository/announcement_test.go | 2 +- .../{ => internal}/data/repository/api.go | 2 +- .../data/repository/api_policy.go | 2 +- .../data/repository/api_policy_test.go | 4 +-- .../data/repository/api_sync.go | 2 +- .../data/repository/api_token.go | 2 +- .../{ => internal}/data/repository/audit.go | 2 +- .../data/repository/audit_delete_test.go | 0 .../data/repository/authority.go | 2 +- .../data/repository/authority_test.go | 4 +-- .../data/repository/bootstrap.go | 0 .../{ => internal}/data/repository/casbin.go | 0 .../data/repository/data_access_log.go | 2 +- .../data/repository/department.go | 2 +- .../data/repository/dictionary.go | 2 +- .../dictionary_department_parity_test.go | 2 +- .../data/repository/error_record.go | 2 +- .../data/repository/error_record_test.go | 2 +- .../{ => internal}/data/repository/export.go | 2 +- .../data/repository/log_file.go | 2 +- .../data/repository/log_file_test.go | 4 +-- .../data/repository/login_log.go | 2 +- .../{ => internal}/data/repository/media.go | 2 +- .../data/repository/media_test.go | 2 +- .../data/repository/media_upload.go | 2 +- .../{ => internal}/data/repository/menu.go | 2 +- .../data/repository/menu_test.go | 4 +-- .../data/repository/migrations.go | 0 .../data/repository/migrations_test.go | 0 .../{ => internal}/data/repository/models.go | 2 +- .../data/repository/operation_log.go | 2 +- .../data/repository/organization_test.go | 0 .../data/repository/parameter.go | 2 +- .../data/repository/parameter_test.go | 2 +- .../data/repository/permission.go | 2 +- .../data/repository/permission_test.go | 4 +-- .../data/repository/position.go | 2 +- .../data/repository/provider.go | 2 +- .../{ => internal}/data/repository/runtime.go | 6 ++-- .../data/repository/security.go | 2 +- .../{ => internal}/data/repository/seed.go | 2 +- .../data/repository/seed_test.go | 2 +- .../repository/system_init_ignore_test.go | 0 .../{ => internal}/data/repository/task.go | 2 +- .../data/repository/testing_support_test.go | 2 +- .../data/repository/transactions_test.go | 4 +-- .../{ => internal}/data/repository/user.go | 2 +- .../data/repository/user_strict_test.go | 2 +- .../{ => internal}/data/repository/version.go | 2 +- .../data/repository/version_test.go | 0 .../{ => internal}/data/runtime_clients.go | 0 app/system/{ => internal}/dto/announcement.go | 0 app/system/{ => internal}/dto/api.go | 0 app/system/{ => internal}/dto/audit.go | 0 app/system/{ => internal}/dto/audit_test.go | 0 .../{ => internal}/dto/authentication.go | 0 app/system/{ => internal}/dto/authority.go | 0 app/system/{ => internal}/dto/email.go | 0 app/system/{ => internal}/dto/export.go | 0 app/system/{ => internal}/dto/media.go | 0 app/system/{ => internal}/dto/menu.go | 0 app/system/{ => internal}/dto/organization.go | 0 app/system/{ => internal}/dto/payment.go | 0 app/system/{ => internal}/dto/permission.go | 0 app/system/{ => internal}/dto/settings.go | 0 app/system/{ => internal}/dto/system.go | 0 .../{ => internal}/dto/system_config.go | 0 app/system/{ => internal}/dto/system_init.go | 0 app/system/{ => internal}/dto/task.go | 0 app/system/{ => internal}/dto/version.go | 0 .../{ => internal}/initialize/backend.go | 4 +-- .../initialize/compatibility.go | 2 +- .../initialize/configuration.go | 4 +-- .../{ => internal}/initialize/initialize.go | 4 +-- .../{ => internal}/initialize/provider.go | 0 .../{ => internal}/integration/README.md | 0 .../{ => internal}/integration/cache/cache.go | 2 +- .../{ => internal}/integration/email/email.go | 4 +-- .../integration/payment/adapter.go | 2 +- .../integration/payment/adapter_test.go | 2 +- .../integration/payment/alipay.go | 2 +- .../integration/payment/alipay_v3.go | 2 +- .../integration/payment/alipay_v3_test.go | 2 +- .../integration/payment/allinpay.go | 2 +- .../integration/payment/allinpay_test.go | 2 +- .../integration/payment/apple.go | 2 +- .../integration/payment/apple_jws.go | 0 .../integration/payment/apple_jws_test.go | 0 .../integration/payment/douyin.go | 2 +- .../integration/payment/gopay.go | 0 .../integration/payment/gopay_helpers.go | 2 +- .../integration/payment/gopay_test.go | 4 +-- .../integration/payment/identity_test.go | 2 +- .../integration/payment/lakala.go | 2 +- .../integration/payment/lakala_test.go | 2 +- .../integration/payment/native_test.go | 2 +- .../integration/payment/paypal.go | 2 +- .../integration/payment/paypal_test.go | 2 +- .../{ => internal}/integration/payment/qq.go | 2 +- .../integration/payment/qq_test.go | 4 +-- .../payment/refund_boundary_test.go | 2 +- .../payment/response_validation_test.go | 2 +- .../integration/payment/result.go | 4 +-- .../integration/payment/result_test.go | 2 +- .../integration/payment/saobei.go | 2 +- .../integration/payment/saobei_test.go | 2 +- .../integration/payment/vendor.go | 4 +-- .../integration/payment/vendor_test.go | 0 .../integration/payment/wechat_v2.go | 2 +- .../integration/payment/wechat_v3.go | 2 +- .../payment/wechat_v3_codepay_test.go | 2 +- .../payment/wechat_v3_douyin_refund_test.go | 2 +- .../{ => internal}/integration/provider.go | 8 ++--- .../integration/storage/aliyun_storage.go | 4 +-- .../integration/storage/aws_storage.go | 4 +-- .../integration/storage/compose.go | 0 .../integration/storage/compose_test.go | 0 .../integration/storage/huawei_storage.go | 4 +-- .../integration/storage/local.go | 4 +-- .../integration/storage/qiniu_storage.go | 4 +-- .../integration/storage/reloadable.go | 4 +-- .../integration/storage/s3_storage.go | 4 +-- .../integration/storage/tencent_storage.go | 4 +-- .../module/definition.go} | 4 +-- .../{ => internal}/routeinfo/metadata.go | 0 .../security/adminauth/token.go | 0 app/{admin => system/internal}/server/gin.go | 10 +++---- .../internal}/server/gin_test.go | 4 +-- .../server/providers_system.go} | 2 +- .../{transport => internal}/server/routes.go | 4 +-- .../internal}/server/swagger.go | 2 +- .../{ => internal}/service/access_control.go | 2 +- .../{ => internal}/service/announcement.go | 4 +-- app/system/{ => internal}/service/api.go | 4 +-- .../{ => internal}/service/api_token.go | 4 +-- app/system/{ => internal}/service/audit.go | 4 +-- .../{ => internal}/service/audit_error.go | 4 +-- .../{ => internal}/service/audit_log_file.go | 4 +-- .../{ => internal}/service/authentication.go | 4 +-- .../{ => internal}/service/authority.go | 4 +-- .../{ => internal}/service/department.go | 4 +-- .../{ => internal}/service/department_test.go | 2 +- .../{ => internal}/service/dictionary.go | 4 +-- .../service/dictionary_import.go | 4 +-- .../{ => internal}/service/dictionary_test.go | 2 +- app/system/{ => internal}/service/email.go | 2 +- app/system/{ => internal}/service/export.go | 4 +-- .../{ => internal}/service/export_excel.go | 0 app/system/{ => internal}/service/media.go | 4 +-- .../{ => internal}/service/media_upload.go | 2 +- app/system/{ => internal}/service/menu.go | 4 +-- .../{ => internal}/service/menu_test.go | 4 +-- .../{ => internal}/service/parameter.go | 4 +-- app/system/{ => internal}/service/payment.go | 4 +-- .../{ => internal}/service/permission.go | 2 +- app/system/{ => internal}/service/position.go | 4 +-- .../{ => internal}/service/route_path.go | 0 .../{ => internal}/service/route_path_test.go | 0 app/system/{ => internal}/service/security.go | 4 +-- .../service/security_session.go | 2 +- app/system/{ => internal}/service/service.go | 0 app/system/{ => internal}/service/system.go | 2 +- .../{ => internal}/service/system_config.go | 2 +- .../{ => internal}/service/system_info.go | 2 +- .../{ => internal}/service/system_init.go | 6 ++-- app/system/{ => internal}/service/task.go | 4 +-- app/system/{ => internal}/service/user.go | 4 +-- .../{ => internal}/service/user_conversion.go | 4 +-- app/system/{ => internal}/service/version.go | 4 +-- .../transport/handler/announcement.go | 6 ++-- .../{ => internal}/transport/handler/api.go | 6 ++-- .../transport/handler/api_token.go | 6 ++-- .../{ => internal}/transport/handler/audit.go | 8 ++--- .../transport/handler/authority.go | 6 ++-- .../transport/handler/dictionary.go | 6 ++-- .../{ => internal}/transport/handler/email.go | 6 ++-- .../transport/handler/export.go | 6 ++-- .../transport/handler/export_test.go | 0 .../{ => internal}/transport/handler/media.go | 8 ++--- .../{ => internal}/transport/handler/menu.go | 6 ++-- .../transport/handler/navigation.go | 6 ++-- .../transport/handler/organization.go | 6 ++-- .../transport/handler/parameter.go | 6 ++-- .../transport/handler/payment.go | 6 ++-- .../transport/handler/payment_test.go | 2 +- .../transport/handler/permission.go | 6 ++-- .../transport/handler/public.go | 8 ++--- .../{ => internal}/transport/handler/query.go | 0 .../transport/handler/session.go | 4 +-- .../{ => internal}/transport/handler/set.go | 0 .../transport/handler/system_config.go | 6 ++-- .../{ => internal}/transport/handler/task.go | 8 ++--- .../{ => internal}/transport/handler/user.go | 8 ++--- .../transport/handler/version.go | 8 ++--- .../{ => internal}/transport/httpx/cookie.go | 0 .../transport/httpx/response.go | 0 .../transport/middleware/access.go | 8 ++--- .../transport/middleware/access_log.go | 6 ++-- .../transport/middleware/access_log_test.go | 2 +- .../transport/middleware/access_test.go | 4 +-- .../transport/middleware/audit.go | 6 ++-- .../transport/middleware/auth.go | 6 ++-- .../transport/middleware/capture.go | 0 .../transport/middleware/cors.go | 2 +- .../transport/middleware/cors_test.go | 2 +- .../transport/middleware/error_audit.go | 2 +- .../transport/middleware/error_audit_test.go | 0 .../transport/middleware/rate_limit.go | 4 +-- .../transport/middleware/rate_limit_test.go | 4 +-- .../transport/middleware/recovery.go | 0 .../transport/middleware/request.go | 2 +- .../transport/router/announcement.go | 2 +- .../{ => internal}/transport/router/api.go | 2 +- .../transport/router/api_token.go | 2 +- .../{ => internal}/transport/router/audit.go | 2 +- .../transport/router/authority.go | 2 +- .../transport/router/dictionary.go | 2 +- .../{ => internal}/transport/router/email.go | 2 +- .../{ => internal}/transport/router/export.go | 2 +- .../{ => internal}/transport/router/media.go | 2 +- .../{ => internal}/transport/router/menu.go | 2 +- .../transport/router/organization.go | 2 +- .../transport/router/parameter.go | 2 +- .../transport/router/payment.go | 2 +- .../transport/router/permission.go | 2 +- .../{ => internal}/transport/router/public.go | 2 +- .../transport/router/system_config.go | 2 +- .../{ => internal}/transport/router/task.go | 2 +- .../{ => internal}/transport/router/user.go | 2 +- .../transport/router/version.go | 2 +- .../{ => internal}/utils/configutil/json.go | 0 .../utils/configutil/json_test.go | 2 +- .../utils/paymentutil/README.md | 0 .../utils/paymentutil/amount.go | 0 .../utils/paymentutil/amount_test.go | 0 .../{ => internal}/utils/paymentutil/json.go | 0 .../utils/paymentutil/json_test.go | 0 .../utils/paymentutil/signing.go | 0 .../utils/paymentutil/signing_test.go | 0 .../utils/paymentutil/status.go | 0 .../{ => internal}/utils/paymentutil/xml.go | 0 .../{ => internal}/worker/task_executor.go | 4 +-- .../worker/task_executor_test.go | 2 +- .../{ => internal}/worker/task_registry.go | 4 +-- .../worker/task_runtime_test.go | 2 +- .../{ => internal}/worker/task_scheduler.go | 2 +- .../worker/task_scheduler_test.go | 0 app/system/{ => internal}/worker/worker.go | 0 buf.gen.config.yaml | 5 ++-- {internal => pkg}/logging/context.go | 0 {internal => pkg}/logging/daily.go | 0 {internal => pkg}/logging/source.go | 0 {internal => pkg}/logging/zap.go | 0 {internal => pkg}/logging/zap_test.go | 2 +- 334 files changed, 382 insertions(+), 379 deletions(-) rename {cmd/kratos-admin => app/system/cmd}/main.go (94%) rename {cmd/kratos-admin => app/system/cmd}/main_test.go (96%) rename {cmd/kratos-admin => app/system/cmd}/wire.go (69%) rename {cmd/kratos-admin => app/system/cmd}/wire_gen.go (93%) rename {configs => app/system/configs}/config.yaml (100%) rename app/{admin => system/internal/app}/catalog.go (90%) rename app/system/{ => internal}/biz/access_control.go (100%) rename app/system/{ => internal}/biz/actor.go (100%) rename app/system/{ => internal}/biz/announcement.go (100%) rename app/system/{ => internal}/biz/api.go (100%) rename app/system/{ => internal}/biz/api_token.go (100%) rename app/system/{ => internal}/biz/audit.go (100%) rename app/system/{ => internal}/biz/authentication.go (100%) rename app/system/{ => internal}/biz/authentication_test.go (100%) rename app/system/{ => internal}/biz/authority.go (100%) rename app/system/{ => internal}/biz/biz.go (100%) rename app/system/{ => internal}/biz/data_scope.go (100%) rename app/system/{ => internal}/biz/department.go (100%) rename app/system/{ => internal}/biz/dictionary.go (100%) rename app/system/{ => internal}/biz/email.go (100%) rename app/system/{ => internal}/biz/errors.go (100%) rename app/system/{ => internal}/biz/export.go (100%) rename app/system/{ => internal}/biz/infrastructure.go (100%) rename app/system/{ => internal}/biz/media.go (100%) rename app/system/{ => internal}/biz/media_metadata.go (100%) rename app/system/{ => internal}/biz/media_test.go (100%) rename app/system/{ => internal}/biz/media_upload.go (100%) rename app/system/{ => internal}/biz/menu.go (100%) rename app/system/{ => internal}/biz/pagination.go (100%) rename app/system/{ => internal}/biz/parameter.go (100%) rename app/system/{ => internal}/biz/payment.go (100%) rename app/system/{ => internal}/biz/payment_log.go (100%) rename app/system/{ => internal}/biz/payment_order.go (100%) rename app/system/{ => internal}/biz/payment_test.go (100%) rename app/system/{ => internal}/biz/permission.go (100%) rename app/system/{ => internal}/biz/position.go (100%) rename app/system/{ => internal}/biz/security.go (100%) rename app/system/{ => internal}/biz/security_test.go (100%) rename app/system/{ => internal}/biz/system_init.go (100%) rename app/system/{ => internal}/biz/task.go (100%) rename app/system/{ => internal}/biz/task_registry.go (100%) rename app/system/{ => internal}/biz/task_test.go (100%) rename app/system/{ => internal}/biz/upload_session.go (100%) rename app/system/{ => internal}/biz/user.go (100%) rename app/system/{ => internal}/biz/user_test.go (100%) rename app/system/{ => internal}/biz/version.go (100%) rename {internal => app/system/internal}/conf/conf.pb.go (99%) rename {internal => app/system/internal}/conf/conf.proto (98%) rename {internal => app/system/internal}/conf/runtime.go (100%) rename {internal => app/system/internal}/conf/runtime_test.go (100%) rename app/system/{ => internal}/data/config_helpers.go (95%) rename app/system/{ => internal}/data/config_store.go (99%) rename app/system/{ => internal}/data/config_watch.go (100%) rename app/system/{ => internal}/data/data.go (97%) rename app/system/{ => internal}/data/data_scope.go (99%) rename app/system/{ => internal}/data/data_scope_audit.go (100%) rename app/system/{ => internal}/data/data_scope_audit_test.go (100%) rename app/system/{ => internal}/data/data_scope_record.go (100%) rename app/system/{ => internal}/data/data_scope_test.go (99%) rename app/system/{ => internal}/data/database.go (99%) rename app/system/{ => internal}/data/gorm_logger_test.go (97%) rename app/system/{ => internal}/data/initialization_backend.go (98%) rename app/system/{ => internal}/data/initialization_backend_test.go (99%) rename app/system/{ => internal}/data/integration_config.go (99%) rename app/system/{ => internal}/data/integration_config_test.go (99%) rename app/system/{ => internal}/data/migrations.go (88%) rename app/system/{ => internal}/data/migrations_test.go (100%) rename app/system/{ => internal}/data/mongo.go (98%) rename app/system/{ => internal}/data/payment/migrations.go (100%) rename app/system/{ => internal}/data/payment/models.go (100%) rename app/system/{ => internal}/data/payment/payment.go (99%) rename app/system/{ => internal}/data/payment/payment_config_test.go (99%) rename app/system/{ => internal}/data/payment/payment_helpers.go (92%) rename app/system/{ => internal}/data/payment/payment_native_test.go (99%) rename app/system/{ => internal}/data/payment/payment_order.go (99%) rename app/system/{ => internal}/data/payment/payment_order_test.go (99%) rename app/system/{ => internal}/data/payment/provider.go (100%) rename app/system/{ => internal}/data/payment/testing_support_test.go (100%) rename app/system/{ => internal}/data/repository/announcement.go (99%) rename app/system/{ => internal}/data/repository/announcement_test.go (97%) rename app/system/{ => internal}/data/repository/api.go (99%) rename app/system/{ => internal}/data/repository/api_policy.go (99%) rename app/system/{ => internal}/data/repository/api_policy_test.go (98%) rename app/system/{ => internal}/data/repository/api_sync.go (98%) rename app/system/{ => internal}/data/repository/api_token.go (99%) rename app/system/{ => internal}/data/repository/audit.go (92%) rename app/system/{ => internal}/data/repository/audit_delete_test.go (100%) rename app/system/{ => internal}/data/repository/authority.go (99%) rename app/system/{ => internal}/data/repository/authority_test.go (99%) rename app/system/{ => internal}/data/repository/bootstrap.go (100%) rename app/system/{ => internal}/data/repository/casbin.go (100%) rename app/system/{ => internal}/data/repository/data_access_log.go (98%) rename app/system/{ => internal}/data/repository/department.go (99%) rename app/system/{ => internal}/data/repository/dictionary.go (99%) rename app/system/{ => internal}/data/repository/dictionary_department_parity_test.go (99%) rename app/system/{ => internal}/data/repository/error_record.go (99%) rename app/system/{ => internal}/data/repository/error_record_test.go (99%) rename app/system/{ => internal}/data/repository/export.go (99%) rename app/system/{ => internal}/data/repository/log_file.go (99%) rename app/system/{ => internal}/data/repository/log_file_test.go (95%) rename app/system/{ => internal}/data/repository/login_log.go (98%) rename app/system/{ => internal}/data/repository/media.go (99%) rename app/system/{ => internal}/data/repository/media_test.go (96%) rename app/system/{ => internal}/data/repository/media_upload.go (99%) rename app/system/{ => internal}/data/repository/menu.go (99%) rename app/system/{ => internal}/data/repository/menu_test.go (99%) rename app/system/{ => internal}/data/repository/migrations.go (100%) rename app/system/{ => internal}/data/repository/migrations_test.go (100%) rename app/system/{ => internal}/data/repository/models.go (98%) rename app/system/{ => internal}/data/repository/operation_log.go (99%) rename app/system/{ => internal}/data/repository/organization_test.go (100%) rename app/system/{ => internal}/data/repository/parameter.go (99%) rename app/system/{ => internal}/data/repository/parameter_test.go (98%) rename app/system/{ => internal}/data/repository/permission.go (99%) rename app/system/{ => internal}/data/repository/permission_test.go (98%) rename app/system/{ => internal}/data/repository/position.go (99%) rename app/system/{ => internal}/data/repository/provider.go (90%) rename app/system/{ => internal}/data/repository/runtime.go (97%) rename app/system/{ => internal}/data/repository/security.go (99%) rename app/system/{ => internal}/data/repository/seed.go (99%) rename app/system/{ => internal}/data/repository/seed_test.go (98%) rename app/system/{ => internal}/data/repository/system_init_ignore_test.go (100%) rename app/system/{ => internal}/data/repository/task.go (99%) rename app/system/{ => internal}/data/repository/testing_support_test.go (98%) rename app/system/{ => internal}/data/repository/transactions_test.go (99%) rename app/system/{ => internal}/data/repository/user.go (99%) rename app/system/{ => internal}/data/repository/user_strict_test.go (99%) rename app/system/{ => internal}/data/repository/version.go (99%) rename app/system/{ => internal}/data/repository/version_test.go (100%) rename app/system/{ => internal}/data/runtime_clients.go (100%) rename app/system/{ => internal}/dto/announcement.go (100%) rename app/system/{ => internal}/dto/api.go (100%) rename app/system/{ => internal}/dto/audit.go (100%) rename app/system/{ => internal}/dto/audit_test.go (100%) rename app/system/{ => internal}/dto/authentication.go (100%) rename app/system/{ => internal}/dto/authority.go (100%) rename app/system/{ => internal}/dto/email.go (100%) rename app/system/{ => internal}/dto/export.go (100%) rename app/system/{ => internal}/dto/media.go (100%) rename app/system/{ => internal}/dto/menu.go (100%) rename app/system/{ => internal}/dto/organization.go (100%) rename app/system/{ => internal}/dto/payment.go (100%) rename app/system/{ => internal}/dto/permission.go (100%) rename app/system/{ => internal}/dto/settings.go (100%) rename app/system/{ => internal}/dto/system.go (100%) rename app/system/{ => internal}/dto/system_config.go (100%) rename app/system/{ => internal}/dto/system_init.go (100%) rename app/system/{ => internal}/dto/task.go (100%) rename app/system/{ => internal}/dto/version.go (100%) rename app/system/{ => internal}/initialize/backend.go (91%) rename app/system/{ => internal}/initialize/compatibility.go (99%) rename app/system/{ => internal}/initialize/configuration.go (99%) rename app/system/{ => internal}/initialize/initialize.go (93%) rename app/system/{ => internal}/initialize/provider.go (100%) rename app/system/{ => internal}/integration/README.md (100%) rename app/system/{ => internal}/integration/cache/cache.go (98%) rename app/system/{ => internal}/integration/email/email.go (98%) rename app/system/{ => internal}/integration/payment/adapter.go (98%) rename app/system/{ => internal}/integration/payment/adapter_test.go (92%) rename app/system/{ => internal}/integration/payment/alipay.go (99%) rename app/system/{ => internal}/integration/payment/alipay_v3.go (99%) rename app/system/{ => internal}/integration/payment/alipay_v3_test.go (99%) rename app/system/{ => internal}/integration/payment/allinpay.go (99%) rename app/system/{ => internal}/integration/payment/allinpay_test.go (99%) rename app/system/{ => internal}/integration/payment/apple.go (99%) rename app/system/{ => internal}/integration/payment/apple_jws.go (100%) rename app/system/{ => internal}/integration/payment/apple_jws_test.go (100%) rename app/system/{ => internal}/integration/payment/douyin.go (99%) rename app/system/{ => internal}/integration/payment/gopay.go (100%) rename app/system/{ => internal}/integration/payment/gopay_helpers.go (99%) rename app/system/{ => internal}/integration/payment/gopay_test.go (99%) rename app/system/{ => internal}/integration/payment/identity_test.go (99%) rename app/system/{ => internal}/integration/payment/lakala.go (99%) rename app/system/{ => internal}/integration/payment/lakala_test.go (99%) rename app/system/{ => internal}/integration/payment/native_test.go (99%) rename app/system/{ => internal}/integration/payment/paypal.go (99%) rename app/system/{ => internal}/integration/payment/paypal_test.go (99%) rename app/system/{ => internal}/integration/payment/qq.go (99%) rename app/system/{ => internal}/integration/payment/qq_test.go (98%) rename app/system/{ => internal}/integration/payment/refund_boundary_test.go (99%) rename app/system/{ => internal}/integration/payment/response_validation_test.go (99%) rename app/system/{ => internal}/integration/payment/result.go (98%) rename app/system/{ => internal}/integration/payment/result_test.go (93%) rename app/system/{ => internal}/integration/payment/saobei.go (99%) rename app/system/{ => internal}/integration/payment/saobei_test.go (99%) rename app/system/{ => internal}/integration/payment/vendor.go (99%) rename app/system/{ => internal}/integration/payment/vendor_test.go (100%) rename app/system/{ => internal}/integration/payment/wechat_v2.go (99%) rename app/system/{ => internal}/integration/payment/wechat_v3.go (99%) rename app/system/{ => internal}/integration/payment/wechat_v3_codepay_test.go (99%) rename app/system/{ => internal}/integration/payment/wechat_v3_douyin_refund_test.go (99%) rename app/system/{ => internal}/integration/provider.go (72%) rename app/system/{ => internal}/integration/storage/aliyun_storage.go (98%) rename app/system/{ => internal}/integration/storage/aws_storage.go (98%) rename app/system/{ => internal}/integration/storage/compose.go (100%) rename app/system/{ => internal}/integration/storage/compose_test.go (100%) rename app/system/{ => internal}/integration/storage/huawei_storage.go (98%) rename app/system/{ => internal}/integration/storage/local.go (98%) rename app/system/{ => internal}/integration/storage/qiniu_storage.go (98%) rename app/system/{ => internal}/integration/storage/reloadable.go (96%) rename app/system/{ => internal}/integration/storage/s3_storage.go (98%) rename app/system/{ => internal}/integration/storage/tencent_storage.go (98%) rename app/system/{module.go => internal/module/definition.go} (88%) rename app/system/{ => internal}/routeinfo/metadata.go (100%) rename app/system/{ => internal}/security/adminauth/token.go (100%) rename app/{admin => system/internal}/server/gin.go (96%) rename app/{admin => system/internal}/server/gin_test.go (99%) rename app/system/{transport/server/server.go => internal/server/providers_system.go} (93%) rename app/system/{transport => internal}/server/routes.go (94%) rename app/{admin => system/internal}/server/swagger.go (99%) rename app/system/{ => internal}/service/access_control.go (96%) rename app/system/{ => internal}/service/announcement.go (97%) rename app/system/{ => internal}/service/api.go (98%) rename app/system/{ => internal}/service/api_token.go (97%) rename app/system/{ => internal}/service/audit.go (98%) rename app/system/{ => internal}/service/audit_error.go (97%) rename app/system/{ => internal}/service/audit_log_file.go (96%) rename app/system/{ => internal}/service/authentication.go (95%) rename app/system/{ => internal}/service/authority.go (98%) rename app/system/{ => internal}/service/department.go (97%) rename app/system/{ => internal}/service/department_test.go (93%) rename app/system/{ => internal}/service/dictionary.go (99%) rename app/system/{ => internal}/service/dictionary_import.go (96%) rename app/system/{ => internal}/service/dictionary_test.go (95%) rename app/system/{ => internal}/service/email.go (94%) rename app/system/{ => internal}/service/export.go (98%) rename app/system/{ => internal}/service/export_excel.go (100%) rename app/system/{ => internal}/service/media.go (98%) rename app/system/{ => internal}/service/media_upload.go (97%) rename app/system/{ => internal}/service/menu.go (99%) rename app/system/{ => internal}/service/menu_test.go (97%) rename app/system/{ => internal}/service/parameter.go (97%) rename app/system/{ => internal}/service/payment.go (99%) rename app/system/{ => internal}/service/permission.go (95%) rename app/system/{ => internal}/service/position.go (97%) rename app/system/{ => internal}/service/route_path.go (100%) rename app/system/{ => internal}/service/route_path_test.go (100%) rename app/system/{ => internal}/service/security.go (97%) rename app/system/{ => internal}/service/security_session.go (98%) rename app/system/{ => internal}/service/service.go (100%) rename app/system/{ => internal}/service/system.go (93%) rename app/system/{ => internal}/service/system_config.go (95%) rename app/system/{ => internal}/service/system_info.go (97%) rename app/system/{ => internal}/service/system_init.go (93%) rename app/system/{ => internal}/service/task.go (98%) rename app/system/{ => internal}/service/user.go (98%) rename app/system/{ => internal}/service/user_conversion.go (97%) rename app/system/{ => internal}/service/version.go (99%) rename app/system/{ => internal}/transport/handler/announcement.go (96%) rename app/system/{ => internal}/transport/handler/api.go (98%) rename app/system/{ => internal}/transport/handler/api_token.go (93%) rename app/system/{ => internal}/transport/handler/audit.go (98%) rename app/system/{ => internal}/transport/handler/authority.go (97%) rename app/system/{ => internal}/transport/handler/dictionary.go (98%) rename app/system/{ => internal}/transport/handler/email.go (87%) rename app/system/{ => internal}/transport/handler/export.go (98%) rename app/system/{ => internal}/transport/handler/export_test.go (100%) rename app/system/{ => internal}/transport/handler/media.go (97%) rename app/system/{ => internal}/transport/handler/menu.go (97%) rename app/system/{ => internal}/transport/handler/navigation.go (82%) rename app/system/{ => internal}/transport/handler/organization.go (98%) rename app/system/{ => internal}/transport/handler/parameter.go (95%) rename app/system/{ => internal}/transport/handler/payment.go (96%) rename app/system/{ => internal}/transport/handler/payment_test.go (96%) rename app/system/{ => internal}/transport/handler/permission.go (92%) rename app/system/{ => internal}/transport/handler/public.go (97%) rename app/system/{ => internal}/transport/handler/query.go (100%) rename app/system/{ => internal}/transport/handler/session.go (87%) rename app/system/{ => internal}/transport/handler/set.go (100%) rename app/system/{ => internal}/transport/handler/system_config.go (94%) rename app/system/{ => internal}/transport/handler/task.go (96%) rename app/system/{ => internal}/transport/handler/user.go (97%) rename app/system/{ => internal}/transport/handler/version.go (97%) rename app/system/{ => internal}/transport/httpx/cookie.go (100%) rename app/system/{ => internal}/transport/httpx/response.go (100%) rename app/system/{ => internal}/transport/middleware/access.go (91%) rename app/system/{ => internal}/transport/middleware/access_log.go (97%) rename app/system/{ => internal}/transport/middleware/access_log_test.go (98%) rename app/system/{ => internal}/transport/middleware/access_test.go (95%) rename app/system/{ => internal}/transport/middleware/audit.go (98%) rename app/system/{ => internal}/transport/middleware/auth.go (95%) rename app/system/{ => internal}/transport/middleware/capture.go (100%) rename app/system/{ => internal}/transport/middleware/cors.go (98%) rename app/system/{ => internal}/transport/middleware/cors_test.go (97%) rename app/system/{ => internal}/transport/middleware/error_audit.go (98%) rename app/system/{ => internal}/transport/middleware/error_audit_test.go (100%) rename app/system/{ => internal}/transport/middleware/rate_limit.go (94%) rename app/system/{ => internal}/transport/middleware/rate_limit_test.go (97%) rename app/system/{ => internal}/transport/middleware/recovery.go (100%) rename app/system/{ => internal}/transport/middleware/request.go (99%) rename app/system/{ => internal}/transport/router/announcement.go (92%) rename app/system/{ => internal}/transport/router/api.go (94%) rename app/system/{ => internal}/transport/router/api_token.go (87%) rename app/system/{ => internal}/transport/router/audit.go (96%) rename app/system/{ => internal}/transport/router/authority.go (92%) rename app/system/{ => internal}/transport/router/dictionary.go (96%) rename app/system/{ => internal}/transport/router/email.go (83%) rename app/system/{ => internal}/transport/router/export.go (94%) rename app/system/{ => internal}/transport/router/media.go (95%) rename app/system/{ => internal}/transport/router/menu.go (92%) rename app/system/{ => internal}/transport/router/organization.go (96%) rename app/system/{ => internal}/transport/router/parameter.go (91%) rename app/system/{ => internal}/transport/router/payment.go (91%) rename app/system/{ => internal}/transport/router/permission.go (87%) rename app/system/{ => internal}/transport/router/public.go (89%) rename app/system/{ => internal}/transport/router/system_config.go (92%) rename app/system/{ => internal}/transport/router/task.go (92%) rename app/system/{ => internal}/transport/router/user.go (95%) rename app/system/{ => internal}/transport/router/version.go (91%) rename app/system/{ => internal}/utils/configutil/json.go (100%) rename app/system/{ => internal}/utils/configutil/json_test.go (95%) rename app/system/{ => internal}/utils/paymentutil/README.md (100%) rename app/system/{ => internal}/utils/paymentutil/amount.go (100%) rename app/system/{ => internal}/utils/paymentutil/amount_test.go (100%) rename app/system/{ => internal}/utils/paymentutil/json.go (100%) rename app/system/{ => internal}/utils/paymentutil/json_test.go (100%) rename app/system/{ => internal}/utils/paymentutil/signing.go (100%) rename app/system/{ => internal}/utils/paymentutil/signing_test.go (100%) rename app/system/{ => internal}/utils/paymentutil/status.go (100%) rename app/system/{ => internal}/utils/paymentutil/xml.go (100%) rename app/system/{ => internal}/worker/task_executor.go (98%) rename app/system/{ => internal}/worker/task_executor_test.go (98%) rename app/system/{ => internal}/worker/task_registry.go (95%) rename app/system/{ => internal}/worker/task_runtime_test.go (99%) rename app/system/{ => internal}/worker/task_scheduler.go (99%) rename app/system/{ => internal}/worker/task_scheduler_test.go (100%) rename app/system/{ => internal}/worker/worker.go (100%) rename {internal => pkg}/logging/context.go (100%) rename {internal => pkg}/logging/daily.go (100%) rename {internal => pkg}/logging/source.go (100%) rename {internal => pkg}/logging/zap.go (100%) rename {internal => pkg}/logging/zap_test.go (97%) diff --git a/Makefile b/Makefile index d47943e..a9eef7d 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ build: .PHONY: generate # generate generate: - go generate ./... + go generate ./app/system/cmd go mod tidy .PHONY: all @@ -54,3 +54,4 @@ help: { lastLine = $$0 }' $(MAKEFILE_LIST) .DEFAULT_GOAL := help + diff --git a/cmd/kratos-admin/main.go b/app/system/cmd/main.go similarity index 94% rename from cmd/kratos-admin/main.go rename to app/system/cmd/main.go index 0dc24b3..1d3216e 100644 --- a/cmd/kratos-admin/main.go +++ b/app/system/cmd/main.go @@ -9,11 +9,11 @@ import ( "path/filepath" "strings" - "kra/app/system/dto" - "kra/app/system/service" - "kra/app/system/worker" - "kra/internal/conf" - "kra/internal/logging" + "kra/app/system/internal/conf" + "kra/app/system/internal/dto" + "kra/app/system/internal/service" + "kra/app/system/internal/worker" + "kra/pkg/logging" "github.com/go-kratos/kratos/v3" "github.com/go-kratos/kratos/v3/config" @@ -37,7 +37,7 @@ var ( ) func init() { - flag.StringVar(&flagconf, "conf", "../../configs", "config path, eg: -conf config.yaml") + flag.StringVar(&flagconf, "conf", "../configs", "config path, eg: -conf config.yaml") } func newApp(logger *slog.Logger, hs *kratoshttp.Server, scheduler *worker.TaskScheduler, audit *service.AuditRecorder, loggerControl *logging.ReloadableLogger) *kratos.App { diff --git a/cmd/kratos-admin/main_test.go b/app/system/cmd/main_test.go similarity index 96% rename from cmd/kratos-admin/main_test.go rename to app/system/cmd/main_test.go index 135d2b5..1889b87 100644 --- a/cmd/kratos-admin/main_test.go +++ b/app/system/cmd/main_test.go @@ -3,7 +3,7 @@ package main import ( "testing" - "kra/internal/conf" + "kra/app/system/internal/conf" ) func TestSwaggerAddress(t *testing.T) { diff --git a/cmd/kratos-admin/wire.go b/app/system/cmd/wire.go similarity index 69% rename from cmd/kratos-admin/wire.go rename to app/system/cmd/wire.go index b3761a2..b9763f4 100644 --- a/cmd/kratos-admin/wire.go +++ b/app/system/cmd/wire.go @@ -8,17 +8,17 @@ package main import ( "log/slog" - "kra/app/admin" - "kra/app/system/biz" - "kra/app/system/data" - "kra/app/system/initialize" - "kra/app/system/integration" - "kra/app/system/integration/cache" - "kra/app/system/service" - "kra/app/system/transport/server" - "kra/app/system/worker" - "kra/internal/conf" - "kra/internal/logging" + "kra/app/system/internal/app" + "kra/app/system/internal/biz" + "kra/app/system/internal/conf" + "kra/app/system/internal/data" + "kra/app/system/internal/initialize" + "kra/app/system/internal/integration" + "kra/app/system/internal/integration/cache" + "kra/app/system/internal/server" + "kra/app/system/internal/service" + "kra/app/system/internal/worker" + "kra/pkg/logging" platformtask "kra/pkg/task" "github.com/go-kratos/kratos/v3" diff --git a/cmd/kratos-admin/wire_gen.go b/app/system/cmd/wire_gen.go similarity index 93% rename from cmd/kratos-admin/wire_gen.go rename to app/system/cmd/wire_gen.go index 23a2c83..f4c8d9f 100644 --- a/cmd/kratos-admin/wire_gen.go +++ b/app/system/cmd/wire_gen.go @@ -8,21 +8,21 @@ package main import ( "github.com/go-kratos/kratos/v3" - "kra/app/admin" - "kra/app/system/biz" - "kra/app/system/data" - "kra/app/system/data/payment" - "kra/app/system/data/repository" - "kra/app/system/initialize" - "kra/app/system/integration/cache" - "kra/app/system/integration/email" - "kra/app/system/integration/storage" - "kra/app/system/service" - "kra/app/system/transport/handler" - "kra/app/system/transport/server" - "kra/app/system/worker" - "kra/internal/conf" - "kra/internal/logging" + "kra/app/system/internal/app" + "kra/app/system/internal/biz" + "kra/app/system/internal/conf" + "kra/app/system/internal/data" + "kra/app/system/internal/data/payment" + "kra/app/system/internal/data/repository" + "kra/app/system/internal/initialize" + "kra/app/system/internal/integration/cache" + "kra/app/system/internal/integration/email" + "kra/app/system/internal/integration/storage" + "kra/app/system/internal/server" + "kra/app/system/internal/service" + "kra/app/system/internal/transport/handler" + "kra/app/system/internal/worker" + "kra/pkg/logging" "log/slog" ) diff --git a/configs/config.yaml b/app/system/configs/config.yaml similarity index 100% rename from configs/config.yaml rename to app/system/configs/config.yaml diff --git a/app/admin/catalog.go b/app/system/internal/app/catalog.go similarity index 90% rename from app/admin/catalog.go rename to app/system/internal/app/catalog.go index 8fab30b..96407da 100644 --- a/app/admin/catalog.go +++ b/app/system/internal/app/catalog.go @@ -4,9 +4,9 @@ package app import ( - systemmodule "kra/app/system" - systemserver "kra/app/system/transport/server" - systemworker "kra/app/system/worker" + systemmodule "kra/app/system/internal/module" + systemserver "kra/app/system/internal/server" + systemworker "kra/app/system/internal/worker" "kra/pkg/module" platformtask "kra/pkg/task" ) diff --git a/app/system/biz/access_control.go b/app/system/internal/biz/access_control.go similarity index 100% rename from app/system/biz/access_control.go rename to app/system/internal/biz/access_control.go diff --git a/app/system/biz/actor.go b/app/system/internal/biz/actor.go similarity index 100% rename from app/system/biz/actor.go rename to app/system/internal/biz/actor.go diff --git a/app/system/biz/announcement.go b/app/system/internal/biz/announcement.go similarity index 100% rename from app/system/biz/announcement.go rename to app/system/internal/biz/announcement.go diff --git a/app/system/biz/api.go b/app/system/internal/biz/api.go similarity index 100% rename from app/system/biz/api.go rename to app/system/internal/biz/api.go diff --git a/app/system/biz/api_token.go b/app/system/internal/biz/api_token.go similarity index 100% rename from app/system/biz/api_token.go rename to app/system/internal/biz/api_token.go diff --git a/app/system/biz/audit.go b/app/system/internal/biz/audit.go similarity index 100% rename from app/system/biz/audit.go rename to app/system/internal/biz/audit.go diff --git a/app/system/biz/authentication.go b/app/system/internal/biz/authentication.go similarity index 100% rename from app/system/biz/authentication.go rename to app/system/internal/biz/authentication.go diff --git a/app/system/biz/authentication_test.go b/app/system/internal/biz/authentication_test.go similarity index 100% rename from app/system/biz/authentication_test.go rename to app/system/internal/biz/authentication_test.go diff --git a/app/system/biz/authority.go b/app/system/internal/biz/authority.go similarity index 100% rename from app/system/biz/authority.go rename to app/system/internal/biz/authority.go diff --git a/app/system/biz/biz.go b/app/system/internal/biz/biz.go similarity index 100% rename from app/system/biz/biz.go rename to app/system/internal/biz/biz.go diff --git a/app/system/biz/data_scope.go b/app/system/internal/biz/data_scope.go similarity index 100% rename from app/system/biz/data_scope.go rename to app/system/internal/biz/data_scope.go diff --git a/app/system/biz/department.go b/app/system/internal/biz/department.go similarity index 100% rename from app/system/biz/department.go rename to app/system/internal/biz/department.go diff --git a/app/system/biz/dictionary.go b/app/system/internal/biz/dictionary.go similarity index 100% rename from app/system/biz/dictionary.go rename to app/system/internal/biz/dictionary.go diff --git a/app/system/biz/email.go b/app/system/internal/biz/email.go similarity index 100% rename from app/system/biz/email.go rename to app/system/internal/biz/email.go diff --git a/app/system/biz/errors.go b/app/system/internal/biz/errors.go similarity index 100% rename from app/system/biz/errors.go rename to app/system/internal/biz/errors.go diff --git a/app/system/biz/export.go b/app/system/internal/biz/export.go similarity index 100% rename from app/system/biz/export.go rename to app/system/internal/biz/export.go diff --git a/app/system/biz/infrastructure.go b/app/system/internal/biz/infrastructure.go similarity index 100% rename from app/system/biz/infrastructure.go rename to app/system/internal/biz/infrastructure.go diff --git a/app/system/biz/media.go b/app/system/internal/biz/media.go similarity index 100% rename from app/system/biz/media.go rename to app/system/internal/biz/media.go diff --git a/app/system/biz/media_metadata.go b/app/system/internal/biz/media_metadata.go similarity index 100% rename from app/system/biz/media_metadata.go rename to app/system/internal/biz/media_metadata.go diff --git a/app/system/biz/media_test.go b/app/system/internal/biz/media_test.go similarity index 100% rename from app/system/biz/media_test.go rename to app/system/internal/biz/media_test.go diff --git a/app/system/biz/media_upload.go b/app/system/internal/biz/media_upload.go similarity index 100% rename from app/system/biz/media_upload.go rename to app/system/internal/biz/media_upload.go diff --git a/app/system/biz/menu.go b/app/system/internal/biz/menu.go similarity index 100% rename from app/system/biz/menu.go rename to app/system/internal/biz/menu.go diff --git a/app/system/biz/pagination.go b/app/system/internal/biz/pagination.go similarity index 100% rename from app/system/biz/pagination.go rename to app/system/internal/biz/pagination.go diff --git a/app/system/biz/parameter.go b/app/system/internal/biz/parameter.go similarity index 100% rename from app/system/biz/parameter.go rename to app/system/internal/biz/parameter.go diff --git a/app/system/biz/payment.go b/app/system/internal/biz/payment.go similarity index 100% rename from app/system/biz/payment.go rename to app/system/internal/biz/payment.go diff --git a/app/system/biz/payment_log.go b/app/system/internal/biz/payment_log.go similarity index 100% rename from app/system/biz/payment_log.go rename to app/system/internal/biz/payment_log.go diff --git a/app/system/biz/payment_order.go b/app/system/internal/biz/payment_order.go similarity index 100% rename from app/system/biz/payment_order.go rename to app/system/internal/biz/payment_order.go diff --git a/app/system/biz/payment_test.go b/app/system/internal/biz/payment_test.go similarity index 100% rename from app/system/biz/payment_test.go rename to app/system/internal/biz/payment_test.go diff --git a/app/system/biz/permission.go b/app/system/internal/biz/permission.go similarity index 100% rename from app/system/biz/permission.go rename to app/system/internal/biz/permission.go diff --git a/app/system/biz/position.go b/app/system/internal/biz/position.go similarity index 100% rename from app/system/biz/position.go rename to app/system/internal/biz/position.go diff --git a/app/system/biz/security.go b/app/system/internal/biz/security.go similarity index 100% rename from app/system/biz/security.go rename to app/system/internal/biz/security.go diff --git a/app/system/biz/security_test.go b/app/system/internal/biz/security_test.go similarity index 100% rename from app/system/biz/security_test.go rename to app/system/internal/biz/security_test.go diff --git a/app/system/biz/system_init.go b/app/system/internal/biz/system_init.go similarity index 100% rename from app/system/biz/system_init.go rename to app/system/internal/biz/system_init.go diff --git a/app/system/biz/task.go b/app/system/internal/biz/task.go similarity index 100% rename from app/system/biz/task.go rename to app/system/internal/biz/task.go diff --git a/app/system/biz/task_registry.go b/app/system/internal/biz/task_registry.go similarity index 100% rename from app/system/biz/task_registry.go rename to app/system/internal/biz/task_registry.go diff --git a/app/system/biz/task_test.go b/app/system/internal/biz/task_test.go similarity index 100% rename from app/system/biz/task_test.go rename to app/system/internal/biz/task_test.go diff --git a/app/system/biz/upload_session.go b/app/system/internal/biz/upload_session.go similarity index 100% rename from app/system/biz/upload_session.go rename to app/system/internal/biz/upload_session.go diff --git a/app/system/biz/user.go b/app/system/internal/biz/user.go similarity index 100% rename from app/system/biz/user.go rename to app/system/internal/biz/user.go diff --git a/app/system/biz/user_test.go b/app/system/internal/biz/user_test.go similarity index 100% rename from app/system/biz/user_test.go rename to app/system/internal/biz/user_test.go diff --git a/app/system/biz/version.go b/app/system/internal/biz/version.go similarity index 100% rename from app/system/biz/version.go rename to app/system/internal/biz/version.go diff --git a/internal/conf/conf.pb.go b/app/system/internal/conf/conf.pb.go similarity index 99% rename from internal/conf/conf.pb.go rename to app/system/internal/conf/conf.pb.go index 7874847..49fdb40 100644 --- a/internal/conf/conf.pb.go +++ b/app/system/internal/conf/conf.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.12 -// protoc v7.35.1 +// protoc-gen-go v1.36.11 +// protoc (unknown) // source: conf/conf.proto package conf @@ -2213,7 +2213,7 @@ const file_conf_conf_proto_rawDesc = "" + "\x10force_path_style\x18\t \x01(\bR\x0eforcePathStyle\x12\x1d\n" + "\n" + "account_id\x18\n" + - " \x01(\tR\taccountIdB\x18Z\x16kra/internal/conf;confb\x06proto3" + " \x01(\tR\taccountIdB#Z!kra/app/system/internal/conf;confb\x06proto3" var ( file_conf_conf_proto_rawDescOnce sync.Once diff --git a/internal/conf/conf.proto b/app/system/internal/conf/conf.proto similarity index 98% rename from internal/conf/conf.proto rename to app/system/internal/conf/conf.proto index 5bf64f1..571e583 100644 --- a/internal/conf/conf.proto +++ b/app/system/internal/conf/conf.proto @@ -3,7 +3,7 @@ package kratos.api; import "google/protobuf/duration.proto"; -option go_package = "kra/internal/conf;conf"; +option go_package = "kra/app/system/internal/conf;conf"; message Bootstrap { Server server = 1; @@ -215,3 +215,4 @@ message AdminBackend { string account_id = 10; } } + diff --git a/internal/conf/runtime.go b/app/system/internal/conf/runtime.go similarity index 100% rename from internal/conf/runtime.go rename to app/system/internal/conf/runtime.go diff --git a/internal/conf/runtime_test.go b/app/system/internal/conf/runtime_test.go similarity index 100% rename from internal/conf/runtime_test.go rename to app/system/internal/conf/runtime_test.go diff --git a/app/system/data/config_helpers.go b/app/system/internal/data/config_helpers.go similarity index 95% rename from app/system/data/config_helpers.go rename to app/system/internal/data/config_helpers.go index 33bb9f6..f8f09c5 100644 --- a/app/system/data/config_helpers.go +++ b/app/system/internal/data/config_helpers.go @@ -1,7 +1,7 @@ package data import ( - "kra/internal/conf" + "kra/app/system/internal/conf" "google.golang.org/protobuf/proto" ) diff --git a/app/system/data/config_store.go b/app/system/internal/data/config_store.go similarity index 99% rename from app/system/data/config_store.go rename to app/system/internal/data/config_store.go index 41f16c0..13f6a1a 100644 --- a/app/system/data/config_store.go +++ b/app/system/internal/data/config_store.go @@ -9,8 +9,8 @@ import ( "path/filepath" "strconv" - "kra/app/system/integration/storage" - "kra/internal/conf" + "kra/app/system/internal/conf" + "kra/app/system/internal/integration/storage" "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" diff --git a/app/system/data/config_watch.go b/app/system/internal/data/config_watch.go similarity index 100% rename from app/system/data/config_watch.go rename to app/system/internal/data/config_watch.go diff --git a/app/system/data/data.go b/app/system/internal/data/data.go similarity index 97% rename from app/system/data/data.go rename to app/system/internal/data/data.go index fae521d..ee7d3a5 100644 --- a/app/system/data/data.go +++ b/app/system/internal/data/data.go @@ -11,10 +11,10 @@ import ( "github.com/google/wire" "github.com/redis/go-redis/v9" "gorm.io/gorm" - datapayment "kra/app/system/data/payment" - datasystem "kra/app/system/data/repository" - "kra/app/system/integration/storage" - "kra/internal/conf" + "kra/app/system/internal/conf" + datapayment "kra/app/system/internal/data/payment" + datasystem "kra/app/system/internal/data/repository" + "kra/app/system/internal/integration/storage" "kra/pkg/module" ) diff --git a/app/system/data/data_scope.go b/app/system/internal/data/data_scope.go similarity index 99% rename from app/system/data/data_scope.go rename to app/system/internal/data/data_scope.go index ae1a638..2aab56e 100644 --- a/app/system/data/data_scope.go +++ b/app/system/internal/data/data_scope.go @@ -7,7 +7,7 @@ import ( "reflect" "strings" - "kra/app/system/biz" + "kra/app/system/internal/biz" "gorm.io/gorm" "gorm.io/gorm/clause" diff --git a/app/system/data/data_scope_audit.go b/app/system/internal/data/data_scope_audit.go similarity index 100% rename from app/system/data/data_scope_audit.go rename to app/system/internal/data/data_scope_audit.go diff --git a/app/system/data/data_scope_audit_test.go b/app/system/internal/data/data_scope_audit_test.go similarity index 100% rename from app/system/data/data_scope_audit_test.go rename to app/system/internal/data/data_scope_audit_test.go diff --git a/app/system/data/data_scope_record.go b/app/system/internal/data/data_scope_record.go similarity index 100% rename from app/system/data/data_scope_record.go rename to app/system/internal/data/data_scope_record.go diff --git a/app/system/data/data_scope_test.go b/app/system/internal/data/data_scope_test.go similarity index 99% rename from app/system/data/data_scope_test.go rename to app/system/internal/data/data_scope_test.go index def5769..60edbb4 100644 --- a/app/system/data/data_scope_test.go +++ b/app/system/internal/data/data_scope_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "kra/app/system/biz" + "kra/app/system/internal/biz" "gorm.io/gorm" ) diff --git a/app/system/data/database.go b/app/system/internal/data/database.go similarity index 99% rename from app/system/data/database.go rename to app/system/internal/data/database.go index 350450b..f929dd2 100644 --- a/app/system/data/database.go +++ b/app/system/internal/data/database.go @@ -19,7 +19,7 @@ import ( "gorm.io/gorm" "gorm.io/gorm/logger" "gorm.io/gorm/schema" - "kra/internal/conf" + "kra/app/system/internal/conf" "kra/pkg/database/gormkit" ) diff --git a/app/system/data/gorm_logger_test.go b/app/system/internal/data/gorm_logger_test.go similarity index 97% rename from app/system/data/gorm_logger_test.go rename to app/system/internal/data/gorm_logger_test.go index 40c3e6d..283a683 100644 --- a/app/system/data/gorm_logger_test.go +++ b/app/system/internal/data/gorm_logger_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "kra/internal/logging" "kra/pkg/database/gormkit" + "kra/pkg/logging" "gorm.io/gorm/logger" ) diff --git a/app/system/data/initialization_backend.go b/app/system/internal/data/initialization_backend.go similarity index 98% rename from app/system/data/initialization_backend.go rename to app/system/internal/data/initialization_backend.go index 5190d8c..ec5b409 100644 --- a/app/system/data/initialization_backend.go +++ b/app/system/internal/data/initialization_backend.go @@ -5,9 +5,9 @@ import ( "errors" "fmt" - "kra/app/system/biz" - "kra/app/system/integration/storage" - "kra/internal/conf" + "kra/app/system/internal/biz" + "kra/app/system/internal/conf" + "kra/app/system/internal/integration/storage" "github.com/google/uuid" "google.golang.org/protobuf/encoding/protojson" diff --git a/app/system/data/initialization_backend_test.go b/app/system/internal/data/initialization_backend_test.go similarity index 99% rename from app/system/data/initialization_backend_test.go rename to app/system/internal/data/initialization_backend_test.go index 1677659..09d073b 100644 --- a/app/system/data/initialization_backend_test.go +++ b/app/system/internal/data/initialization_backend_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "kra/internal/conf" + "kra/app/system/internal/conf" "gopkg.in/yaml.v3" ) diff --git a/app/system/data/integration_config.go b/app/system/internal/data/integration_config.go similarity index 99% rename from app/system/data/integration_config.go rename to app/system/internal/data/integration_config.go index e5e59c7..771d963 100644 --- a/app/system/data/integration_config.go +++ b/app/system/internal/data/integration_config.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "kra/internal/conf" + "kra/app/system/internal/conf" "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" diff --git a/app/system/data/integration_config_test.go b/app/system/internal/data/integration_config_test.go similarity index 99% rename from app/system/data/integration_config_test.go rename to app/system/internal/data/integration_config_test.go index 2e5c166..c6959e5 100644 --- a/app/system/data/integration_config_test.go +++ b/app/system/internal/data/integration_config_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "kra/app/system/integration/storage" - "kra/internal/conf" + "kra/app/system/internal/conf" + "kra/app/system/internal/integration/storage" "google.golang.org/protobuf/encoding/protojson" "gopkg.in/yaml.v3" diff --git a/app/system/data/migrations.go b/app/system/internal/data/migrations.go similarity index 88% rename from app/system/data/migrations.go rename to app/system/internal/data/migrations.go index 506eb4f..edd3fca 100644 --- a/app/system/data/migrations.go +++ b/app/system/internal/data/migrations.go @@ -1,8 +1,8 @@ package data import ( - datapayment "kra/app/system/data/payment" - datasystem "kra/app/system/data/repository" + datapayment "kra/app/system/internal/data/payment" + datasystem "kra/app/system/internal/data/repository" "kra/pkg/database/migration" "kra/pkg/module" diff --git a/app/system/data/migrations_test.go b/app/system/internal/data/migrations_test.go similarity index 100% rename from app/system/data/migrations_test.go rename to app/system/internal/data/migrations_test.go diff --git a/app/system/data/mongo.go b/app/system/internal/data/mongo.go similarity index 98% rename from app/system/data/mongo.go rename to app/system/internal/data/mongo.go index a1c7d7f..cd14509 100644 --- a/app/system/data/mongo.go +++ b/app/system/internal/data/mongo.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "kra/internal/conf" + "kra/app/system/internal/conf" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" diff --git a/app/system/data/payment/migrations.go b/app/system/internal/data/payment/migrations.go similarity index 100% rename from app/system/data/payment/migrations.go rename to app/system/internal/data/payment/migrations.go diff --git a/app/system/data/payment/models.go b/app/system/internal/data/payment/models.go similarity index 100% rename from app/system/data/payment/models.go rename to app/system/internal/data/payment/models.go diff --git a/app/system/data/payment/payment.go b/app/system/internal/data/payment/payment.go similarity index 99% rename from app/system/data/payment/payment.go rename to app/system/internal/data/payment/payment.go index a8a2026..d6ac714 100644 --- a/app/system/data/payment/payment.go +++ b/app/system/internal/data/payment/payment.go @@ -11,8 +11,8 @@ import ( "strconv" "strings" - "kra/app/system/biz" - datapayment "kra/app/system/integration/payment" + "kra/app/system/internal/biz" + datapayment "kra/app/system/internal/integration/payment" "gorm.io/gorm" ) diff --git a/app/system/data/payment/payment_config_test.go b/app/system/internal/data/payment/payment_config_test.go similarity index 99% rename from app/system/data/payment/payment_config_test.go rename to app/system/internal/data/payment/payment_config_test.go index 4995319..6886f3a 100644 --- a/app/system/data/payment/payment_config_test.go +++ b/app/system/internal/data/payment/payment_config_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "kra/app/system/biz" + "kra/app/system/internal/biz" ) func TestSavePaymentConfigRequiresDouyinAppIDWhenEnabled(t *testing.T) { diff --git a/app/system/data/payment/payment_helpers.go b/app/system/internal/data/payment/payment_helpers.go similarity index 92% rename from app/system/data/payment/payment_helpers.go rename to app/system/internal/data/payment/payment_helpers.go index a050003..268076e 100644 --- a/app/system/data/payment/payment_helpers.go +++ b/app/system/internal/data/payment/payment_helpers.go @@ -1,6 +1,6 @@ package payment -import "kra/app/system/utils/paymentutil" +import "kra/app/system/internal/utils/paymentutil" func text(values map[string]any, key string) string { value, _ := values[key].(string) diff --git a/app/system/data/payment/payment_native_test.go b/app/system/internal/data/payment/payment_native_test.go similarity index 99% rename from app/system/data/payment/payment_native_test.go rename to app/system/internal/data/payment/payment_native_test.go index 6e96e5e..38d3242 100644 --- a/app/system/data/payment/payment_native_test.go +++ b/app/system/internal/data/payment/payment_native_test.go @@ -5,7 +5,7 @@ import ( "encoding/json" "testing" - "kra/app/system/biz" + "kra/app/system/internal/biz" ) func TestMigrateSeedsPaymentProviders(t *testing.T) { diff --git a/app/system/data/payment/payment_order.go b/app/system/internal/data/payment/payment_order.go similarity index 99% rename from app/system/data/payment/payment_order.go rename to app/system/internal/data/payment/payment_order.go index 8839ac3..d8847bf 100644 --- a/app/system/data/payment/payment_order.go +++ b/app/system/internal/data/payment/payment_order.go @@ -10,7 +10,7 @@ import ( "github.com/google/uuid" "gorm.io/gorm" "gorm.io/gorm/clause" - "kra/app/system/biz" + "kra/app/system/internal/biz" "kra/pkg/database/pagination" ) diff --git a/app/system/data/payment/payment_order_test.go b/app/system/internal/data/payment/payment_order_test.go similarity index 99% rename from app/system/data/payment/payment_order_test.go rename to app/system/internal/data/payment/payment_order_test.go index ef6fbf2..e5eb736 100644 --- a/app/system/data/payment/payment_order_test.go +++ b/app/system/internal/data/payment/payment_order_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "kra/app/system/biz" + "kra/app/system/internal/biz" ) func newPaymentOrderRepoForTest(t *testing.T) *paymentOrderRepo { diff --git a/app/system/data/payment/provider.go b/app/system/internal/data/payment/provider.go similarity index 100% rename from app/system/data/payment/provider.go rename to app/system/internal/data/payment/provider.go diff --git a/app/system/data/payment/testing_support_test.go b/app/system/internal/data/payment/testing_support_test.go similarity index 100% rename from app/system/data/payment/testing_support_test.go rename to app/system/internal/data/payment/testing_support_test.go diff --git a/app/system/data/repository/announcement.go b/app/system/internal/data/repository/announcement.go similarity index 99% rename from app/system/data/repository/announcement.go rename to app/system/internal/data/repository/announcement.go index b2640d5..6f09f3d 100644 --- a/app/system/data/repository/announcement.go +++ b/app/system/internal/data/repository/announcement.go @@ -5,7 +5,7 @@ import ( "encoding/json" "time" - "kra/app/system/biz" + "kra/app/system/internal/biz" "kra/pkg/database/gormkit" "kra/pkg/database/pagination" diff --git a/app/system/data/repository/announcement_test.go b/app/system/internal/data/repository/announcement_test.go similarity index 97% rename from app/system/data/repository/announcement_test.go rename to app/system/internal/data/repository/announcement_test.go index 9ce0c3d..0225c65 100644 --- a/app/system/data/repository/announcement_test.go +++ b/app/system/internal/data/repository/announcement_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "kra/app/system/biz" + "kra/app/system/internal/biz" ) func TestAnnouncementRepositoryKeepsRawIDQuerySemantics(t *testing.T) { diff --git a/app/system/data/repository/api.go b/app/system/internal/data/repository/api.go similarity index 99% rename from app/system/data/repository/api.go rename to app/system/internal/data/repository/api.go index 2c14f48..eda9e5d 100644 --- a/app/system/data/repository/api.go +++ b/app/system/internal/data/repository/api.go @@ -6,7 +6,7 @@ import ( "strconv" "time" - "kra/app/system/biz" + "kra/app/system/internal/biz" "kra/pkg/database/pagination" "gorm.io/gorm" diff --git a/app/system/data/repository/api_policy.go b/app/system/internal/data/repository/api_policy.go similarity index 99% rename from app/system/data/repository/api_policy.go rename to app/system/internal/data/repository/api_policy.go index b60a25a..9bcf877 100644 --- a/app/system/data/repository/api_policy.go +++ b/app/system/internal/data/repository/api_policy.go @@ -5,7 +5,7 @@ import ( "errors" "strconv" - "kra/app/system/biz" + "kra/app/system/internal/biz" "github.com/casbin/casbin/v3" casbinmodel "github.com/casbin/casbin/v3/model" diff --git a/app/system/data/repository/api_policy_test.go b/app/system/internal/data/repository/api_policy_test.go similarity index 98% rename from app/system/data/repository/api_policy_test.go rename to app/system/internal/data/repository/api_policy_test.go index 375dadc..f15bdb0 100644 --- a/app/system/data/repository/api_policy_test.go +++ b/app/system/internal/data/repository/api_policy_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "kra/app/system/biz" - "kra/internal/conf" + "kra/app/system/internal/biz" + "kra/app/system/internal/conf" ) func newPolicyTestData(t *testing.T) *Data { diff --git a/app/system/data/repository/api_sync.go b/app/system/internal/data/repository/api_sync.go similarity index 98% rename from app/system/data/repository/api_sync.go rename to app/system/internal/data/repository/api_sync.go index e0d1237..52d2335 100644 --- a/app/system/data/repository/api_sync.go +++ b/app/system/internal/data/repository/api_sync.go @@ -3,7 +3,7 @@ package system import ( "context" - "kra/app/system/biz" + "kra/app/system/internal/biz" "gorm.io/gorm" ) diff --git a/app/system/data/repository/api_token.go b/app/system/internal/data/repository/api_token.go similarity index 99% rename from app/system/data/repository/api_token.go rename to app/system/internal/data/repository/api_token.go index 558717a..7ec3cbd 100644 --- a/app/system/data/repository/api_token.go +++ b/app/system/internal/data/repository/api_token.go @@ -5,7 +5,7 @@ import ( "errors" "time" - "kra/app/system/biz" + "kra/app/system/internal/biz" "kra/pkg/database/pagination" "gorm.io/gorm" diff --git a/app/system/data/repository/audit.go b/app/system/internal/data/repository/audit.go similarity index 92% rename from app/system/data/repository/audit.go rename to app/system/internal/data/repository/audit.go index e07ea56..bb7d77f 100644 --- a/app/system/data/repository/audit.go +++ b/app/system/internal/data/repository/audit.go @@ -1,6 +1,6 @@ package system -import "kra/app/system/biz" +import "kra/app/system/internal/biz" type auditQueryRepo struct{ data Provider } type auditRecorderRepo struct{ data Provider } diff --git a/app/system/data/repository/audit_delete_test.go b/app/system/internal/data/repository/audit_delete_test.go similarity index 100% rename from app/system/data/repository/audit_delete_test.go rename to app/system/internal/data/repository/audit_delete_test.go diff --git a/app/system/data/repository/authority.go b/app/system/internal/data/repository/authority.go similarity index 99% rename from app/system/data/repository/authority.go rename to app/system/internal/data/repository/authority.go index 392f303..bce997d 100644 --- a/app/system/data/repository/authority.go +++ b/app/system/internal/data/repository/authority.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "kra/app/system/biz" + "kra/app/system/internal/biz" "gorm.io/gorm" ) diff --git a/app/system/data/repository/authority_test.go b/app/system/internal/data/repository/authority_test.go similarity index 99% rename from app/system/data/repository/authority_test.go rename to app/system/internal/data/repository/authority_test.go index 9d336cd..c217d64 100644 --- a/app/system/data/repository/authority_test.go +++ b/app/system/internal/data/repository/authority_test.go @@ -5,8 +5,8 @@ import ( "errors" "testing" - "kra/app/system/biz" - "kra/internal/conf" + "kra/app/system/internal/biz" + "kra/app/system/internal/conf" "gorm.io/gorm" ) diff --git a/app/system/data/repository/bootstrap.go b/app/system/internal/data/repository/bootstrap.go similarity index 100% rename from app/system/data/repository/bootstrap.go rename to app/system/internal/data/repository/bootstrap.go diff --git a/app/system/data/repository/casbin.go b/app/system/internal/data/repository/casbin.go similarity index 100% rename from app/system/data/repository/casbin.go rename to app/system/internal/data/repository/casbin.go diff --git a/app/system/data/repository/data_access_log.go b/app/system/internal/data/repository/data_access_log.go similarity index 98% rename from app/system/data/repository/data_access_log.go rename to app/system/internal/data/repository/data_access_log.go index f5a41cd..0bf97ee 100644 --- a/app/system/data/repository/data_access_log.go +++ b/app/system/internal/data/repository/data_access_log.go @@ -4,7 +4,7 @@ import ( "context" "time" - "kra/app/system/biz" + "kra/app/system/internal/biz" "kra/pkg/database/pagination" "gorm.io/gorm" diff --git a/app/system/data/repository/department.go b/app/system/internal/data/repository/department.go similarity index 99% rename from app/system/data/repository/department.go rename to app/system/internal/data/repository/department.go index d0ff44a..62d7250 100644 --- a/app/system/data/repository/department.go +++ b/app/system/internal/data/repository/department.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "kra/app/system/biz" + "kra/app/system/internal/biz" "gorm.io/gorm" ) diff --git a/app/system/data/repository/dictionary.go b/app/system/internal/data/repository/dictionary.go similarity index 99% rename from app/system/data/repository/dictionary.go rename to app/system/internal/data/repository/dictionary.go index fc7eae5..4e85ff4 100644 --- a/app/system/data/repository/dictionary.go +++ b/app/system/internal/data/repository/dictionary.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "kra/app/system/biz" + "kra/app/system/internal/biz" "kra/pkg/database/pagination" "gorm.io/gorm" diff --git a/app/system/data/repository/dictionary_department_parity_test.go b/app/system/internal/data/repository/dictionary_department_parity_test.go similarity index 99% rename from app/system/data/repository/dictionary_department_parity_test.go rename to app/system/internal/data/repository/dictionary_department_parity_test.go index 37f03aa..efbff74 100644 --- a/app/system/data/repository/dictionary_department_parity_test.go +++ b/app/system/internal/data/repository/dictionary_department_parity_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "kra/app/system/biz" + "kra/app/system/internal/biz" ) func TestDictionaryListPreservesPreloadCollectionShapes(t *testing.T) { diff --git a/app/system/data/repository/error_record.go b/app/system/internal/data/repository/error_record.go similarity index 99% rename from app/system/data/repository/error_record.go rename to app/system/internal/data/repository/error_record.go index 00a3b8f..ef4201b 100644 --- a/app/system/data/repository/error_record.go +++ b/app/system/internal/data/repository/error_record.go @@ -4,7 +4,7 @@ import ( "context" "time" - "kra/app/system/biz" + "kra/app/system/internal/biz" "kra/pkg/database/pagination" "gorm.io/gorm" diff --git a/app/system/data/repository/error_record_test.go b/app/system/internal/data/repository/error_record_test.go similarity index 99% rename from app/system/data/repository/error_record_test.go rename to app/system/internal/data/repository/error_record_test.go index 78171af..f0e50d9 100644 --- a/app/system/data/repository/error_record_test.go +++ b/app/system/internal/data/repository/error_record_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "kra/app/system/biz" + "kra/app/system/internal/biz" ) func errorString(value string) *string { return &value } diff --git a/app/system/data/repository/export.go b/app/system/internal/data/repository/export.go similarity index 99% rename from app/system/data/repository/export.go rename to app/system/internal/data/repository/export.go index ad6b04e..7c9767e 100644 --- a/app/system/data/repository/export.go +++ b/app/system/internal/data/repository/export.go @@ -7,7 +7,7 @@ import ( "fmt" "gorm.io/gorm" "gorm.io/gorm/clause" - "kra/app/system/biz" + "kra/app/system/internal/biz" "strconv" "strings" "time" diff --git a/app/system/data/repository/log_file.go b/app/system/internal/data/repository/log_file.go similarity index 99% rename from app/system/data/repository/log_file.go rename to app/system/internal/data/repository/log_file.go index 690c0f5..0552427 100644 --- a/app/system/data/repository/log_file.go +++ b/app/system/internal/data/repository/log_file.go @@ -14,7 +14,7 @@ import ( "strings" "time" - "kra/app/system/biz" + "kra/app/system/internal/biz" ) const ( diff --git a/app/system/data/repository/log_file_test.go b/app/system/internal/data/repository/log_file_test.go similarity index 95% rename from app/system/data/repository/log_file_test.go rename to app/system/internal/data/repository/log_file_test.go index d9f8efc..844c2f9 100644 --- a/app/system/data/repository/log_file_test.go +++ b/app/system/internal/data/repository/log_file_test.go @@ -7,8 +7,8 @@ import ( "path/filepath" "testing" - "kra/app/system/biz" - "kra/internal/conf" + "kra/app/system/internal/biz" + "kra/app/system/internal/conf" ) func TestLogViewerReadsNestedCategoryFiles(t *testing.T) { diff --git a/app/system/data/repository/login_log.go b/app/system/internal/data/repository/login_log.go similarity index 98% rename from app/system/data/repository/login_log.go rename to app/system/internal/data/repository/login_log.go index 9c30d59..328adbf 100644 --- a/app/system/data/repository/login_log.go +++ b/app/system/internal/data/repository/login_log.go @@ -4,7 +4,7 @@ import ( "context" "time" - "kra/app/system/biz" + "kra/app/system/internal/biz" "kra/pkg/database/pagination" "gorm.io/gorm" diff --git a/app/system/data/repository/media.go b/app/system/internal/data/repository/media.go similarity index 99% rename from app/system/data/repository/media.go rename to app/system/internal/data/repository/media.go index 2b6c824..dcaa7d3 100644 --- a/app/system/data/repository/media.go +++ b/app/system/internal/data/repository/media.go @@ -5,7 +5,7 @@ import ( "errors" "time" - "kra/app/system/biz" + "kra/app/system/internal/biz" "gorm.io/gorm" ) diff --git a/app/system/data/repository/media_test.go b/app/system/internal/data/repository/media_test.go similarity index 96% rename from app/system/data/repository/media_test.go rename to app/system/internal/data/repository/media_test.go index e9394dd..63093ec 100644 --- a/app/system/data/repository/media_test.go +++ b/app/system/internal/data/repository/media_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "kra/app/system/biz" + "kra/app/system/internal/biz" ) func TestMediaListKeepsZeroPageSizeContract(t *testing.T) { diff --git a/app/system/data/repository/media_upload.go b/app/system/internal/data/repository/media_upload.go similarity index 99% rename from app/system/data/repository/media_upload.go rename to app/system/internal/data/repository/media_upload.go index b4484b5..33a8afe 100644 --- a/app/system/data/repository/media_upload.go +++ b/app/system/internal/data/repository/media_upload.go @@ -5,7 +5,7 @@ import ( "errors" "time" - "kra/app/system/biz" + "kra/app/system/internal/biz" "gorm.io/gorm" "gorm.io/gorm/clause" diff --git a/app/system/data/repository/menu.go b/app/system/internal/data/repository/menu.go similarity index 99% rename from app/system/data/repository/menu.go rename to app/system/internal/data/repository/menu.go index c2635f4..c2ead14 100644 --- a/app/system/data/repository/menu.go +++ b/app/system/internal/data/repository/menu.go @@ -5,7 +5,7 @@ import ( "errors" "time" - "kra/app/system/biz" + "kra/app/system/internal/biz" "gorm.io/gorm" ) diff --git a/app/system/data/repository/menu_test.go b/app/system/internal/data/repository/menu_test.go similarity index 99% rename from app/system/data/repository/menu_test.go rename to app/system/internal/data/repository/menu_test.go index b2f4d36..d6ebb2e 100644 --- a/app/system/data/repository/menu_test.go +++ b/app/system/internal/data/repository/menu_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "kra/app/system/biz" - "kra/internal/conf" + "kra/app/system/internal/biz" + "kra/app/system/internal/conf" ) func newMenuTestData(t *testing.T) *Data { diff --git a/app/system/data/repository/migrations.go b/app/system/internal/data/repository/migrations.go similarity index 100% rename from app/system/data/repository/migrations.go rename to app/system/internal/data/repository/migrations.go diff --git a/app/system/data/repository/migrations_test.go b/app/system/internal/data/repository/migrations_test.go similarity index 100% rename from app/system/data/repository/migrations_test.go rename to app/system/internal/data/repository/migrations_test.go diff --git a/app/system/data/repository/models.go b/app/system/internal/data/repository/models.go similarity index 98% rename from app/system/data/repository/models.go rename to app/system/internal/data/repository/models.go index ac5edfd..a44699d 100644 --- a/app/system/data/repository/models.go +++ b/app/system/internal/data/repository/models.go @@ -3,7 +3,7 @@ package system import ( "time" - "kra/app/system/biz" + "kra/app/system/internal/biz" "gorm.io/gorm" ) diff --git a/app/system/data/repository/operation_log.go b/app/system/internal/data/repository/operation_log.go similarity index 99% rename from app/system/data/repository/operation_log.go rename to app/system/internal/data/repository/operation_log.go index feb9afd..c0ed61c 100644 --- a/app/system/data/repository/operation_log.go +++ b/app/system/internal/data/repository/operation_log.go @@ -4,7 +4,7 @@ import ( "context" "time" - "kra/app/system/biz" + "kra/app/system/internal/biz" "kra/pkg/database/pagination" "gorm.io/gorm" diff --git a/app/system/data/repository/organization_test.go b/app/system/internal/data/repository/organization_test.go similarity index 100% rename from app/system/data/repository/organization_test.go rename to app/system/internal/data/repository/organization_test.go diff --git a/app/system/data/repository/parameter.go b/app/system/internal/data/repository/parameter.go similarity index 99% rename from app/system/data/repository/parameter.go rename to app/system/internal/data/repository/parameter.go index e2ceda1..fd72c17 100644 --- a/app/system/data/repository/parameter.go +++ b/app/system/internal/data/repository/parameter.go @@ -4,7 +4,7 @@ import ( "context" "time" - "kra/app/system/biz" + "kra/app/system/internal/biz" "kra/pkg/database/pagination" "gorm.io/gorm" diff --git a/app/system/data/repository/parameter_test.go b/app/system/internal/data/repository/parameter_test.go similarity index 98% rename from app/system/data/repository/parameter_test.go rename to app/system/internal/data/repository/parameter_test.go index 10c6284..e2a083c 100644 --- a/app/system/data/repository/parameter_test.go +++ b/app/system/internal/data/repository/parameter_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "kra/app/system/biz" + "kra/app/system/internal/biz" ) func TestParameterRepositoryPreservesModelMetadata(t *testing.T) { diff --git a/app/system/data/repository/permission.go b/app/system/internal/data/repository/permission.go similarity index 99% rename from app/system/data/repository/permission.go rename to app/system/internal/data/repository/permission.go index 2e7cc30..cd43c04 100644 --- a/app/system/data/repository/permission.go +++ b/app/system/internal/data/repository/permission.go @@ -5,7 +5,7 @@ import ( "errors" "time" - "kra/app/system/biz" + "kra/app/system/internal/biz" "gorm.io/gorm" ) diff --git a/app/system/data/repository/permission_test.go b/app/system/internal/data/repository/permission_test.go similarity index 98% rename from app/system/data/repository/permission_test.go rename to app/system/internal/data/repository/permission_test.go index c4ff916..66e8aad 100644 --- a/app/system/data/repository/permission_test.go +++ b/app/system/internal/data/repository/permission_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "kra/app/system/biz" - "kra/internal/conf" + "kra/app/system/internal/biz" + "kra/app/system/internal/conf" ) func TestPermissionSelectedButtonsEmptyShape(t *testing.T) { diff --git a/app/system/data/repository/position.go b/app/system/internal/data/repository/position.go similarity index 99% rename from app/system/data/repository/position.go rename to app/system/internal/data/repository/position.go index ba6cf32..24c605d 100644 --- a/app/system/data/repository/position.go +++ b/app/system/internal/data/repository/position.go @@ -5,7 +5,7 @@ import ( "errors" "time" - "kra/app/system/biz" + "kra/app/system/internal/biz" "gorm.io/gorm" ) diff --git a/app/system/data/repository/provider.go b/app/system/internal/data/repository/provider.go similarity index 90% rename from app/system/data/repository/provider.go rename to app/system/internal/data/repository/provider.go index e8f1b80..56a1a00 100644 --- a/app/system/data/repository/provider.go +++ b/app/system/internal/data/repository/provider.go @@ -1,7 +1,7 @@ package system import ( - "kra/internal/conf" + "kra/app/system/internal/conf" "gorm.io/gorm" ) diff --git a/app/system/data/repository/runtime.go b/app/system/internal/data/repository/runtime.go similarity index 97% rename from app/system/data/repository/runtime.go rename to app/system/internal/data/repository/runtime.go index b4ace01..9ae2d48 100644 --- a/app/system/data/repository/runtime.go +++ b/app/system/internal/data/repository/runtime.go @@ -6,9 +6,9 @@ import ( "errors" "time" - "kra/app/system/biz" - "kra/app/system/security/adminauth" - "kra/internal/conf" + "kra/app/system/internal/biz" + "kra/app/system/internal/conf" + "kra/app/system/internal/security/adminauth" jwt "github.com/golang-jwt/jwt/v5" ) diff --git a/app/system/data/repository/security.go b/app/system/internal/data/repository/security.go similarity index 99% rename from app/system/data/repository/security.go rename to app/system/internal/data/repository/security.go index 358fb76..3bd8f31 100644 --- a/app/system/data/repository/security.go +++ b/app/system/internal/data/repository/security.go @@ -5,7 +5,7 @@ import ( "errors" "time" - "kra/app/system/biz" + "kra/app/system/internal/biz" "gorm.io/gorm" ) diff --git a/app/system/data/repository/seed.go b/app/system/internal/data/repository/seed.go similarity index 99% rename from app/system/data/repository/seed.go rename to app/system/internal/data/repository/seed.go index 5852cfa..f3d4d8e 100644 --- a/app/system/data/repository/seed.go +++ b/app/system/internal/data/repository/seed.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "kra/app/system/biz" + "kra/app/system/internal/biz" platformmodule "kra/pkg/module" "github.com/google/uuid" diff --git a/app/system/data/repository/seed_test.go b/app/system/internal/data/repository/seed_test.go similarity index 98% rename from app/system/data/repository/seed_test.go rename to app/system/internal/data/repository/seed_test.go index 223c3d9..d706044 100644 --- a/app/system/data/repository/seed_test.go +++ b/app/system/internal/data/repository/seed_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "kra/app/system/biz" + "kra/app/system/internal/biz" platformmodule "kra/pkg/module" ) diff --git a/app/system/data/repository/system_init_ignore_test.go b/app/system/internal/data/repository/system_init_ignore_test.go similarity index 100% rename from app/system/data/repository/system_init_ignore_test.go rename to app/system/internal/data/repository/system_init_ignore_test.go diff --git a/app/system/data/repository/task.go b/app/system/internal/data/repository/task.go similarity index 99% rename from app/system/data/repository/task.go rename to app/system/internal/data/repository/task.go index b03b177..5a426c9 100644 --- a/app/system/data/repository/task.go +++ b/app/system/internal/data/repository/task.go @@ -2,7 +2,7 @@ package system import ( "context" - "kra/app/system/biz" + "kra/app/system/internal/biz" "kra/pkg/database/gormkit" "kra/pkg/database/pagination" "time" diff --git a/app/system/data/repository/testing_support_test.go b/app/system/internal/data/repository/testing_support_test.go similarity index 98% rename from app/system/data/repository/testing_support_test.go rename to app/system/internal/data/repository/testing_support_test.go index 8c8a311..39a5d5c 100644 --- a/app/system/data/repository/testing_support_test.go +++ b/app/system/internal/data/repository/testing_support_test.go @@ -7,7 +7,7 @@ import ( "github.com/glebarez/sqlite" "gorm.io/gorm" - "kra/internal/conf" + "kra/app/system/internal/conf" ) // Data is a small in-package test harness. Production repositories depend on diff --git a/app/system/data/repository/transactions_test.go b/app/system/internal/data/repository/transactions_test.go similarity index 99% rename from app/system/data/repository/transactions_test.go rename to app/system/internal/data/repository/transactions_test.go index a3f5a62..cc989b3 100644 --- a/app/system/data/repository/transactions_test.go +++ b/app/system/internal/data/repository/transactions_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "kra/app/system/biz" - "kra/internal/conf" + "kra/app/system/internal/biz" + "kra/app/system/internal/conf" ) func newTransactionTestData(t *testing.T) *Data { diff --git a/app/system/data/repository/user.go b/app/system/internal/data/repository/user.go similarity index 99% rename from app/system/data/repository/user.go rename to app/system/internal/data/repository/user.go index 5b866f9..8323a8b 100644 --- a/app/system/data/repository/user.go +++ b/app/system/internal/data/repository/user.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "kra/app/system/biz" + "kra/app/system/internal/biz" "kra/pkg/database/pagination" "github.com/google/uuid" diff --git a/app/system/data/repository/user_strict_test.go b/app/system/internal/data/repository/user_strict_test.go similarity index 99% rename from app/system/data/repository/user_strict_test.go rename to app/system/internal/data/repository/user_strict_test.go index f3b2467..4e37284 100644 --- a/app/system/data/repository/user_strict_test.go +++ b/app/system/internal/data/repository/user_strict_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "kra/app/system/biz" + "kra/app/system/internal/biz" ) func seedStrictUserTree(t *testing.T, data *Data) (actorID, childID, siblingID uint, users []userPO) { diff --git a/app/system/data/repository/version.go b/app/system/internal/data/repository/version.go similarity index 99% rename from app/system/data/repository/version.go rename to app/system/internal/data/repository/version.go index ef79add..4e1b984 100644 --- a/app/system/data/repository/version.go +++ b/app/system/internal/data/repository/version.go @@ -6,7 +6,7 @@ import ( "time" "gorm.io/gorm" - "kra/app/system/biz" + "kra/app/system/internal/biz" "kra/pkg/database/pagination" ) diff --git a/app/system/data/repository/version_test.go b/app/system/internal/data/repository/version_test.go similarity index 100% rename from app/system/data/repository/version_test.go rename to app/system/internal/data/repository/version_test.go diff --git a/app/system/data/runtime_clients.go b/app/system/internal/data/runtime_clients.go similarity index 100% rename from app/system/data/runtime_clients.go rename to app/system/internal/data/runtime_clients.go diff --git a/app/system/dto/announcement.go b/app/system/internal/dto/announcement.go similarity index 100% rename from app/system/dto/announcement.go rename to app/system/internal/dto/announcement.go diff --git a/app/system/dto/api.go b/app/system/internal/dto/api.go similarity index 100% rename from app/system/dto/api.go rename to app/system/internal/dto/api.go diff --git a/app/system/dto/audit.go b/app/system/internal/dto/audit.go similarity index 100% rename from app/system/dto/audit.go rename to app/system/internal/dto/audit.go diff --git a/app/system/dto/audit_test.go b/app/system/internal/dto/audit_test.go similarity index 100% rename from app/system/dto/audit_test.go rename to app/system/internal/dto/audit_test.go diff --git a/app/system/dto/authentication.go b/app/system/internal/dto/authentication.go similarity index 100% rename from app/system/dto/authentication.go rename to app/system/internal/dto/authentication.go diff --git a/app/system/dto/authority.go b/app/system/internal/dto/authority.go similarity index 100% rename from app/system/dto/authority.go rename to app/system/internal/dto/authority.go diff --git a/app/system/dto/email.go b/app/system/internal/dto/email.go similarity index 100% rename from app/system/dto/email.go rename to app/system/internal/dto/email.go diff --git a/app/system/dto/export.go b/app/system/internal/dto/export.go similarity index 100% rename from app/system/dto/export.go rename to app/system/internal/dto/export.go diff --git a/app/system/dto/media.go b/app/system/internal/dto/media.go similarity index 100% rename from app/system/dto/media.go rename to app/system/internal/dto/media.go diff --git a/app/system/dto/menu.go b/app/system/internal/dto/menu.go similarity index 100% rename from app/system/dto/menu.go rename to app/system/internal/dto/menu.go diff --git a/app/system/dto/organization.go b/app/system/internal/dto/organization.go similarity index 100% rename from app/system/dto/organization.go rename to app/system/internal/dto/organization.go diff --git a/app/system/dto/payment.go b/app/system/internal/dto/payment.go similarity index 100% rename from app/system/dto/payment.go rename to app/system/internal/dto/payment.go diff --git a/app/system/dto/permission.go b/app/system/internal/dto/permission.go similarity index 100% rename from app/system/dto/permission.go rename to app/system/internal/dto/permission.go diff --git a/app/system/dto/settings.go b/app/system/internal/dto/settings.go similarity index 100% rename from app/system/dto/settings.go rename to app/system/internal/dto/settings.go diff --git a/app/system/dto/system.go b/app/system/internal/dto/system.go similarity index 100% rename from app/system/dto/system.go rename to app/system/internal/dto/system.go diff --git a/app/system/dto/system_config.go b/app/system/internal/dto/system_config.go similarity index 100% rename from app/system/dto/system_config.go rename to app/system/internal/dto/system_config.go diff --git a/app/system/dto/system_init.go b/app/system/internal/dto/system_init.go similarity index 100% rename from app/system/dto/system_init.go rename to app/system/internal/dto/system_init.go diff --git a/app/system/dto/task.go b/app/system/internal/dto/task.go similarity index 100% rename from app/system/dto/task.go rename to app/system/internal/dto/task.go diff --git a/app/system/dto/version.go b/app/system/internal/dto/version.go similarity index 100% rename from app/system/dto/version.go rename to app/system/internal/dto/version.go diff --git a/app/system/initialize/backend.go b/app/system/internal/initialize/backend.go similarity index 91% rename from app/system/initialize/backend.go rename to app/system/internal/initialize/backend.go index 335ed2b..23dba3e 100644 --- a/app/system/initialize/backend.go +++ b/app/system/internal/initialize/backend.go @@ -3,8 +3,8 @@ package initialize import ( "context" - "kra/app/system/biz" - "kra/internal/conf" + "kra/app/system/internal/biz" + "kra/app/system/internal/conf" "gorm.io/gorm" ) diff --git a/app/system/initialize/compatibility.go b/app/system/internal/initialize/compatibility.go similarity index 99% rename from app/system/initialize/compatibility.go rename to app/system/internal/initialize/compatibility.go index 94bee24..6615c64 100644 --- a/app/system/initialize/compatibility.go +++ b/app/system/internal/initialize/compatibility.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "kra/internal/conf" + "kra/app/system/internal/conf" "google.golang.org/protobuf/types/known/durationpb" ) diff --git a/app/system/initialize/configuration.go b/app/system/internal/initialize/configuration.go similarity index 99% rename from app/system/initialize/configuration.go rename to app/system/internal/initialize/configuration.go index 4b4a735..4ae9c9b 100644 --- a/app/system/initialize/configuration.go +++ b/app/system/internal/initialize/configuration.go @@ -4,8 +4,8 @@ import ( "context" "encoding/json" - "kra/app/system/utils/configutil" - "kra/internal/conf" + "kra/app/system/internal/conf" + "kra/app/system/internal/utils/configutil" "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" diff --git a/app/system/initialize/initialize.go b/app/system/internal/initialize/initialize.go similarity index 93% rename from app/system/initialize/initialize.go rename to app/system/internal/initialize/initialize.go index e8e46fe..85692af 100644 --- a/app/system/initialize/initialize.go +++ b/app/system/internal/initialize/initialize.go @@ -3,8 +3,8 @@ package initialize import ( "context" - "kra/app/system/biz" - datasystem "kra/app/system/data/repository" + "kra/app/system/internal/biz" + datasystem "kra/app/system/internal/data/repository" platformmodule "kra/pkg/module" "gorm.io/gorm" diff --git a/app/system/initialize/provider.go b/app/system/internal/initialize/provider.go similarity index 100% rename from app/system/initialize/provider.go rename to app/system/internal/initialize/provider.go diff --git a/app/system/integration/README.md b/app/system/internal/integration/README.md similarity index 100% rename from app/system/integration/README.md rename to app/system/internal/integration/README.md diff --git a/app/system/integration/cache/cache.go b/app/system/internal/integration/cache/cache.go similarity index 98% rename from app/system/integration/cache/cache.go rename to app/system/internal/integration/cache/cache.go index 0f39a40..e146b0e 100644 --- a/app/system/integration/cache/cache.go +++ b/app/system/internal/integration/cache/cache.go @@ -7,7 +7,7 @@ import ( "time" "github.com/redis/go-redis/v9" - "kra/app/system/biz" + "kra/app/system/internal/biz" ) type RedisProvider interface { diff --git a/app/system/integration/email/email.go b/app/system/internal/integration/email/email.go similarity index 98% rename from app/system/integration/email/email.go rename to app/system/internal/integration/email/email.go index cad5e07..9162eb5 100644 --- a/app/system/integration/email/email.go +++ b/app/system/internal/integration/email/email.go @@ -12,8 +12,8 @@ import ( "strings" "time" - "kra/app/system/biz" - "kra/internal/conf" + "kra/app/system/internal/biz" + "kra/app/system/internal/conf" ) type emailRepo struct { diff --git a/app/system/integration/payment/adapter.go b/app/system/internal/integration/payment/adapter.go similarity index 98% rename from app/system/integration/payment/adapter.go rename to app/system/internal/integration/payment/adapter.go index efd4e1f..2703688 100644 --- a/app/system/integration/payment/adapter.go +++ b/app/system/internal/integration/payment/adapter.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "kra/app/system/biz" + "kra/app/system/internal/biz" ) // Adapter is the provider boundary used by the payment repository. Provider diff --git a/app/system/integration/payment/adapter_test.go b/app/system/internal/integration/payment/adapter_test.go similarity index 92% rename from app/system/integration/payment/adapter_test.go rename to app/system/internal/integration/payment/adapter_test.go index eeb1f51..c6a37cf 100644 --- a/app/system/integration/payment/adapter_test.go +++ b/app/system/internal/integration/payment/adapter_test.go @@ -3,7 +3,7 @@ package payment import ( "testing" - "kra/app/system/biz" + "kra/app/system/internal/biz" ) func TestEverySupportedProviderHasAdapter(t *testing.T) { diff --git a/app/system/integration/payment/alipay.go b/app/system/internal/integration/payment/alipay.go similarity index 99% rename from app/system/integration/payment/alipay.go rename to app/system/internal/integration/payment/alipay.go index 1e4b8e3..f762398 100644 --- a/app/system/integration/payment/alipay.go +++ b/app/system/internal/integration/payment/alipay.go @@ -13,7 +13,7 @@ import ( "strings" "time" - "kra/app/system/biz" + "kra/app/system/internal/biz" "github.com/go-pay/gopay" gopayAlipay "github.com/go-pay/gopay/alipay" diff --git a/app/system/integration/payment/alipay_v3.go b/app/system/internal/integration/payment/alipay_v3.go similarity index 99% rename from app/system/integration/payment/alipay_v3.go rename to app/system/internal/integration/payment/alipay_v3.go index 0a46c15..fb40cb0 100644 --- a/app/system/integration/payment/alipay_v3.go +++ b/app/system/internal/integration/payment/alipay_v3.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "kra/app/system/biz" + "kra/app/system/internal/biz" "github.com/go-pay/gopay" gopayAlipay "github.com/go-pay/gopay/alipay" diff --git a/app/system/integration/payment/alipay_v3_test.go b/app/system/internal/integration/payment/alipay_v3_test.go similarity index 99% rename from app/system/integration/payment/alipay_v3_test.go rename to app/system/internal/integration/payment/alipay_v3_test.go index 1a38b0f..e4dccfb 100644 --- a/app/system/integration/payment/alipay_v3_test.go +++ b/app/system/internal/integration/payment/alipay_v3_test.go @@ -17,7 +17,7 @@ import ( "testing" "time" - "kra/app/system/biz" + "kra/app/system/internal/biz" gopayAlipay "github.com/go-pay/gopay/alipay" gopayAlipayV3 "github.com/go-pay/gopay/alipay/v3" diff --git a/app/system/integration/payment/allinpay.go b/app/system/internal/integration/payment/allinpay.go similarity index 99% rename from app/system/integration/payment/allinpay.go rename to app/system/internal/integration/payment/allinpay.go index f8920f9..f0a423a 100644 --- a/app/system/integration/payment/allinpay.go +++ b/app/system/internal/integration/payment/allinpay.go @@ -15,7 +15,7 @@ import ( "strings" "sync" - "kra/app/system/biz" + "kra/app/system/internal/biz" "github.com/go-pay/crypto/xpem" "github.com/go-pay/crypto/xrsa" diff --git a/app/system/integration/payment/allinpay_test.go b/app/system/internal/integration/payment/allinpay_test.go similarity index 99% rename from app/system/integration/payment/allinpay_test.go rename to app/system/internal/integration/payment/allinpay_test.go index 966d0ed..578c5c1 100644 --- a/app/system/integration/payment/allinpay_test.go +++ b/app/system/internal/integration/payment/allinpay_test.go @@ -18,7 +18,7 @@ import ( "strings" "testing" - "kra/app/system/biz" + "kra/app/system/internal/biz" "github.com/go-pay/gopay" "github.com/go-pay/gopay/allinpay" diff --git a/app/system/integration/payment/apple.go b/app/system/internal/integration/payment/apple.go similarity index 99% rename from app/system/integration/payment/apple.go rename to app/system/internal/integration/payment/apple.go index 34ada1c..f8d7a1d 100644 --- a/app/system/integration/payment/apple.go +++ b/app/system/internal/integration/payment/apple.go @@ -8,7 +8,7 @@ import ( "math" "strings" - "kra/app/system/biz" + "kra/app/system/internal/biz" gopayApple "github.com/go-pay/gopay/apple" "github.com/google/uuid" diff --git a/app/system/integration/payment/apple_jws.go b/app/system/internal/integration/payment/apple_jws.go similarity index 100% rename from app/system/integration/payment/apple_jws.go rename to app/system/internal/integration/payment/apple_jws.go diff --git a/app/system/integration/payment/apple_jws_test.go b/app/system/internal/integration/payment/apple_jws_test.go similarity index 100% rename from app/system/integration/payment/apple_jws_test.go rename to app/system/internal/integration/payment/apple_jws_test.go diff --git a/app/system/integration/payment/douyin.go b/app/system/internal/integration/payment/douyin.go similarity index 99% rename from app/system/integration/payment/douyin.go rename to app/system/internal/integration/payment/douyin.go index 3f0aaeb..87580cc 100644 --- a/app/system/integration/payment/douyin.go +++ b/app/system/internal/integration/payment/douyin.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "kra/app/system/biz" + "kra/app/system/internal/biz" "github.com/go-pay/gopay" "github.com/go-pay/gopay/douyin" diff --git a/app/system/integration/payment/gopay.go b/app/system/internal/integration/payment/gopay.go similarity index 100% rename from app/system/integration/payment/gopay.go rename to app/system/internal/integration/payment/gopay.go diff --git a/app/system/integration/payment/gopay_helpers.go b/app/system/internal/integration/payment/gopay_helpers.go similarity index 99% rename from app/system/integration/payment/gopay_helpers.go rename to app/system/internal/integration/payment/gopay_helpers.go index 2a1dcc3..66f5768 100644 --- a/app/system/integration/payment/gopay_helpers.go +++ b/app/system/internal/integration/payment/gopay_helpers.go @@ -7,7 +7,7 @@ import ( "net/http" "strings" - "kra/app/system/biz" + "kra/app/system/internal/biz" "github.com/go-pay/gopay" "github.com/go-pay/gopay/douyin" diff --git a/app/system/integration/payment/gopay_test.go b/app/system/internal/integration/payment/gopay_test.go similarity index 99% rename from app/system/integration/payment/gopay_test.go rename to app/system/internal/integration/payment/gopay_test.go index f4c3f39..4500981 100644 --- a/app/system/integration/payment/gopay_test.go +++ b/app/system/internal/integration/payment/gopay_test.go @@ -20,8 +20,8 @@ import ( "strings" "testing" - "kra/app/system/biz" - "kra/app/system/utils/paymentutil" + "kra/app/system/internal/biz" + "kra/app/system/internal/utils/paymentutil" gopayAlipay "github.com/go-pay/gopay/alipay" gopayDouyin "github.com/go-pay/gopay/douyin" diff --git a/app/system/integration/payment/identity_test.go b/app/system/internal/integration/payment/identity_test.go similarity index 99% rename from app/system/integration/payment/identity_test.go rename to app/system/internal/integration/payment/identity_test.go index 6bc43dc..d0341e3 100644 --- a/app/system/integration/payment/identity_test.go +++ b/app/system/internal/integration/payment/identity_test.go @@ -18,7 +18,7 @@ import ( "strings" "testing" - "kra/app/system/biz" + "kra/app/system/internal/biz" "github.com/go-pay/gopay" "github.com/go-pay/gopay/allinpay" diff --git a/app/system/integration/payment/lakala.go b/app/system/internal/integration/payment/lakala.go similarity index 99% rename from app/system/integration/payment/lakala.go rename to app/system/internal/integration/payment/lakala.go index 95503ff..9d4f608 100644 --- a/app/system/integration/payment/lakala.go +++ b/app/system/internal/integration/payment/lakala.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - "kra/app/system/biz" + "kra/app/system/internal/biz" "github.com/go-pay/gopay" "github.com/go-pay/gopay/lakala" diff --git a/app/system/integration/payment/lakala_test.go b/app/system/internal/integration/payment/lakala_test.go similarity index 99% rename from app/system/integration/payment/lakala_test.go rename to app/system/internal/integration/payment/lakala_test.go index c5ea5ef..8688bba 100644 --- a/app/system/integration/payment/lakala_test.go +++ b/app/system/internal/integration/payment/lakala_test.go @@ -3,7 +3,7 @@ package payment import ( "testing" - "kra/app/system/biz" + "kra/app/system/internal/biz" "github.com/go-pay/gopay/lakala" ) diff --git a/app/system/integration/payment/native_test.go b/app/system/internal/integration/payment/native_test.go similarity index 99% rename from app/system/integration/payment/native_test.go rename to app/system/internal/integration/payment/native_test.go index cab9999..1ef401b 100644 --- a/app/system/integration/payment/native_test.go +++ b/app/system/internal/integration/payment/native_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "kra/app/system/biz" + "kra/app/system/internal/biz" ) func TestWechatV2SignOfficialStyle(t *testing.T) { diff --git a/app/system/integration/payment/paypal.go b/app/system/internal/integration/payment/paypal.go similarity index 99% rename from app/system/integration/payment/paypal.go rename to app/system/internal/integration/payment/paypal.go index c426d71..ccd2767 100644 --- a/app/system/integration/payment/paypal.go +++ b/app/system/internal/integration/payment/paypal.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "kra/app/system/biz" + "kra/app/system/internal/biz" "github.com/go-pay/gopay" "github.com/go-pay/gopay/paypal" diff --git a/app/system/integration/payment/paypal_test.go b/app/system/internal/integration/payment/paypal_test.go similarity index 99% rename from app/system/integration/payment/paypal_test.go rename to app/system/internal/integration/payment/paypal_test.go index 6ec61b5..105c19d 100644 --- a/app/system/integration/payment/paypal_test.go +++ b/app/system/internal/integration/payment/paypal_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "kra/app/system/biz" + "kra/app/system/internal/biz" "github.com/go-pay/gopay/paypal" ) diff --git a/app/system/integration/payment/qq.go b/app/system/internal/integration/payment/qq.go similarity index 99% rename from app/system/integration/payment/qq.go rename to app/system/internal/integration/payment/qq.go index 94822ca..5475bb6 100644 --- a/app/system/integration/payment/qq.go +++ b/app/system/internal/integration/payment/qq.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "kra/app/system/biz" + "kra/app/system/internal/biz" "github.com/go-pay/gopay" gopayQQ "github.com/go-pay/gopay/qq" diff --git a/app/system/integration/payment/qq_test.go b/app/system/internal/integration/payment/qq_test.go similarity index 98% rename from app/system/integration/payment/qq_test.go rename to app/system/internal/integration/payment/qq_test.go index 3fe2d28..65026c9 100644 --- a/app/system/integration/payment/qq_test.go +++ b/app/system/internal/integration/payment/qq_test.go @@ -11,8 +11,8 @@ import ( "net/http/httptest" "testing" - "kra/app/system/biz" - "kra/app/system/utils/paymentutil" + "kra/app/system/internal/biz" + "kra/app/system/internal/utils/paymentutil" "github.com/go-pay/gopay" gopayQQ "github.com/go-pay/gopay/qq" diff --git a/app/system/integration/payment/refund_boundary_test.go b/app/system/internal/integration/payment/refund_boundary_test.go similarity index 99% rename from app/system/integration/payment/refund_boundary_test.go rename to app/system/internal/integration/payment/refund_boundary_test.go index 235dc4d..6c2621d 100644 --- a/app/system/integration/payment/refund_boundary_test.go +++ b/app/system/internal/integration/payment/refund_boundary_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "kra/app/system/biz" + "kra/app/system/internal/biz" "github.com/go-pay/gopay" gopayQQ "github.com/go-pay/gopay/qq" diff --git a/app/system/integration/payment/response_validation_test.go b/app/system/internal/integration/payment/response_validation_test.go similarity index 99% rename from app/system/integration/payment/response_validation_test.go rename to app/system/internal/integration/payment/response_validation_test.go index 9a334b7..78a32dd 100644 --- a/app/system/integration/payment/response_validation_test.go +++ b/app/system/internal/integration/payment/response_validation_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "kra/app/system/biz" + "kra/app/system/internal/biz" gopayAlipay "github.com/go-pay/gopay/alipay" "github.com/go-pay/gopay/douyin" diff --git a/app/system/integration/payment/result.go b/app/system/internal/integration/payment/result.go similarity index 98% rename from app/system/integration/payment/result.go rename to app/system/internal/integration/payment/result.go index 89e6be5..a75e493 100644 --- a/app/system/integration/payment/result.go +++ b/app/system/internal/integration/payment/result.go @@ -7,8 +7,8 @@ import ( "net/url" "strings" - "kra/app/system/biz" - "kra/app/system/utils/paymentutil" + "kra/app/system/internal/biz" + "kra/app/system/internal/utils/paymentutil" ) func callbackFields(callback *biz.PaymentCallback) map[string]string { diff --git a/app/system/integration/payment/result_test.go b/app/system/internal/integration/payment/result_test.go similarity index 93% rename from app/system/integration/payment/result_test.go rename to app/system/internal/integration/payment/result_test.go index fe8a230..80d3d6d 100644 --- a/app/system/integration/payment/result_test.go +++ b/app/system/internal/integration/payment/result_test.go @@ -3,7 +3,7 @@ package payment import ( "testing" - "kra/app/system/biz" + "kra/app/system/internal/biz" ) func TestCallbackFieldsAcceptsCaseInsensitiveContentType(t *testing.T) { diff --git a/app/system/integration/payment/saobei.go b/app/system/internal/integration/payment/saobei.go similarity index 99% rename from app/system/integration/payment/saobei.go rename to app/system/internal/integration/payment/saobei.go index f95a8a9..2b68adf 100644 --- a/app/system/integration/payment/saobei.go +++ b/app/system/internal/integration/payment/saobei.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "kra/app/system/biz" + "kra/app/system/internal/biz" "github.com/go-pay/gopay" "github.com/go-pay/gopay/saobei" diff --git a/app/system/integration/payment/saobei_test.go b/app/system/internal/integration/payment/saobei_test.go similarity index 99% rename from app/system/integration/payment/saobei_test.go rename to app/system/internal/integration/payment/saobei_test.go index 0eeabad..6fdef6a 100644 --- a/app/system/integration/payment/saobei_test.go +++ b/app/system/internal/integration/payment/saobei_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "kra/app/system/biz" + "kra/app/system/internal/biz" "github.com/go-pay/gopay" "github.com/go-pay/gopay/saobei" diff --git a/app/system/integration/payment/vendor.go b/app/system/internal/integration/payment/vendor.go similarity index 99% rename from app/system/integration/payment/vendor.go rename to app/system/internal/integration/payment/vendor.go index 6777d6b..9cc350e 100644 --- a/app/system/integration/payment/vendor.go +++ b/app/system/internal/integration/payment/vendor.go @@ -14,8 +14,8 @@ import ( "strings" "time" - "kra/app/system/biz" - "kra/app/system/utils/paymentutil" + "kra/app/system/internal/biz" + "kra/app/system/internal/utils/paymentutil" ) type vendorProfile string diff --git a/app/system/integration/payment/vendor_test.go b/app/system/internal/integration/payment/vendor_test.go similarity index 100% rename from app/system/integration/payment/vendor_test.go rename to app/system/internal/integration/payment/vendor_test.go diff --git a/app/system/integration/payment/wechat_v2.go b/app/system/internal/integration/payment/wechat_v2.go similarity index 99% rename from app/system/integration/payment/wechat_v2.go rename to app/system/internal/integration/payment/wechat_v2.go index dc3df38..9dfe19d 100644 --- a/app/system/integration/payment/wechat_v2.go +++ b/app/system/internal/integration/payment/wechat_v2.go @@ -13,7 +13,7 @@ import ( "strings" "time" - "kra/app/system/biz" + "kra/app/system/internal/biz" "github.com/go-pay/gopay" "github.com/go-pay/gopay/pkg/xhttp" diff --git a/app/system/integration/payment/wechat_v3.go b/app/system/internal/integration/payment/wechat_v3.go similarity index 99% rename from app/system/integration/payment/wechat_v3.go rename to app/system/internal/integration/payment/wechat_v3.go index e5807e3..e35884c 100644 --- a/app/system/integration/payment/wechat_v3.go +++ b/app/system/internal/integration/payment/wechat_v3.go @@ -13,7 +13,7 @@ import ( "strings" "time" - "kra/app/system/biz" + "kra/app/system/internal/biz" "github.com/go-pay/gopay" gopayWechatV3 "github.com/go-pay/gopay/wechat/v3" diff --git a/app/system/integration/payment/wechat_v3_codepay_test.go b/app/system/internal/integration/payment/wechat_v3_codepay_test.go similarity index 99% rename from app/system/integration/payment/wechat_v3_codepay_test.go rename to app/system/internal/integration/payment/wechat_v3_codepay_test.go index 7898cb6..88cb878 100644 --- a/app/system/integration/payment/wechat_v3_codepay_test.go +++ b/app/system/internal/integration/payment/wechat_v3_codepay_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "kra/app/system/biz" + "kra/app/system/internal/biz" gopayWechatV3 "github.com/go-pay/gopay/wechat/v3" ) diff --git a/app/system/integration/payment/wechat_v3_douyin_refund_test.go b/app/system/internal/integration/payment/wechat_v3_douyin_refund_test.go similarity index 99% rename from app/system/integration/payment/wechat_v3_douyin_refund_test.go rename to app/system/internal/integration/payment/wechat_v3_douyin_refund_test.go index 996d1ee..9950542 100644 --- a/app/system/integration/payment/wechat_v3_douyin_refund_test.go +++ b/app/system/internal/integration/payment/wechat_v3_douyin_refund_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "kra/app/system/biz" + "kra/app/system/internal/biz" gopayDouyin "github.com/go-pay/gopay/douyin" gopayWechatV3 "github.com/go-pay/gopay/wechat/v3" diff --git a/app/system/integration/provider.go b/app/system/internal/integration/provider.go similarity index 72% rename from app/system/integration/provider.go rename to app/system/internal/integration/provider.go index 084f129..b5422ff 100644 --- a/app/system/integration/provider.go +++ b/app/system/internal/integration/provider.go @@ -4,10 +4,10 @@ package integration import ( - "kra/app/system/biz" - "kra/app/system/integration/cache" - "kra/app/system/integration/email" - "kra/app/system/integration/storage" + "kra/app/system/internal/biz" + "kra/app/system/internal/integration/cache" + "kra/app/system/internal/integration/email" + "kra/app/system/internal/integration/storage" "github.com/google/wire" ) diff --git a/app/system/integration/storage/aliyun_storage.go b/app/system/internal/integration/storage/aliyun_storage.go similarity index 98% rename from app/system/integration/storage/aliyun_storage.go rename to app/system/internal/integration/storage/aliyun_storage.go index d609050..932382a 100644 --- a/app/system/integration/storage/aliyun_storage.go +++ b/app/system/internal/integration/storage/aliyun_storage.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/aliyun/aliyun-oss-go-sdk/oss" - "kra/app/system/biz" - "kra/internal/conf" + "kra/app/system/internal/biz" + "kra/app/system/internal/conf" ) type aliyunStorage struct { diff --git a/app/system/integration/storage/aws_storage.go b/app/system/internal/integration/storage/aws_storage.go similarity index 98% rename from app/system/integration/storage/aws_storage.go rename to app/system/internal/integration/storage/aws_storage.go index 3771f13..29fcbb2 100644 --- a/app/system/integration/storage/aws_storage.go +++ b/app/system/internal/integration/storage/aws_storage.go @@ -12,8 +12,8 @@ import ( "github.com/aws/aws-sdk-go-v2/credentials" "github.com/aws/aws-sdk-go-v2/feature/s3/manager" "github.com/aws/aws-sdk-go-v2/service/s3" - "kra/app/system/biz" - "kra/internal/conf" + "kra/app/system/internal/biz" + "kra/app/system/internal/conf" ) type awsStorage struct { diff --git a/app/system/integration/storage/compose.go b/app/system/internal/integration/storage/compose.go similarity index 100% rename from app/system/integration/storage/compose.go rename to app/system/internal/integration/storage/compose.go diff --git a/app/system/integration/storage/compose_test.go b/app/system/internal/integration/storage/compose_test.go similarity index 100% rename from app/system/integration/storage/compose_test.go rename to app/system/internal/integration/storage/compose_test.go diff --git a/app/system/integration/storage/huawei_storage.go b/app/system/internal/integration/storage/huawei_storage.go similarity index 98% rename from app/system/integration/storage/huawei_storage.go rename to app/system/internal/integration/storage/huawei_storage.go index 11a39f9..6dbc686 100644 --- a/app/system/integration/storage/huawei_storage.go +++ b/app/system/internal/integration/storage/huawei_storage.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/huaweicloud/huaweicloud-sdk-go-obs/obs" - "kra/app/system/biz" - "kra/internal/conf" + "kra/app/system/internal/biz" + "kra/app/system/internal/conf" ) type huaweiStorage struct { diff --git a/app/system/integration/storage/local.go b/app/system/internal/integration/storage/local.go similarity index 98% rename from app/system/integration/storage/local.go rename to app/system/internal/integration/storage/local.go index 998b4e7..c78c2b0 100644 --- a/app/system/integration/storage/local.go +++ b/app/system/internal/integration/storage/local.go @@ -10,8 +10,8 @@ import ( "sort" "strings" - "kra/app/system/biz" - "kra/internal/conf" + "kra/app/system/internal/biz" + "kra/app/system/internal/conf" ) type fileStorage struct { diff --git a/app/system/integration/storage/qiniu_storage.go b/app/system/internal/integration/storage/qiniu_storage.go similarity index 98% rename from app/system/integration/storage/qiniu_storage.go rename to app/system/internal/integration/storage/qiniu_storage.go index c14b80c..e11ec96 100644 --- a/app/system/integration/storage/qiniu_storage.go +++ b/app/system/internal/integration/storage/qiniu_storage.go @@ -12,8 +12,8 @@ import ( "github.com/qiniu/go-sdk/v7/auth/qbox" qstorage "github.com/qiniu/go-sdk/v7/storage" - "kra/app/system/biz" - "kra/internal/conf" + "kra/app/system/internal/biz" + "kra/app/system/internal/conf" ) type qiniuStorage struct { diff --git a/app/system/integration/storage/reloadable.go b/app/system/internal/integration/storage/reloadable.go similarity index 96% rename from app/system/integration/storage/reloadable.go rename to app/system/internal/integration/storage/reloadable.go index 040b821..19908ae 100644 --- a/app/system/integration/storage/reloadable.go +++ b/app/system/internal/integration/storage/reloadable.go @@ -5,8 +5,8 @@ import ( "io" "sync" - "kra/app/system/biz" - "kra/internal/conf" + "kra/app/system/internal/biz" + "kra/app/system/internal/conf" ) type Reloadable struct { diff --git a/app/system/integration/storage/s3_storage.go b/app/system/internal/integration/storage/s3_storage.go similarity index 98% rename from app/system/integration/storage/s3_storage.go rename to app/system/internal/integration/storage/s3_storage.go index b113a59..696c617 100644 --- a/app/system/integration/storage/s3_storage.go +++ b/app/system/internal/integration/storage/s3_storage.go @@ -10,8 +10,8 @@ import ( "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" - "kra/app/system/biz" - "kra/internal/conf" + "kra/app/system/internal/biz" + "kra/app/system/internal/conf" ) type s3Storage struct { diff --git a/app/system/integration/storage/tencent_storage.go b/app/system/internal/integration/storage/tencent_storage.go similarity index 98% rename from app/system/integration/storage/tencent_storage.go rename to app/system/internal/integration/storage/tencent_storage.go index 1cecc1c..95c411a 100644 --- a/app/system/integration/storage/tencent_storage.go +++ b/app/system/internal/integration/storage/tencent_storage.go @@ -11,8 +11,8 @@ import ( "time" cos "github.com/tencentyun/cos-go-sdk-v5" - "kra/app/system/biz" - "kra/internal/conf" + "kra/app/system/internal/biz" + "kra/app/system/internal/conf" ) type tencentStorage struct { diff --git a/app/system/module.go b/app/system/internal/module/definition.go similarity index 88% rename from app/system/module.go rename to app/system/internal/module/definition.go index c680c04..e4cc09e 100644 --- a/app/system/module.go +++ b/app/system/internal/module/definition.go @@ -1,8 +1,8 @@ package system import ( - datapayment "kra/app/system/data/payment" - datasystem "kra/app/system/data/repository" + datapayment "kra/app/system/internal/data/payment" + datasystem "kra/app/system/internal/data/repository" "kra/pkg/module" ) diff --git a/app/system/routeinfo/metadata.go b/app/system/internal/routeinfo/metadata.go similarity index 100% rename from app/system/routeinfo/metadata.go rename to app/system/internal/routeinfo/metadata.go diff --git a/app/system/security/adminauth/token.go b/app/system/internal/security/adminauth/token.go similarity index 100% rename from app/system/security/adminauth/token.go rename to app/system/internal/security/adminauth/token.go diff --git a/app/admin/server/gin.go b/app/system/internal/server/gin.go similarity index 96% rename from app/admin/server/gin.go rename to app/system/internal/server/gin.go index cd16dbe..11b4e20 100644 --- a/app/admin/server/gin.go +++ b/app/system/internal/server/gin.go @@ -10,11 +10,11 @@ import ( "strings" "time" - "kra/app/system/service" - "kra/app/system/transport/handler" - "kra/app/system/transport/httpx" - servermiddleware "kra/app/system/transport/middleware" - "kra/internal/conf" + "kra/app/system/internal/conf" + "kra/app/system/internal/service" + "kra/app/system/internal/transport/handler" + "kra/app/system/internal/transport/httpx" + servermiddleware "kra/app/system/internal/transport/middleware" platformmodule "kra/pkg/module" "github.com/gin-gonic/gin" diff --git a/app/admin/server/gin_test.go b/app/system/internal/server/gin_test.go similarity index 99% rename from app/admin/server/gin_test.go rename to app/system/internal/server/gin_test.go index 4a8b3cc..c608131 100644 --- a/app/admin/server/gin_test.go +++ b/app/system/internal/server/gin_test.go @@ -11,8 +11,8 @@ import ( "strings" "testing" - "kra/app/system/transport/handler" - "kra/internal/conf" + "kra/app/system/internal/conf" + "kra/app/system/internal/transport/handler" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/server/server.go b/app/system/internal/server/providers_system.go similarity index 93% rename from app/system/transport/server/server.go rename to app/system/internal/server/providers_system.go index abe2465..f9e01aa 100644 --- a/app/system/transport/server/server.go +++ b/app/system/internal/server/providers_system.go @@ -1,7 +1,7 @@ package server import ( - "kra/app/system/transport/handler" + "kra/app/system/internal/transport/handler" "github.com/google/wire" ) diff --git a/app/system/transport/server/routes.go b/app/system/internal/server/routes.go similarity index 94% rename from app/system/transport/server/routes.go rename to app/system/internal/server/routes.go index d67b630..7eff677 100644 --- a/app/system/transport/server/routes.go +++ b/app/system/internal/server/routes.go @@ -1,8 +1,8 @@ package server import ( - "kra/app/system/transport/handler" - serverrouter "kra/app/system/transport/router" + "kra/app/system/internal/transport/handler" + serverrouter "kra/app/system/internal/transport/router" platformmodule "kra/pkg/module" "github.com/gin-gonic/gin" diff --git a/app/admin/server/swagger.go b/app/system/internal/server/swagger.go similarity index 99% rename from app/admin/server/swagger.go rename to app/system/internal/server/swagger.go index 951c2c0..d4e48d0 100644 --- a/app/admin/server/swagger.go +++ b/app/system/internal/server/swagger.go @@ -8,7 +8,7 @@ import ( "strings" "sync" - "kra/app/system/routeinfo" + "kra/app/system/internal/routeinfo" "github.com/gin-gonic/gin" swaggerFiles "github.com/swaggo/files" diff --git a/app/system/service/access_control.go b/app/system/internal/service/access_control.go similarity index 96% rename from app/system/service/access_control.go rename to app/system/internal/service/access_control.go index d234382..844ccee 100644 --- a/app/system/service/access_control.go +++ b/app/system/internal/service/access_control.go @@ -3,7 +3,7 @@ package service import ( "context" - "kra/app/system/biz" + "kra/app/system/internal/biz" ) type AccessControlService struct{ uc *biz.AccessControlUsecase } diff --git a/app/system/service/announcement.go b/app/system/internal/service/announcement.go similarity index 97% rename from app/system/service/announcement.go rename to app/system/internal/service/announcement.go index 7032269..2231a87 100644 --- a/app/system/service/announcement.go +++ b/app/system/internal/service/announcement.go @@ -5,8 +5,8 @@ import ( "encoding/json" "time" - "kra/app/system/biz" - "kra/app/system/dto" + "kra/app/system/internal/biz" + "kra/app/system/internal/dto" ) type AnnouncementInput struct { diff --git a/app/system/service/api.go b/app/system/internal/service/api.go similarity index 98% rename from app/system/service/api.go rename to app/system/internal/service/api.go index 573fa53..e354434 100644 --- a/app/system/service/api.go +++ b/app/system/internal/service/api.go @@ -4,8 +4,8 @@ import ( "context" "strings" - "kra/app/system/biz" - "kra/app/system/dto" + "kra/app/system/internal/biz" + "kra/app/system/internal/dto" ) type APIService struct { diff --git a/app/system/service/api_token.go b/app/system/internal/service/api_token.go similarity index 97% rename from app/system/service/api_token.go rename to app/system/internal/service/api_token.go index c14f1c2..a18ad77 100644 --- a/app/system/service/api_token.go +++ b/app/system/internal/service/api_token.go @@ -4,8 +4,8 @@ import ( "context" "time" - "kra/app/system/biz" - "kra/app/system/dto" + "kra/app/system/internal/biz" + "kra/app/system/internal/dto" ) type TokenService struct { diff --git a/app/system/service/audit.go b/app/system/internal/service/audit.go similarity index 98% rename from app/system/service/audit.go rename to app/system/internal/service/audit.go index a984d13..33f43d4 100644 --- a/app/system/service/audit.go +++ b/app/system/internal/service/audit.go @@ -3,8 +3,8 @@ package service import ( "context" - "kra/app/system/biz" - "kra/app/system/dto" + "kra/app/system/internal/biz" + "kra/app/system/internal/dto" ) type AuditService struct{ uc *biz.AuditUsecase } diff --git a/app/system/service/audit_error.go b/app/system/internal/service/audit_error.go similarity index 97% rename from app/system/service/audit_error.go rename to app/system/internal/service/audit_error.go index cdbd8ef..e470983 100644 --- a/app/system/service/audit_error.go +++ b/app/system/internal/service/audit_error.go @@ -4,8 +4,8 @@ import ( "context" "time" - "kra/app/system/biz" - "kra/app/system/dto" + "kra/app/system/internal/biz" + "kra/app/system/internal/dto" ) func errorDTO(v *biz.ErrorRecord) *dto.ErrorRecordResponse { diff --git a/app/system/service/audit_log_file.go b/app/system/internal/service/audit_log_file.go similarity index 96% rename from app/system/service/audit_log_file.go rename to app/system/internal/service/audit_log_file.go index c4c43db..5f3f7b2 100644 --- a/app/system/service/audit_log_file.go +++ b/app/system/internal/service/audit_log_file.go @@ -3,8 +3,8 @@ package service import ( "context" - "kra/app/system/biz" - "kra/app/system/dto" + "kra/app/system/internal/biz" + "kra/app/system/internal/dto" ) type LogViewerService struct{ uc *biz.LogViewerUsecase } diff --git a/app/system/service/authentication.go b/app/system/internal/service/authentication.go similarity index 95% rename from app/system/service/authentication.go rename to app/system/internal/service/authentication.go index da61600..4836f1b 100644 --- a/app/system/service/authentication.go +++ b/app/system/internal/service/authentication.go @@ -3,8 +3,8 @@ package service import ( "context" - "kra/app/system/biz" - "kra/app/system/dto" + "kra/app/system/internal/biz" + "kra/app/system/internal/dto" ) type AuthService struct { diff --git a/app/system/service/authority.go b/app/system/internal/service/authority.go similarity index 98% rename from app/system/service/authority.go rename to app/system/internal/service/authority.go index 1727818..b6da6f3 100644 --- a/app/system/service/authority.go +++ b/app/system/internal/service/authority.go @@ -3,8 +3,8 @@ package service import ( "context" - "kra/app/system/biz" - "kra/app/system/dto" + "kra/app/system/internal/biz" + "kra/app/system/internal/dto" ) type AuthorityService struct{ uc *biz.AuthorityUsecase } diff --git a/app/system/service/department.go b/app/system/internal/service/department.go similarity index 97% rename from app/system/service/department.go rename to app/system/internal/service/department.go index 164eabd..6190bee 100644 --- a/app/system/service/department.go +++ b/app/system/internal/service/department.go @@ -3,8 +3,8 @@ package service import ( "context" - "kra/app/system/biz" - "kra/app/system/dto" + "kra/app/system/internal/biz" + "kra/app/system/internal/dto" ) type DepartmentService struct{ uc *biz.DepartmentUsecase } diff --git a/app/system/service/department_test.go b/app/system/internal/service/department_test.go similarity index 93% rename from app/system/service/department_test.go rename to app/system/internal/service/department_test.go index e76bcb1..6ff5be5 100644 --- a/app/system/service/department_test.go +++ b/app/system/internal/service/department_test.go @@ -3,7 +3,7 @@ package service import ( "testing" - "kra/app/system/biz" + "kra/app/system/internal/biz" ) func TestDepartmentResponsePreservesNilAndEmptyChildren(t *testing.T) { diff --git a/app/system/service/dictionary.go b/app/system/internal/service/dictionary.go similarity index 99% rename from app/system/service/dictionary.go rename to app/system/internal/service/dictionary.go index dc4eee5..f90970b 100644 --- a/app/system/service/dictionary.go +++ b/app/system/internal/service/dictionary.go @@ -3,8 +3,8 @@ package service import ( "context" - "kra/app/system/biz" - "kra/app/system/dto" + "kra/app/system/internal/biz" + "kra/app/system/internal/dto" ) type DictionaryService struct{ uc *biz.DictionaryUsecase } diff --git a/app/system/service/dictionary_import.go b/app/system/internal/service/dictionary_import.go similarity index 96% rename from app/system/service/dictionary_import.go rename to app/system/internal/service/dictionary_import.go index 9b59f93..e87917f 100644 --- a/app/system/service/dictionary_import.go +++ b/app/system/internal/service/dictionary_import.go @@ -5,8 +5,8 @@ import ( "encoding/json" "errors" - "kra/app/system/biz" - "kra/app/system/dto" + "kra/app/system/internal/biz" + "kra/app/system/internal/dto" ) func (s *DictionaryService) ImportDictionaryJSON(ctx context.Context, raw string) error { diff --git a/app/system/service/dictionary_test.go b/app/system/internal/service/dictionary_test.go similarity index 95% rename from app/system/service/dictionary_test.go rename to app/system/internal/service/dictionary_test.go index b65ed57..eb7f09d 100644 --- a/app/system/service/dictionary_test.go +++ b/app/system/internal/service/dictionary_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "kra/app/system/biz" + "kra/app/system/internal/biz" ) type dictionaryExportRepo struct { diff --git a/app/system/service/email.go b/app/system/internal/service/email.go similarity index 94% rename from app/system/service/email.go rename to app/system/internal/service/email.go index 9f1e4cf..221ad8f 100644 --- a/app/system/service/email.go +++ b/app/system/internal/service/email.go @@ -2,7 +2,7 @@ package service import ( "context" - "kra/app/system/biz" + "kra/app/system/internal/biz" ) type EmailService struct{ uc *biz.EmailUsecase } diff --git a/app/system/service/export.go b/app/system/internal/service/export.go similarity index 98% rename from app/system/service/export.go rename to app/system/internal/service/export.go index a57d113..67a96ba 100644 --- a/app/system/service/export.go +++ b/app/system/internal/service/export.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "kra/app/system/biz" - "kra/app/system/dto" + "kra/app/system/internal/biz" + "kra/app/system/internal/dto" "github.com/google/uuid" ) diff --git a/app/system/service/export_excel.go b/app/system/internal/service/export_excel.go similarity index 100% rename from app/system/service/export_excel.go rename to app/system/internal/service/export_excel.go diff --git a/app/system/service/media.go b/app/system/internal/service/media.go similarity index 98% rename from app/system/service/media.go rename to app/system/internal/service/media.go index 5dd6b58..bd071bf 100644 --- a/app/system/service/media.go +++ b/app/system/internal/service/media.go @@ -4,8 +4,8 @@ import ( "context" "io" - "kra/app/system/biz" - "kra/app/system/dto" + "kra/app/system/internal/biz" + "kra/app/system/internal/dto" ) type MediaService struct { diff --git a/app/system/service/media_upload.go b/app/system/internal/service/media_upload.go similarity index 97% rename from app/system/service/media_upload.go rename to app/system/internal/service/media_upload.go index c744c55..8e9fb2d 100644 --- a/app/system/service/media_upload.go +++ b/app/system/internal/service/media_upload.go @@ -4,7 +4,7 @@ import ( "context" "io" - "kra/app/system/dto" + "kra/app/system/internal/dto" ) func (s *MediaService) InitUpload(ctx context.Context, userID uint, name, hash string, size, chunkSize int64, total int) (*dto.InitUploadResponse, error) { diff --git a/app/system/service/menu.go b/app/system/internal/service/menu.go similarity index 99% rename from app/system/service/menu.go rename to app/system/internal/service/menu.go index 1c06165..9480285 100644 --- a/app/system/service/menu.go +++ b/app/system/internal/service/menu.go @@ -3,8 +3,8 @@ package service import ( "context" - "kra/app/system/biz" - "kra/app/system/dto" + "kra/app/system/internal/biz" + "kra/app/system/internal/dto" ) type MenuService struct{ uc *biz.MenuUsecase } diff --git a/app/system/service/menu_test.go b/app/system/internal/service/menu_test.go similarity index 97% rename from app/system/service/menu_test.go rename to app/system/internal/service/menu_test.go index 7f10143..7b5c7a7 100644 --- a/app/system/service/menu_test.go +++ b/app/system/internal/service/menu_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "kra/app/system/biz" - "kra/app/system/dto" + "kra/app/system/internal/biz" + "kra/app/system/internal/dto" ) func TestMenuDomainPreservesRelationIdentity(t *testing.T) { diff --git a/app/system/service/parameter.go b/app/system/internal/service/parameter.go similarity index 97% rename from app/system/service/parameter.go rename to app/system/internal/service/parameter.go index 6ce531f..b8c7dc3 100644 --- a/app/system/service/parameter.go +++ b/app/system/internal/service/parameter.go @@ -4,8 +4,8 @@ import ( "context" "time" - "kra/app/system/biz" - "kra/app/system/dto" + "kra/app/system/internal/biz" + "kra/app/system/internal/dto" ) type ParameterService struct{ uc *biz.ParameterUsecase } diff --git a/app/system/service/payment.go b/app/system/internal/service/payment.go similarity index 99% rename from app/system/service/payment.go rename to app/system/internal/service/payment.go index fe96b5d..112ec35 100644 --- a/app/system/service/payment.go +++ b/app/system/internal/service/payment.go @@ -4,8 +4,8 @@ import ( "context" "errors" - "kra/app/system/biz" - "kra/app/system/dto" + "kra/app/system/internal/biz" + "kra/app/system/internal/dto" ) type PaymentService struct{ uc *biz.PaymentUsecase } diff --git a/app/system/service/permission.go b/app/system/internal/service/permission.go similarity index 95% rename from app/system/service/permission.go rename to app/system/internal/service/permission.go index 4a0775a..0bec8ff 100644 --- a/app/system/service/permission.go +++ b/app/system/internal/service/permission.go @@ -3,7 +3,7 @@ package service import ( "context" - "kra/app/system/biz" + "kra/app/system/internal/biz" ) type PermissionService struct{ uc *biz.PermissionUsecase } diff --git a/app/system/service/position.go b/app/system/internal/service/position.go similarity index 97% rename from app/system/service/position.go rename to app/system/internal/service/position.go index fa8a176..37ae64e 100644 --- a/app/system/service/position.go +++ b/app/system/internal/service/position.go @@ -3,8 +3,8 @@ package service import ( "context" - "kra/app/system/biz" - "kra/app/system/dto" + "kra/app/system/internal/biz" + "kra/app/system/internal/dto" ) type PositionService struct{ uc *biz.PositionUsecase } diff --git a/app/system/service/route_path.go b/app/system/internal/service/route_path.go similarity index 100% rename from app/system/service/route_path.go rename to app/system/internal/service/route_path.go diff --git a/app/system/service/route_path_test.go b/app/system/internal/service/route_path_test.go similarity index 100% rename from app/system/service/route_path_test.go rename to app/system/internal/service/route_path_test.go diff --git a/app/system/service/security.go b/app/system/internal/service/security.go similarity index 97% rename from app/system/service/security.go rename to app/system/internal/service/security.go index 38dd562..2883868 100644 --- a/app/system/service/security.go +++ b/app/system/internal/service/security.go @@ -4,8 +4,8 @@ import ( "context" "errors" - "kra/app/system/biz" - "kra/app/system/dto" + "kra/app/system/internal/biz" + "kra/app/system/internal/dto" ) type PasswordPolicyError struct{ Err error } diff --git a/app/system/service/security_session.go b/app/system/internal/service/security_session.go similarity index 98% rename from app/system/service/security_session.go rename to app/system/internal/service/security_session.go index 9a3cd67..79469c2 100644 --- a/app/system/service/security_session.go +++ b/app/system/internal/service/security_session.go @@ -4,7 +4,7 @@ import ( "context" "time" - "kra/app/system/biz" + "kra/app/system/internal/biz" ) type SecurityService struct { diff --git a/app/system/service/service.go b/app/system/internal/service/service.go similarity index 100% rename from app/system/service/service.go rename to app/system/internal/service/service.go diff --git a/app/system/service/system.go b/app/system/internal/service/system.go similarity index 93% rename from app/system/service/system.go rename to app/system/internal/service/system.go index 0f54c15..5224443 100644 --- a/app/system/service/system.go +++ b/app/system/internal/service/system.go @@ -3,7 +3,7 @@ package service import ( "context" - "kra/app/system/biz" + "kra/app/system/internal/biz" ) type SystemConfigService struct { diff --git a/app/system/service/system_config.go b/app/system/internal/service/system_config.go similarity index 95% rename from app/system/service/system_config.go rename to app/system/internal/service/system_config.go index 2c65492..a57ce13 100644 --- a/app/system/service/system_config.go +++ b/app/system/internal/service/system_config.go @@ -4,7 +4,7 @@ import ( "context" "encoding/json" - "kra/app/system/dto" + "kra/app/system/internal/dto" ) func (s *SystemConfigService) PersistConfig(ctx context.Context) error { diff --git a/app/system/service/system_info.go b/app/system/internal/service/system_info.go similarity index 97% rename from app/system/service/system_info.go rename to app/system/internal/service/system_info.go index 9f391ef..cb50294 100644 --- a/app/system/service/system_info.go +++ b/app/system/internal/service/system_info.go @@ -4,7 +4,7 @@ import ( "runtime" "time" - "kra/app/system/dto" + "kra/app/system/internal/dto" "github.com/shirou/gopsutil/v4/cpu" "github.com/shirou/gopsutil/v4/disk" diff --git a/app/system/service/system_init.go b/app/system/internal/service/system_init.go similarity index 93% rename from app/system/service/system_init.go rename to app/system/internal/service/system_init.go index 878ced6..7e405f8 100644 --- a/app/system/service/system_init.go +++ b/app/system/internal/service/system_init.go @@ -3,9 +3,9 @@ package service import ( "context" - "kra/app/system/biz" - "kra/app/system/dto" - "kra/app/system/routeinfo" + "kra/app/system/internal/biz" + "kra/app/system/internal/dto" + "kra/app/system/internal/routeinfo" ) func (s *SystemConfigService) Initialize(ctx context.Context, input *dto.DatabaseInitRequest, apis []*biz.API) error { diff --git a/app/system/service/task.go b/app/system/internal/service/task.go similarity index 98% rename from app/system/service/task.go rename to app/system/internal/service/task.go index 5ee06ed..79c36d8 100644 --- a/app/system/service/task.go +++ b/app/system/internal/service/task.go @@ -5,8 +5,8 @@ import ( "encoding/json" "time" - "kra/app/system/biz" - "kra/app/system/dto" + "kra/app/system/internal/biz" + "kra/app/system/internal/dto" ) type TaskService struct { diff --git a/app/system/service/user.go b/app/system/internal/service/user.go similarity index 98% rename from app/system/service/user.go rename to app/system/internal/service/user.go index 61459f3..98a2769 100644 --- a/app/system/service/user.go +++ b/app/system/internal/service/user.go @@ -3,8 +3,8 @@ package service import ( "context" - "kra/app/system/biz" - "kra/app/system/dto" + "kra/app/system/internal/biz" + "kra/app/system/internal/dto" ) type userInput struct { diff --git a/app/system/service/user_conversion.go b/app/system/internal/service/user_conversion.go similarity index 97% rename from app/system/service/user_conversion.go rename to app/system/internal/service/user_conversion.go index 859f21f..ed450e3 100644 --- a/app/system/service/user_conversion.go +++ b/app/system/internal/service/user_conversion.go @@ -1,8 +1,8 @@ package service import ( - "kra/app/system/biz" - "kra/app/system/dto" + "kra/app/system/internal/biz" + "kra/app/system/internal/dto" ) func convertAuthority(value biz.Authority) *dto.AuthorityResponse { diff --git a/app/system/service/version.go b/app/system/internal/service/version.go similarity index 99% rename from app/system/service/version.go rename to app/system/internal/service/version.go index 966be36..acdb7a6 100644 --- a/app/system/service/version.go +++ b/app/system/internal/service/version.go @@ -5,8 +5,8 @@ import ( "encoding/json" "time" - "kra/app/system/biz" - "kra/app/system/dto" + "kra/app/system/internal/biz" + "kra/app/system/internal/dto" ) type VersionService struct{ uc *biz.VersionUsecase } diff --git a/app/system/transport/handler/announcement.go b/app/system/internal/transport/handler/announcement.go similarity index 96% rename from app/system/transport/handler/announcement.go rename to app/system/internal/transport/handler/announcement.go index d43332e..8a4c3d2 100644 --- a/app/system/transport/handler/announcement.go +++ b/app/system/internal/transport/handler/announcement.go @@ -3,9 +3,9 @@ package handler import ( "time" - "kra/app/system/dto" - "kra/app/system/service" - "kra/app/system/transport/httpx" + "kra/app/system/internal/dto" + "kra/app/system/internal/service" + "kra/app/system/internal/transport/httpx" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/handler/api.go b/app/system/internal/transport/handler/api.go similarity index 98% rename from app/system/transport/handler/api.go rename to app/system/internal/transport/handler/api.go index dce1fb0..be846f0 100644 --- a/app/system/transport/handler/api.go +++ b/app/system/internal/transport/handler/api.go @@ -1,9 +1,9 @@ package handler import ( - "kra/app/system/dto" - "kra/app/system/service" - "kra/app/system/transport/httpx" + "kra/app/system/internal/dto" + "kra/app/system/internal/service" + "kra/app/system/internal/transport/httpx" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/handler/api_token.go b/app/system/internal/transport/handler/api_token.go similarity index 93% rename from app/system/transport/handler/api_token.go rename to app/system/internal/transport/handler/api_token.go index 2679f63..3986249 100644 --- a/app/system/transport/handler/api_token.go +++ b/app/system/internal/transport/handler/api_token.go @@ -1,9 +1,9 @@ package handler import ( - "kra/app/system/dto" - "kra/app/system/service" - "kra/app/system/transport/httpx" + "kra/app/system/internal/dto" + "kra/app/system/internal/service" + "kra/app/system/internal/transport/httpx" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/handler/audit.go b/app/system/internal/transport/handler/audit.go similarity index 98% rename from app/system/transport/handler/audit.go rename to app/system/internal/transport/handler/audit.go index 730d45b..ada9141 100644 --- a/app/system/transport/handler/audit.go +++ b/app/system/internal/transport/handler/audit.go @@ -6,10 +6,10 @@ import ( "strconv" "time" - "kra/app/system/biz" - "kra/app/system/dto" - "kra/app/system/service" - "kra/app/system/transport/httpx" + "kra/app/system/internal/biz" + "kra/app/system/internal/dto" + "kra/app/system/internal/service" + "kra/app/system/internal/transport/httpx" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/handler/authority.go b/app/system/internal/transport/handler/authority.go similarity index 97% rename from app/system/transport/handler/authority.go rename to app/system/internal/transport/handler/authority.go index dc38376..d7eb69c 100644 --- a/app/system/transport/handler/authority.go +++ b/app/system/internal/transport/handler/authority.go @@ -1,9 +1,9 @@ package handler import ( - "kra/app/system/dto" - "kra/app/system/service" - "kra/app/system/transport/httpx" + "kra/app/system/internal/dto" + "kra/app/system/internal/service" + "kra/app/system/internal/transport/httpx" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/handler/dictionary.go b/app/system/internal/transport/handler/dictionary.go similarity index 98% rename from app/system/transport/handler/dictionary.go rename to app/system/internal/transport/handler/dictionary.go index 21117f1..bd9090a 100644 --- a/app/system/transport/handler/dictionary.go +++ b/app/system/internal/transport/handler/dictionary.go @@ -3,9 +3,9 @@ package handler import ( "strconv" - "kra/app/system/dto" - "kra/app/system/service" - "kra/app/system/transport/httpx" + "kra/app/system/internal/dto" + "kra/app/system/internal/service" + "kra/app/system/internal/transport/httpx" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/handler/email.go b/app/system/internal/transport/handler/email.go similarity index 87% rename from app/system/transport/handler/email.go rename to app/system/internal/transport/handler/email.go index befb71d..c5b867a 100644 --- a/app/system/transport/handler/email.go +++ b/app/system/internal/transport/handler/email.go @@ -1,9 +1,9 @@ package handler import ( - "kra/app/system/dto" - "kra/app/system/service" - "kra/app/system/transport/httpx" + "kra/app/system/internal/dto" + "kra/app/system/internal/service" + "kra/app/system/internal/transport/httpx" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/handler/export.go b/app/system/internal/transport/handler/export.go similarity index 98% rename from app/system/transport/handler/export.go rename to app/system/internal/transport/handler/export.go index 3d90c51..080772b 100644 --- a/app/system/transport/handler/export.go +++ b/app/system/internal/transport/handler/export.go @@ -6,9 +6,9 @@ import ( "net/url" "strings" - "kra/app/system/dto" - "kra/app/system/service" - "kra/app/system/transport/httpx" + "kra/app/system/internal/dto" + "kra/app/system/internal/service" + "kra/app/system/internal/transport/httpx" "github.com/gin-gonic/gin" "github.com/google/uuid" diff --git a/app/system/transport/handler/export_test.go b/app/system/internal/transport/handler/export_test.go similarity index 100% rename from app/system/transport/handler/export_test.go rename to app/system/internal/transport/handler/export_test.go diff --git a/app/system/transport/handler/media.go b/app/system/internal/transport/handler/media.go similarity index 97% rename from app/system/transport/handler/media.go rename to app/system/internal/transport/handler/media.go index 909d362..c7508f8 100644 --- a/app/system/transport/handler/media.go +++ b/app/system/internal/transport/handler/media.go @@ -5,10 +5,10 @@ import ( "net/http" "strconv" - "kra/app/system/dto" - "kra/app/system/service" - "kra/app/system/transport/httpx" - servermiddleware "kra/app/system/transport/middleware" + "kra/app/system/internal/dto" + "kra/app/system/internal/service" + "kra/app/system/internal/transport/httpx" + servermiddleware "kra/app/system/internal/transport/middleware" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/handler/menu.go b/app/system/internal/transport/handler/menu.go similarity index 97% rename from app/system/transport/handler/menu.go rename to app/system/internal/transport/handler/menu.go index 1b7a761..f3f288e 100644 --- a/app/system/transport/handler/menu.go +++ b/app/system/internal/transport/handler/menu.go @@ -1,9 +1,9 @@ package handler import ( - "kra/app/system/dto" - "kra/app/system/service" - "kra/app/system/transport/httpx" + "kra/app/system/internal/dto" + "kra/app/system/internal/service" + "kra/app/system/internal/transport/httpx" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/handler/navigation.go b/app/system/internal/transport/handler/navigation.go similarity index 82% rename from app/system/transport/handler/navigation.go rename to app/system/internal/transport/handler/navigation.go index 645d5dd..c4540fe 100644 --- a/app/system/transport/handler/navigation.go +++ b/app/system/internal/transport/handler/navigation.go @@ -1,9 +1,9 @@ package handler import ( - "kra/app/system/service" - "kra/app/system/transport/httpx" - "kra/app/system/transport/middleware" + "kra/app/system/internal/service" + "kra/app/system/internal/transport/httpx" + "kra/app/system/internal/transport/middleware" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/handler/organization.go b/app/system/internal/transport/handler/organization.go similarity index 98% rename from app/system/transport/handler/organization.go rename to app/system/internal/transport/handler/organization.go index a9b88cf..ce65178 100644 --- a/app/system/transport/handler/organization.go +++ b/app/system/internal/transport/handler/organization.go @@ -1,9 +1,9 @@ package handler import ( - "kra/app/system/dto" - "kra/app/system/service" - "kra/app/system/transport/httpx" + "kra/app/system/internal/dto" + "kra/app/system/internal/service" + "kra/app/system/internal/transport/httpx" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/handler/parameter.go b/app/system/internal/transport/handler/parameter.go similarity index 95% rename from app/system/transport/handler/parameter.go rename to app/system/internal/transport/handler/parameter.go index d5c68c6..e31e581 100644 --- a/app/system/transport/handler/parameter.go +++ b/app/system/internal/transport/handler/parameter.go @@ -1,9 +1,9 @@ package handler import ( - "kra/app/system/dto" - "kra/app/system/service" - "kra/app/system/transport/httpx" + "kra/app/system/internal/dto" + "kra/app/system/internal/service" + "kra/app/system/internal/transport/httpx" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/handler/payment.go b/app/system/internal/transport/handler/payment.go similarity index 96% rename from app/system/transport/handler/payment.go rename to app/system/internal/transport/handler/payment.go index c6b1246..23f13c5 100644 --- a/app/system/transport/handler/payment.go +++ b/app/system/internal/transport/handler/payment.go @@ -4,9 +4,9 @@ import ( "io" "net/http" - "kra/app/system/dto" - "kra/app/system/service" - "kra/app/system/transport/httpx" + "kra/app/system/internal/dto" + "kra/app/system/internal/service" + "kra/app/system/internal/transport/httpx" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/handler/payment_test.go b/app/system/internal/transport/handler/payment_test.go similarity index 96% rename from app/system/transport/handler/payment_test.go rename to app/system/internal/transport/handler/payment_test.go index d125b18..6bfae64 100644 --- a/app/system/transport/handler/payment_test.go +++ b/app/system/internal/transport/handler/payment_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/gin-gonic/gin" - "kra/app/system/dto" + "kra/app/system/internal/dto" ) func TestWritePaymentCallbackAckDoesNotExposeError(t *testing.T) { diff --git a/app/system/transport/handler/permission.go b/app/system/internal/transport/handler/permission.go similarity index 92% rename from app/system/transport/handler/permission.go rename to app/system/internal/transport/handler/permission.go index 7895b1a..e530109 100644 --- a/app/system/transport/handler/permission.go +++ b/app/system/internal/transport/handler/permission.go @@ -1,9 +1,9 @@ package handler import ( - "kra/app/system/dto" - "kra/app/system/service" - "kra/app/system/transport/httpx" + "kra/app/system/internal/dto" + "kra/app/system/internal/service" + "kra/app/system/internal/transport/httpx" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/handler/public.go b/app/system/internal/transport/handler/public.go similarity index 97% rename from app/system/transport/handler/public.go rename to app/system/internal/transport/handler/public.go index f30d0dd..7e58911 100644 --- a/app/system/transport/handler/public.go +++ b/app/system/internal/transport/handler/public.go @@ -7,10 +7,10 @@ import ( "strings" "time" - "kra/app/system/biz" - "kra/app/system/dto" - "kra/app/system/service" - "kra/app/system/transport/httpx" + "kra/app/system/internal/biz" + "kra/app/system/internal/dto" + "kra/app/system/internal/service" + "kra/app/system/internal/transport/httpx" "github.com/gin-gonic/gin" "github.com/mojocn/base64Captcha" diff --git a/app/system/transport/handler/query.go b/app/system/internal/transport/handler/query.go similarity index 100% rename from app/system/transport/handler/query.go rename to app/system/internal/transport/handler/query.go diff --git a/app/system/transport/handler/session.go b/app/system/internal/transport/handler/session.go similarity index 87% rename from app/system/transport/handler/session.go rename to app/system/internal/transport/handler/session.go index 554d223..d3f5b80 100644 --- a/app/system/transport/handler/session.go +++ b/app/system/internal/transport/handler/session.go @@ -1,8 +1,8 @@ package handler import ( - "kra/app/system/service" - "kra/app/system/transport/httpx" + "kra/app/system/internal/service" + "kra/app/system/internal/transport/httpx" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/handler/set.go b/app/system/internal/transport/handler/set.go similarity index 100% rename from app/system/transport/handler/set.go rename to app/system/internal/transport/handler/set.go diff --git a/app/system/transport/handler/system_config.go b/app/system/internal/transport/handler/system_config.go similarity index 94% rename from app/system/transport/handler/system_config.go rename to app/system/internal/transport/handler/system_config.go index 85c803e..08de2b1 100644 --- a/app/system/transport/handler/system_config.go +++ b/app/system/internal/transport/handler/system_config.go @@ -1,9 +1,9 @@ package handler import ( - "kra/app/system/dto" - "kra/app/system/service" - "kra/app/system/transport/httpx" + "kra/app/system/internal/dto" + "kra/app/system/internal/service" + "kra/app/system/internal/transport/httpx" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/handler/task.go b/app/system/internal/transport/handler/task.go similarity index 96% rename from app/system/transport/handler/task.go rename to app/system/internal/transport/handler/task.go index 96f7ba7..f3b981a 100644 --- a/app/system/transport/handler/task.go +++ b/app/system/internal/transport/handler/task.go @@ -5,10 +5,10 @@ import ( "net/http" "time" - "kra/app/system/dto" - "kra/app/system/service" - "kra/app/system/transport/httpx" - "kra/app/system/transport/middleware" + "kra/app/system/internal/dto" + "kra/app/system/internal/service" + "kra/app/system/internal/transport/httpx" + "kra/app/system/internal/transport/middleware" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/handler/user.go b/app/system/internal/transport/handler/user.go similarity index 97% rename from app/system/transport/handler/user.go rename to app/system/internal/transport/handler/user.go index 13f6325..2062dfb 100644 --- a/app/system/transport/handler/user.go +++ b/app/system/internal/transport/handler/user.go @@ -4,10 +4,10 @@ import ( "strconv" "time" - "kra/app/system/dto" - "kra/app/system/service" - "kra/app/system/transport/httpx" - "kra/app/system/transport/middleware" + "kra/app/system/internal/dto" + "kra/app/system/internal/service" + "kra/app/system/internal/transport/httpx" + "kra/app/system/internal/transport/middleware" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/handler/version.go b/app/system/internal/transport/handler/version.go similarity index 97% rename from app/system/transport/handler/version.go rename to app/system/internal/transport/handler/version.go index bc21a4a..5e8ec4a 100644 --- a/app/system/transport/handler/version.go +++ b/app/system/internal/transport/handler/version.go @@ -7,10 +7,10 @@ import ( "strconv" "time" - "kra/app/system/biz" - "kra/app/system/dto" - "kra/app/system/service" - "kra/app/system/transport/httpx" + "kra/app/system/internal/biz" + "kra/app/system/internal/dto" + "kra/app/system/internal/service" + "kra/app/system/internal/transport/httpx" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/httpx/cookie.go b/app/system/internal/transport/httpx/cookie.go similarity index 100% rename from app/system/transport/httpx/cookie.go rename to app/system/internal/transport/httpx/cookie.go diff --git a/app/system/transport/httpx/response.go b/app/system/internal/transport/httpx/response.go similarity index 100% rename from app/system/transport/httpx/response.go rename to app/system/internal/transport/httpx/response.go diff --git a/app/system/transport/middleware/access.go b/app/system/internal/transport/middleware/access.go similarity index 91% rename from app/system/transport/middleware/access.go rename to app/system/internal/transport/middleware/access.go index cd96573..3e93725 100644 --- a/app/system/transport/middleware/access.go +++ b/app/system/internal/transport/middleware/access.go @@ -3,10 +3,10 @@ package middleware import ( "context" - "kra/app/system/biz" - "kra/app/system/service" - "kra/app/system/transport/httpx" - "kra/internal/conf" + "kra/app/system/internal/biz" + "kra/app/system/internal/conf" + "kra/app/system/internal/service" + "kra/app/system/internal/transport/httpx" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/middleware/access_log.go b/app/system/internal/transport/middleware/access_log.go similarity index 97% rename from app/system/transport/middleware/access_log.go rename to app/system/internal/transport/middleware/access_log.go index e5cdb68..e886e66 100644 --- a/app/system/transport/middleware/access_log.go +++ b/app/system/internal/transport/middleware/access_log.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "kra/app/system/biz" - "kra/app/system/transport/httpx" - "kra/internal/conf" + "kra/app/system/internal/biz" + "kra/app/system/internal/conf" + "kra/app/system/internal/transport/httpx" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/middleware/access_log_test.go b/app/system/internal/transport/middleware/access_log_test.go similarity index 98% rename from app/system/transport/middleware/access_log_test.go rename to app/system/internal/transport/middleware/access_log_test.go index 67bd9bc..2bfdc2a 100644 --- a/app/system/transport/middleware/access_log_test.go +++ b/app/system/internal/transport/middleware/access_log_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "kra/internal/conf" + "kra/app/system/internal/conf" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/middleware/access_test.go b/app/system/internal/transport/middleware/access_test.go similarity index 95% rename from app/system/transport/middleware/access_test.go rename to app/system/internal/transport/middleware/access_test.go index dc07439..12429a2 100644 --- a/app/system/transport/middleware/access_test.go +++ b/app/system/internal/transport/middleware/access_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "kra/app/system/biz" - "kra/internal/conf" + "kra/app/system/internal/biz" + "kra/app/system/internal/conf" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/middleware/audit.go b/app/system/internal/transport/middleware/audit.go similarity index 98% rename from app/system/transport/middleware/audit.go rename to app/system/internal/transport/middleware/audit.go index b305574..2ef9767 100644 --- a/app/system/transport/middleware/audit.go +++ b/app/system/internal/transport/middleware/audit.go @@ -12,9 +12,9 @@ import ( "strings" "time" - "kra/app/system/dto" - "kra/app/system/service" - "kra/internal/conf" + "kra/app/system/internal/conf" + "kra/app/system/internal/dto" + "kra/app/system/internal/service" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/middleware/auth.go b/app/system/internal/transport/middleware/auth.go similarity index 95% rename from app/system/transport/middleware/auth.go rename to app/system/internal/transport/middleware/auth.go index d9e349a..e4bcc3b 100644 --- a/app/system/transport/middleware/auth.go +++ b/app/system/internal/transport/middleware/auth.go @@ -6,9 +6,9 @@ import ( "strconv" "strings" - "kra/app/system/biz" - "kra/app/system/service" - "kra/app/system/transport/httpx" + "kra/app/system/internal/biz" + "kra/app/system/internal/service" + "kra/app/system/internal/transport/httpx" "github.com/gin-gonic/gin" "golang.org/x/sync/singleflight" diff --git a/app/system/transport/middleware/capture.go b/app/system/internal/transport/middleware/capture.go similarity index 100% rename from app/system/transport/middleware/capture.go rename to app/system/internal/transport/middleware/capture.go diff --git a/app/system/transport/middleware/cors.go b/app/system/internal/transport/middleware/cors.go similarity index 98% rename from app/system/transport/middleware/cors.go rename to app/system/internal/transport/middleware/cors.go index a5000a9..aa2b5cb 100644 --- a/app/system/transport/middleware/cors.go +++ b/app/system/internal/transport/middleware/cors.go @@ -4,7 +4,7 @@ import ( "net/http" "strings" - "kra/internal/conf" + "kra/app/system/internal/conf" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/middleware/cors_test.go b/app/system/internal/transport/middleware/cors_test.go similarity index 97% rename from app/system/transport/middleware/cors_test.go rename to app/system/internal/transport/middleware/cors_test.go index 8cd5d58..bfd5a8f 100644 --- a/app/system/transport/middleware/cors_test.go +++ b/app/system/internal/transport/middleware/cors_test.go @@ -5,7 +5,7 @@ import ( "net/http/httptest" "testing" - "kra/internal/conf" + "kra/app/system/internal/conf" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/middleware/error_audit.go b/app/system/internal/transport/middleware/error_audit.go similarity index 98% rename from app/system/transport/middleware/error_audit.go rename to app/system/internal/transport/middleware/error_audit.go index d8e2da4..d3a0996 100644 --- a/app/system/transport/middleware/error_audit.go +++ b/app/system/internal/transport/middleware/error_audit.go @@ -6,7 +6,7 @@ import ( "log/slog" "strings" - "kra/app/system/transport/httpx" + "kra/app/system/internal/transport/httpx" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/middleware/error_audit_test.go b/app/system/internal/transport/middleware/error_audit_test.go similarity index 100% rename from app/system/transport/middleware/error_audit_test.go rename to app/system/internal/transport/middleware/error_audit_test.go diff --git a/app/system/transport/middleware/rate_limit.go b/app/system/internal/transport/middleware/rate_limit.go similarity index 94% rename from app/system/transport/middleware/rate_limit.go rename to app/system/internal/transport/middleware/rate_limit.go index b51afd3..be9908b 100644 --- a/app/system/transport/middleware/rate_limit.go +++ b/app/system/internal/transport/middleware/rate_limit.go @@ -5,8 +5,8 @@ import ( "strings" "time" - "kra/app/system/service" - "kra/app/system/transport/httpx" + "kra/app/system/internal/service" + "kra/app/system/internal/transport/httpx" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/middleware/rate_limit_test.go b/app/system/internal/transport/middleware/rate_limit_test.go similarity index 97% rename from app/system/transport/middleware/rate_limit_test.go rename to app/system/internal/transport/middleware/rate_limit_test.go index 1bfaf8c..452964e 100644 --- a/app/system/transport/middleware/rate_limit_test.go +++ b/app/system/internal/transport/middleware/rate_limit_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "kra/app/system/biz" - "kra/app/system/service" + "kra/app/system/internal/biz" + "kra/app/system/internal/service" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/middleware/recovery.go b/app/system/internal/transport/middleware/recovery.go similarity index 100% rename from app/system/transport/middleware/recovery.go rename to app/system/internal/transport/middleware/recovery.go diff --git a/app/system/transport/middleware/request.go b/app/system/internal/transport/middleware/request.go similarity index 99% rename from app/system/transport/middleware/request.go rename to app/system/internal/transport/middleware/request.go index 4002ec1..dbc90c2 100644 --- a/app/system/transport/middleware/request.go +++ b/app/system/internal/transport/middleware/request.go @@ -5,7 +5,7 @@ import ( "encoding/hex" "strings" - "kra/internal/logging" + "kra/pkg/logging" "github.com/gin-gonic/gin" "github.com/google/uuid" diff --git a/app/system/transport/router/announcement.go b/app/system/internal/transport/router/announcement.go similarity index 92% rename from app/system/transport/router/announcement.go rename to app/system/internal/transport/router/announcement.go index f436d04..97e2031 100644 --- a/app/system/transport/router/announcement.go +++ b/app/system/internal/transport/router/announcement.go @@ -1,7 +1,7 @@ package router import ( - "kra/app/system/transport/handler" + "kra/app/system/internal/transport/handler" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/router/api.go b/app/system/internal/transport/router/api.go similarity index 94% rename from app/system/transport/router/api.go rename to app/system/internal/transport/router/api.go index d5abd0f..3e12986 100644 --- a/app/system/transport/router/api.go +++ b/app/system/internal/transport/router/api.go @@ -1,7 +1,7 @@ package router import ( - "kra/app/system/transport/handler" + "kra/app/system/internal/transport/handler" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/router/api_token.go b/app/system/internal/transport/router/api_token.go similarity index 87% rename from app/system/transport/router/api_token.go rename to app/system/internal/transport/router/api_token.go index d9f847e..d52b08e 100644 --- a/app/system/transport/router/api_token.go +++ b/app/system/internal/transport/router/api_token.go @@ -1,7 +1,7 @@ package router import ( - "kra/app/system/transport/handler" + "kra/app/system/internal/transport/handler" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/router/audit.go b/app/system/internal/transport/router/audit.go similarity index 96% rename from app/system/transport/router/audit.go rename to app/system/internal/transport/router/audit.go index 7d14014..33d114d 100644 --- a/app/system/transport/router/audit.go +++ b/app/system/internal/transport/router/audit.go @@ -1,7 +1,7 @@ package router import ( - "kra/app/system/transport/handler" + "kra/app/system/internal/transport/handler" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/router/authority.go b/app/system/internal/transport/router/authority.go similarity index 92% rename from app/system/transport/router/authority.go rename to app/system/internal/transport/router/authority.go index 6f52dea..a59aadf 100644 --- a/app/system/transport/router/authority.go +++ b/app/system/internal/transport/router/authority.go @@ -1,7 +1,7 @@ package router import ( - "kra/app/system/transport/handler" + "kra/app/system/internal/transport/handler" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/router/dictionary.go b/app/system/internal/transport/router/dictionary.go similarity index 96% rename from app/system/transport/router/dictionary.go rename to app/system/internal/transport/router/dictionary.go index 4ec048e..9f6a2a3 100644 --- a/app/system/transport/router/dictionary.go +++ b/app/system/internal/transport/router/dictionary.go @@ -1,7 +1,7 @@ package router import ( - "kra/app/system/transport/handler" + "kra/app/system/internal/transport/handler" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/router/email.go b/app/system/internal/transport/router/email.go similarity index 83% rename from app/system/transport/router/email.go rename to app/system/internal/transport/router/email.go index d760374..b59d12f 100644 --- a/app/system/transport/router/email.go +++ b/app/system/internal/transport/router/email.go @@ -1,7 +1,7 @@ package router import ( - "kra/app/system/transport/handler" + "kra/app/system/internal/transport/handler" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/router/export.go b/app/system/internal/transport/router/export.go similarity index 94% rename from app/system/transport/router/export.go rename to app/system/internal/transport/router/export.go index f0b2344..b278933 100644 --- a/app/system/transport/router/export.go +++ b/app/system/internal/transport/router/export.go @@ -1,7 +1,7 @@ package router import ( - "kra/app/system/transport/handler" + "kra/app/system/internal/transport/handler" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/router/media.go b/app/system/internal/transport/router/media.go similarity index 95% rename from app/system/transport/router/media.go rename to app/system/internal/transport/router/media.go index 0c324ba..f5dceea 100644 --- a/app/system/transport/router/media.go +++ b/app/system/internal/transport/router/media.go @@ -1,7 +1,7 @@ package router import ( - "kra/app/system/transport/handler" + "kra/app/system/internal/transport/handler" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/router/menu.go b/app/system/internal/transport/router/menu.go similarity index 92% rename from app/system/transport/router/menu.go rename to app/system/internal/transport/router/menu.go index bfa0d64..3e6fb4c 100644 --- a/app/system/transport/router/menu.go +++ b/app/system/internal/transport/router/menu.go @@ -1,7 +1,7 @@ package router import ( - "kra/app/system/transport/handler" + "kra/app/system/internal/transport/handler" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/router/organization.go b/app/system/internal/transport/router/organization.go similarity index 96% rename from app/system/transport/router/organization.go rename to app/system/internal/transport/router/organization.go index d73ce84..1d847fc 100644 --- a/app/system/transport/router/organization.go +++ b/app/system/internal/transport/router/organization.go @@ -1,7 +1,7 @@ package router import ( - "kra/app/system/transport/handler" + "kra/app/system/internal/transport/handler" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/router/parameter.go b/app/system/internal/transport/router/parameter.go similarity index 91% rename from app/system/transport/router/parameter.go rename to app/system/internal/transport/router/parameter.go index 4a5b3b8..d3dc1c7 100644 --- a/app/system/transport/router/parameter.go +++ b/app/system/internal/transport/router/parameter.go @@ -1,7 +1,7 @@ package router import ( - "kra/app/system/transport/handler" + "kra/app/system/internal/transport/handler" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/router/payment.go b/app/system/internal/transport/router/payment.go similarity index 91% rename from app/system/transport/router/payment.go rename to app/system/internal/transport/router/payment.go index 8a291da..2ff60a1 100644 --- a/app/system/transport/router/payment.go +++ b/app/system/internal/transport/router/payment.go @@ -2,7 +2,7 @@ package router import ( "github.com/gin-gonic/gin" - "kra/app/system/transport/handler" + "kra/app/system/internal/transport/handler" ) func RegisterPayment(group, public *gin.RouterGroup, h *handler.Payment) { diff --git a/app/system/transport/router/permission.go b/app/system/internal/transport/router/permission.go similarity index 87% rename from app/system/transport/router/permission.go rename to app/system/internal/transport/router/permission.go index d51b93f..05ebe39 100644 --- a/app/system/transport/router/permission.go +++ b/app/system/internal/transport/router/permission.go @@ -1,7 +1,7 @@ package router import ( - "kra/app/system/transport/handler" + "kra/app/system/internal/transport/handler" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/router/public.go b/app/system/internal/transport/router/public.go similarity index 89% rename from app/system/transport/router/public.go rename to app/system/internal/transport/router/public.go index 280e829..4df566f 100644 --- a/app/system/transport/router/public.go +++ b/app/system/internal/transport/router/public.go @@ -1,7 +1,7 @@ package router import ( - "kra/app/system/transport/handler" + "kra/app/system/internal/transport/handler" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/router/system_config.go b/app/system/internal/transport/router/system_config.go similarity index 92% rename from app/system/transport/router/system_config.go rename to app/system/internal/transport/router/system_config.go index 6ae244f..721e562 100644 --- a/app/system/transport/router/system_config.go +++ b/app/system/internal/transport/router/system_config.go @@ -1,7 +1,7 @@ package router import ( - "kra/app/system/transport/handler" + "kra/app/system/internal/transport/handler" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/router/task.go b/app/system/internal/transport/router/task.go similarity index 92% rename from app/system/transport/router/task.go rename to app/system/internal/transport/router/task.go index 64a0084..490d78a 100644 --- a/app/system/transport/router/task.go +++ b/app/system/internal/transport/router/task.go @@ -1,7 +1,7 @@ package router import ( - "kra/app/system/transport/handler" + "kra/app/system/internal/transport/handler" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/router/user.go b/app/system/internal/transport/router/user.go similarity index 95% rename from app/system/transport/router/user.go rename to app/system/internal/transport/router/user.go index 9ade4d0..6ca5f50 100644 --- a/app/system/transport/router/user.go +++ b/app/system/internal/transport/router/user.go @@ -1,7 +1,7 @@ package router import ( - "kra/app/system/transport/handler" + "kra/app/system/internal/transport/handler" "github.com/gin-gonic/gin" ) diff --git a/app/system/transport/router/version.go b/app/system/internal/transport/router/version.go similarity index 91% rename from app/system/transport/router/version.go rename to app/system/internal/transport/router/version.go index d9ec575..cb54795 100644 --- a/app/system/transport/router/version.go +++ b/app/system/internal/transport/router/version.go @@ -1,7 +1,7 @@ package router import ( - "kra/app/system/transport/handler" + "kra/app/system/internal/transport/handler" "github.com/gin-gonic/gin" ) diff --git a/app/system/utils/configutil/json.go b/app/system/internal/utils/configutil/json.go similarity index 100% rename from app/system/utils/configutil/json.go rename to app/system/internal/utils/configutil/json.go diff --git a/app/system/utils/configutil/json_test.go b/app/system/internal/utils/configutil/json_test.go similarity index 95% rename from app/system/utils/configutil/json_test.go rename to app/system/internal/utils/configutil/json_test.go index f19035d..9335b6f 100644 --- a/app/system/utils/configutil/json_test.go +++ b/app/system/internal/utils/configutil/json_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "kra/internal/conf" + "kra/app/system/internal/conf" "google.golang.org/protobuf/encoding/protojson" ) diff --git a/app/system/utils/paymentutil/README.md b/app/system/internal/utils/paymentutil/README.md similarity index 100% rename from app/system/utils/paymentutil/README.md rename to app/system/internal/utils/paymentutil/README.md diff --git a/app/system/utils/paymentutil/amount.go b/app/system/internal/utils/paymentutil/amount.go similarity index 100% rename from app/system/utils/paymentutil/amount.go rename to app/system/internal/utils/paymentutil/amount.go diff --git a/app/system/utils/paymentutil/amount_test.go b/app/system/internal/utils/paymentutil/amount_test.go similarity index 100% rename from app/system/utils/paymentutil/amount_test.go rename to app/system/internal/utils/paymentutil/amount_test.go diff --git a/app/system/utils/paymentutil/json.go b/app/system/internal/utils/paymentutil/json.go similarity index 100% rename from app/system/utils/paymentutil/json.go rename to app/system/internal/utils/paymentutil/json.go diff --git a/app/system/utils/paymentutil/json_test.go b/app/system/internal/utils/paymentutil/json_test.go similarity index 100% rename from app/system/utils/paymentutil/json_test.go rename to app/system/internal/utils/paymentutil/json_test.go diff --git a/app/system/utils/paymentutil/signing.go b/app/system/internal/utils/paymentutil/signing.go similarity index 100% rename from app/system/utils/paymentutil/signing.go rename to app/system/internal/utils/paymentutil/signing.go diff --git a/app/system/utils/paymentutil/signing_test.go b/app/system/internal/utils/paymentutil/signing_test.go similarity index 100% rename from app/system/utils/paymentutil/signing_test.go rename to app/system/internal/utils/paymentutil/signing_test.go diff --git a/app/system/utils/paymentutil/status.go b/app/system/internal/utils/paymentutil/status.go similarity index 100% rename from app/system/utils/paymentutil/status.go rename to app/system/internal/utils/paymentutil/status.go diff --git a/app/system/utils/paymentutil/xml.go b/app/system/internal/utils/paymentutil/xml.go similarity index 100% rename from app/system/utils/paymentutil/xml.go rename to app/system/internal/utils/paymentutil/xml.go diff --git a/app/system/worker/task_executor.go b/app/system/internal/worker/task_executor.go similarity index 98% rename from app/system/worker/task_executor.go rename to app/system/internal/worker/task_executor.go index 0c31fb6..4c51d71 100644 --- a/app/system/worker/task_executor.go +++ b/app/system/internal/worker/task_executor.go @@ -14,8 +14,8 @@ import ( "syscall" "time" - "kra/app/system/biz" - "kra/internal/conf" + "kra/app/system/internal/biz" + "kra/app/system/internal/conf" ) type TaskExecutor struct { diff --git a/app/system/worker/task_executor_test.go b/app/system/internal/worker/task_executor_test.go similarity index 98% rename from app/system/worker/task_executor_test.go rename to app/system/internal/worker/task_executor_test.go index 525697e..54455a7 100644 --- a/app/system/worker/task_executor_test.go +++ b/app/system/internal/worker/task_executor_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "kra/app/system/biz" + "kra/app/system/internal/biz" ) func TestPrivateIP(t *testing.T) { diff --git a/app/system/worker/task_registry.go b/app/system/internal/worker/task_registry.go similarity index 95% rename from app/system/worker/task_registry.go rename to app/system/internal/worker/task_registry.go index 65cdc0c..59b3051 100644 --- a/app/system/worker/task_registry.go +++ b/app/system/internal/worker/task_registry.go @@ -4,8 +4,8 @@ import ( "context" "encoding/json" - "kra/app/system/biz" - "kra/internal/conf" + "kra/app/system/internal/biz" + "kra/app/system/internal/conf" platformtask "kra/pkg/task" ) diff --git a/app/system/worker/task_runtime_test.go b/app/system/internal/worker/task_runtime_test.go similarity index 99% rename from app/system/worker/task_runtime_test.go rename to app/system/internal/worker/task_runtime_test.go index 8095f35..ea0200e 100644 --- a/app/system/worker/task_runtime_test.go +++ b/app/system/internal/worker/task_runtime_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "kra/app/system/biz" + "kra/app/system/internal/biz" ) type workerTaskRepo struct { diff --git a/app/system/worker/task_scheduler.go b/app/system/internal/worker/task_scheduler.go similarity index 99% rename from app/system/worker/task_scheduler.go rename to app/system/internal/worker/task_scheduler.go index 89f9ae0..430e53a 100644 --- a/app/system/worker/task_scheduler.go +++ b/app/system/internal/worker/task_scheduler.go @@ -10,7 +10,7 @@ import ( "time" "github.com/robfig/cron/v3" - "kra/app/system/biz" + "kra/app/system/internal/biz" ) type TaskScheduler struct { diff --git a/app/system/worker/task_scheduler_test.go b/app/system/internal/worker/task_scheduler_test.go similarity index 100% rename from app/system/worker/task_scheduler_test.go rename to app/system/internal/worker/task_scheduler_test.go diff --git a/app/system/worker/worker.go b/app/system/internal/worker/worker.go similarity index 100% rename from app/system/worker/worker.go rename to app/system/internal/worker/worker.go diff --git a/buf.gen.config.yaml b/buf.gen.config.yaml index 29ccaed..fc8135c 100644 --- a/buf.gen.config.yaml +++ b/buf.gen.config.yaml @@ -1,7 +1,8 @@ version: v2 inputs: - - directory: internal + - directory: app/system/internal plugins: - local: ["go", "run", "google.golang.org/protobuf/cmd/protoc-gen-go@v1.36.11"] - out: internal + out: app/system/internal opt: paths=source_relative + diff --git a/internal/logging/context.go b/pkg/logging/context.go similarity index 100% rename from internal/logging/context.go rename to pkg/logging/context.go diff --git a/internal/logging/daily.go b/pkg/logging/daily.go similarity index 100% rename from internal/logging/daily.go rename to pkg/logging/daily.go diff --git a/internal/logging/source.go b/pkg/logging/source.go similarity index 100% rename from internal/logging/source.go rename to pkg/logging/source.go diff --git a/internal/logging/zap.go b/pkg/logging/zap.go similarity index 100% rename from internal/logging/zap.go rename to pkg/logging/zap.go diff --git a/internal/logging/zap_test.go b/pkg/logging/zap_test.go similarity index 97% rename from internal/logging/zap_test.go rename to pkg/logging/zap_test.go index 2a9700f..74cebf1 100644 --- a/internal/logging/zap_test.go +++ b/pkg/logging/zap_test.go @@ -89,7 +89,7 @@ func TestErrorEntryIncludesFinalApplicationSource(t *testing.T) { if err := os.WriteFile(filename, []byte(content), 0o600); err != nil { t.Fatal(err) } - entry := errorEntryFromZap(zapcore.Entry{Message: "task failed", Level: zapcore.ErrorLevel, Stack: "kra/app/system/worker.execute\n" + filename + ":4"}, nil) + entry := errorEntryFromZap(zapcore.Entry{Message: "task failed", Level: zapcore.ErrorLevel, Stack: "kra/app/system/internal/worker.execute\n" + filename + ":4"}, nil) if !strings.Contains(entry.Info, "最终调用方法:"+filename+":4 (execute lines 3-5)") || !strings.Contains(entry.Info, "func execute()") { t.Fatalf("expected final caller source in error entry: %s", entry.Info) }