diff --git a/app/system/cmd/main.go b/cmd/main.go similarity index 96% rename from app/system/cmd/main.go rename to cmd/main.go index a0178d6..7f6d7c2 100644 --- a/app/system/cmd/main.go +++ b/cmd/main.go @@ -9,9 +9,9 @@ import ( "path/filepath" "strings" - "kra/app/system/internal/conf" - "kra/app/system/internal/service" - "kra/app/system/internal/worker" + "kra/internal/conf" + "kra/internal/service" + "kra/internal/worker" "kra/pkg/logging" "kra/pkg/mq" @@ -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, _ mq.Client) *kratos.App { diff --git a/app/system/cmd/main_test.go b/cmd/main_test.go similarity index 96% rename from app/system/cmd/main_test.go rename to cmd/main_test.go index 1889b87..135d2b5 100644 --- a/app/system/cmd/main_test.go +++ b/cmd/main_test.go @@ -3,7 +3,7 @@ package main import ( "testing" - "kra/app/system/internal/conf" + "kra/internal/conf" ) func TestSwaggerAddress(t *testing.T) { diff --git a/app/system/cmd/wire.go b/cmd/wire.go similarity index 67% rename from app/system/cmd/wire.go rename to cmd/wire.go index 8cdbe98..74531f9 100644 --- a/app/system/cmd/wire.go +++ b/cmd/wire.go @@ -8,18 +8,18 @@ package main import ( "log/slog" - "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/server/handler" - "kra/app/system/internal/server/router" - "kra/app/system/internal/service" - "kra/app/system/internal/worker" + "kra/internal/app" + "kra/internal/biz" + "kra/internal/conf" + "kra/internal/data" + "kra/internal/initialize" + "kra/internal/integration" + "kra/internal/integration/cache" + "kra/internal/server" + "kra/internal/server/handler" + "kra/internal/server/router" + "kra/internal/service" + "kra/internal/worker" "kra/pkg/logging" platformtask "kra/pkg/task" diff --git a/app/system/cmd/wire_gen.go b/cmd/wire_gen.go similarity index 92% rename from app/system/cmd/wire_gen.go rename to cmd/wire_gen.go index 25ad661..e99d008 100644 --- a/app/system/cmd/wire_gen.go +++ b/cmd/wire_gen.go @@ -8,23 +8,23 @@ package main import ( "github.com/go-kratos/kratos/v3" - "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/mq" - "kra/app/system/internal/integration/storage" - "kra/app/system/internal/integration/websocket" - "kra/app/system/internal/server" - "kra/app/system/internal/server/handler" - "kra/app/system/internal/server/router" - "kra/app/system/internal/service" - "kra/app/system/internal/worker" + "kra/internal/app" + "kra/internal/biz" + "kra/internal/conf" + "kra/internal/data" + "kra/internal/data/payment" + "kra/internal/data/repository" + "kra/internal/initialize" + "kra/internal/integration/cache" + "kra/internal/integration/email" + "kra/internal/integration/mq" + "kra/internal/integration/storage" + "kra/internal/integration/websocket" + "kra/internal/server" + "kra/internal/server/handler" + "kra/internal/server/router" + "kra/internal/service" + "kra/internal/worker" "kra/pkg/logging" "log/slog" ) diff --git a/app/system/configs/config.yaml b/configs/config.yaml similarity index 100% rename from app/system/configs/config.yaml rename to configs/config.yaml diff --git a/app/system/README.md b/internal/README.md similarity index 100% rename from app/system/README.md rename to internal/README.md diff --git a/app/system/internal/app/catalog.go b/internal/app/catalog.go similarity index 92% rename from app/system/internal/app/catalog.go rename to internal/app/catalog.go index a327eac..594305e 100644 --- a/app/system/internal/app/catalog.go +++ b/internal/app/catalog.go @@ -4,8 +4,8 @@ package app import ( - systemrouter "kra/app/system/internal/server/router" - systemworker "kra/app/system/internal/worker" + systemrouter "kra/internal/server/router" + systemworker "kra/internal/worker" "kra/pkg/module" platformtask "kra/pkg/task" ) diff --git a/app/system/internal/app/definition.go b/internal/app/definition.go similarity index 87% rename from app/system/internal/app/definition.go rename to internal/app/definition.go index 2a0191b..f3f6f3e 100644 --- a/app/system/internal/app/definition.go +++ b/internal/app/definition.go @@ -1,8 +1,8 @@ package app import ( - datapayment "kra/app/system/internal/data/payment" - datasystem "kra/app/system/internal/data/repository" + datapayment "kra/internal/data/payment" + datasystem "kra/internal/data/repository" "kra/pkg/module" ) diff --git a/app/system/internal/biz/access_control.go b/internal/biz/access_control.go similarity index 100% rename from app/system/internal/biz/access_control.go rename to internal/biz/access_control.go diff --git a/app/system/internal/biz/actor.go b/internal/biz/actor.go similarity index 100% rename from app/system/internal/biz/actor.go rename to internal/biz/actor.go diff --git a/app/system/internal/biz/announcement.go b/internal/biz/announcement.go similarity index 100% rename from app/system/internal/biz/announcement.go rename to internal/biz/announcement.go diff --git a/app/system/internal/biz/api.go b/internal/biz/api.go similarity index 100% rename from app/system/internal/biz/api.go rename to internal/biz/api.go diff --git a/app/system/internal/biz/api_token.go b/internal/biz/api_token.go similarity index 100% rename from app/system/internal/biz/api_token.go rename to internal/biz/api_token.go diff --git a/app/system/internal/biz/audit.go b/internal/biz/audit.go similarity index 100% rename from app/system/internal/biz/audit.go rename to internal/biz/audit.go diff --git a/app/system/internal/biz/authentication.go b/internal/biz/authentication.go similarity index 100% rename from app/system/internal/biz/authentication.go rename to internal/biz/authentication.go diff --git a/app/system/internal/biz/authentication_test.go b/internal/biz/authentication_test.go similarity index 100% rename from app/system/internal/biz/authentication_test.go rename to internal/biz/authentication_test.go diff --git a/app/system/internal/biz/authority.go b/internal/biz/authority.go similarity index 100% rename from app/system/internal/biz/authority.go rename to internal/biz/authority.go diff --git a/app/system/internal/biz/biz.go b/internal/biz/biz.go similarity index 100% rename from app/system/internal/biz/biz.go rename to internal/biz/biz.go diff --git a/app/system/internal/biz/data_scope.go b/internal/biz/data_scope.go similarity index 100% rename from app/system/internal/biz/data_scope.go rename to internal/biz/data_scope.go diff --git a/app/system/internal/biz/department.go b/internal/biz/department.go similarity index 100% rename from app/system/internal/biz/department.go rename to internal/biz/department.go diff --git a/app/system/internal/biz/dictionary.go b/internal/biz/dictionary.go similarity index 100% rename from app/system/internal/biz/dictionary.go rename to internal/biz/dictionary.go diff --git a/app/system/internal/biz/email.go b/internal/biz/email.go similarity index 100% rename from app/system/internal/biz/email.go rename to internal/biz/email.go diff --git a/app/system/internal/biz/errors.go b/internal/biz/errors.go similarity index 100% rename from app/system/internal/biz/errors.go rename to internal/biz/errors.go diff --git a/app/system/internal/biz/export.go b/internal/biz/export.go similarity index 100% rename from app/system/internal/biz/export.go rename to internal/biz/export.go diff --git a/app/system/internal/biz/infrastructure.go b/internal/biz/infrastructure.go similarity index 100% rename from app/system/internal/biz/infrastructure.go rename to internal/biz/infrastructure.go diff --git a/app/system/internal/biz/integration_config.go b/internal/biz/integration_config.go similarity index 100% rename from app/system/internal/biz/integration_config.go rename to internal/biz/integration_config.go diff --git a/app/system/internal/biz/integration_config_definition.go b/internal/biz/integration_config_definition.go similarity index 100% rename from app/system/internal/biz/integration_config_definition.go rename to internal/biz/integration_config_definition.go diff --git a/app/system/internal/biz/media.go b/internal/biz/media.go similarity index 100% rename from app/system/internal/biz/media.go rename to internal/biz/media.go diff --git a/app/system/internal/biz/media_metadata.go b/internal/biz/media_metadata.go similarity index 100% rename from app/system/internal/biz/media_metadata.go rename to internal/biz/media_metadata.go diff --git a/app/system/internal/biz/media_test.go b/internal/biz/media_test.go similarity index 100% rename from app/system/internal/biz/media_test.go rename to internal/biz/media_test.go diff --git a/app/system/internal/biz/media_upload.go b/internal/biz/media_upload.go similarity index 100% rename from app/system/internal/biz/media_upload.go rename to internal/biz/media_upload.go diff --git a/app/system/internal/biz/menu.go b/internal/biz/menu.go similarity index 100% rename from app/system/internal/biz/menu.go rename to internal/biz/menu.go diff --git a/app/system/internal/biz/pagination.go b/internal/biz/pagination.go similarity index 100% rename from app/system/internal/biz/pagination.go rename to internal/biz/pagination.go diff --git a/app/system/internal/biz/parameter.go b/internal/biz/parameter.go similarity index 100% rename from app/system/internal/biz/parameter.go rename to internal/biz/parameter.go diff --git a/app/system/internal/biz/payment.go b/internal/biz/payment.go similarity index 100% rename from app/system/internal/biz/payment.go rename to internal/biz/payment.go diff --git a/app/system/internal/biz/payment_log.go b/internal/biz/payment_log.go similarity index 100% rename from app/system/internal/biz/payment_log.go rename to internal/biz/payment_log.go diff --git a/app/system/internal/biz/payment_order.go b/internal/biz/payment_order.go similarity index 100% rename from app/system/internal/biz/payment_order.go rename to internal/biz/payment_order.go diff --git a/app/system/internal/biz/payment_test.go b/internal/biz/payment_test.go similarity index 100% rename from app/system/internal/biz/payment_test.go rename to internal/biz/payment_test.go diff --git a/app/system/internal/biz/permission.go b/internal/biz/permission.go similarity index 100% rename from app/system/internal/biz/permission.go rename to internal/biz/permission.go diff --git a/app/system/internal/biz/position.go b/internal/biz/position.go similarity index 100% rename from app/system/internal/biz/position.go rename to internal/biz/position.go diff --git a/app/system/internal/biz/security.go b/internal/biz/security.go similarity index 100% rename from app/system/internal/biz/security.go rename to internal/biz/security.go diff --git a/app/system/internal/biz/security_test.go b/internal/biz/security_test.go similarity index 100% rename from app/system/internal/biz/security_test.go rename to internal/biz/security_test.go diff --git a/app/system/internal/biz/system_init.go b/internal/biz/system_init.go similarity index 100% rename from app/system/internal/biz/system_init.go rename to internal/biz/system_init.go diff --git a/app/system/internal/biz/task.go b/internal/biz/task.go similarity index 100% rename from app/system/internal/biz/task.go rename to internal/biz/task.go diff --git a/app/system/internal/biz/task_registry.go b/internal/biz/task_registry.go similarity index 100% rename from app/system/internal/biz/task_registry.go rename to internal/biz/task_registry.go diff --git a/app/system/internal/biz/task_test.go b/internal/biz/task_test.go similarity index 100% rename from app/system/internal/biz/task_test.go rename to internal/biz/task_test.go diff --git a/app/system/internal/biz/upload_session.go b/internal/biz/upload_session.go similarity index 100% rename from app/system/internal/biz/upload_session.go rename to internal/biz/upload_session.go diff --git a/app/system/internal/biz/user.go b/internal/biz/user.go similarity index 100% rename from app/system/internal/biz/user.go rename to internal/biz/user.go diff --git a/app/system/internal/biz/user_test.go b/internal/biz/user_test.go similarity index 100% rename from app/system/internal/biz/user_test.go rename to internal/biz/user_test.go diff --git a/app/system/internal/biz/version.go b/internal/biz/version.go similarity index 100% rename from app/system/internal/biz/version.go rename to internal/biz/version.go diff --git a/app/system/internal/conf/conf.pb.go b/internal/conf/conf.pb.go similarity index 93% rename from app/system/internal/conf/conf.pb.go rename to internal/conf/conf.pb.go index 5e1f470..a168e3e 100644 --- a/app/system/internal/conf/conf.pb.go +++ b/internal/conf/conf.pb.go @@ -1,8 +1,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.11 -// protoc (unknown) -// source: conf/conf.proto +// protoc v5.28.3 +// source: internal/conf/conf.proto package conf @@ -33,7 +33,7 @@ type Bootstrap struct { func (x *Bootstrap) Reset() { *x = Bootstrap{} - mi := &file_conf_conf_proto_msgTypes[0] + mi := &file_internal_conf_conf_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -45,7 +45,7 @@ func (x *Bootstrap) String() string { func (*Bootstrap) ProtoMessage() {} func (x *Bootstrap) ProtoReflect() protoreflect.Message { - mi := &file_conf_conf_proto_msgTypes[0] + mi := &file_internal_conf_conf_proto_msgTypes[0] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -58,7 +58,7 @@ func (x *Bootstrap) ProtoReflect() protoreflect.Message { // Deprecated: Use Bootstrap.ProtoReflect.Descriptor instead. func (*Bootstrap) Descriptor() ([]byte, []int) { - return file_conf_conf_proto_rawDescGZIP(), []int{0} + return file_internal_conf_conf_proto_rawDescGZIP(), []int{0} } func (x *Bootstrap) GetServer() *Server { @@ -91,7 +91,7 @@ type Server struct { func (x *Server) Reset() { *x = Server{} - mi := &file_conf_conf_proto_msgTypes[1] + mi := &file_internal_conf_conf_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -103,7 +103,7 @@ func (x *Server) String() string { func (*Server) ProtoMessage() {} func (x *Server) ProtoReflect() protoreflect.Message { - mi := &file_conf_conf_proto_msgTypes[1] + mi := &file_internal_conf_conf_proto_msgTypes[1] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -116,7 +116,7 @@ func (x *Server) ProtoReflect() protoreflect.Message { // Deprecated: Use Server.ProtoReflect.Descriptor instead. func (*Server) Descriptor() ([]byte, []int) { - return file_conf_conf_proto_rawDescGZIP(), []int{1} + return file_internal_conf_conf_proto_rawDescGZIP(), []int{1} } func (x *Server) GetHttp() *Server_HTTP { @@ -139,7 +139,7 @@ type Data struct { func (x *Data) Reset() { *x = Data{} - mi := &file_conf_conf_proto_msgTypes[2] + mi := &file_internal_conf_conf_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -151,7 +151,7 @@ func (x *Data) String() string { func (*Data) ProtoMessage() {} func (x *Data) ProtoReflect() protoreflect.Message { - mi := &file_conf_conf_proto_msgTypes[2] + mi := &file_internal_conf_conf_proto_msgTypes[2] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -164,7 +164,7 @@ func (x *Data) ProtoReflect() protoreflect.Message { // Deprecated: Use Data.ProtoReflect.Descriptor instead. func (*Data) Descriptor() ([]byte, []int) { - return file_conf_conf_proto_rawDescGZIP(), []int{2} + return file_internal_conf_conf_proto_rawDescGZIP(), []int{2} } func (x *Data) GetDatabase() *Data_Database { @@ -227,7 +227,7 @@ type AdminBackend struct { func (x *AdminBackend) Reset() { *x = AdminBackend{} - mi := &file_conf_conf_proto_msgTypes[3] + mi := &file_internal_conf_conf_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -239,7 +239,7 @@ func (x *AdminBackend) String() string { func (*AdminBackend) ProtoMessage() {} func (x *AdminBackend) ProtoReflect() protoreflect.Message { - mi := &file_conf_conf_proto_msgTypes[3] + mi := &file_internal_conf_conf_proto_msgTypes[3] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -252,7 +252,7 @@ func (x *AdminBackend) ProtoReflect() protoreflect.Message { // Deprecated: Use AdminBackend.ProtoReflect.Descriptor instead. func (*AdminBackend) Descriptor() ([]byte, []int) { - return file_conf_conf_proto_rawDescGZIP(), []int{3} + return file_internal_conf_conf_proto_rawDescGZIP(), []int{3} } func (x *AdminBackend) GetRouterPrefix() string { @@ -371,7 +371,7 @@ type Server_HTTP struct { func (x *Server_HTTP) Reset() { *x = Server_HTTP{} - mi := &file_conf_conf_proto_msgTypes[4] + mi := &file_internal_conf_conf_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -383,7 +383,7 @@ func (x *Server_HTTP) String() string { func (*Server_HTTP) ProtoMessage() {} func (x *Server_HTTP) ProtoReflect() protoreflect.Message { - mi := &file_conf_conf_proto_msgTypes[4] + mi := &file_internal_conf_conf_proto_msgTypes[4] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -396,7 +396,7 @@ func (x *Server_HTTP) ProtoReflect() protoreflect.Message { // Deprecated: Use Server_HTTP.ProtoReflect.Descriptor instead. func (*Server_HTTP) Descriptor() ([]byte, []int) { - return file_conf_conf_proto_rawDescGZIP(), []int{1, 0} + return file_internal_conf_conf_proto_rawDescGZIP(), []int{1, 0} } func (x *Server_HTTP) GetNetwork() string { @@ -446,7 +446,7 @@ type Data_Database struct { func (x *Data_Database) Reset() { *x = Data_Database{} - mi := &file_conf_conf_proto_msgTypes[5] + mi := &file_internal_conf_conf_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -458,7 +458,7 @@ func (x *Data_Database) String() string { func (*Data_Database) ProtoMessage() {} func (x *Data_Database) ProtoReflect() protoreflect.Message { - mi := &file_conf_conf_proto_msgTypes[5] + mi := &file_internal_conf_conf_proto_msgTypes[5] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -471,7 +471,7 @@ func (x *Data_Database) ProtoReflect() protoreflect.Message { // Deprecated: Use Data_Database.ProtoReflect.Descriptor instead. func (*Data_Database) Descriptor() ([]byte, []int) { - return file_conf_conf_proto_rawDescGZIP(), []int{2, 0} + return file_internal_conf_conf_proto_rawDescGZIP(), []int{2, 0} } func (x *Data_Database) GetDriver() string { @@ -617,7 +617,7 @@ type Data_Redis struct { func (x *Data_Redis) Reset() { *x = Data_Redis{} - mi := &file_conf_conf_proto_msgTypes[6] + mi := &file_internal_conf_conf_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -629,7 +629,7 @@ func (x *Data_Redis) String() string { func (*Data_Redis) ProtoMessage() {} func (x *Data_Redis) ProtoReflect() protoreflect.Message { - mi := &file_conf_conf_proto_msgTypes[6] + mi := &file_internal_conf_conf_proto_msgTypes[6] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -642,7 +642,7 @@ func (x *Data_Redis) ProtoReflect() protoreflect.Message { // Deprecated: Use Data_Redis.ProtoReflect.Descriptor instead. func (*Data_Redis) Descriptor() ([]byte, []int) { - return file_conf_conf_proto_rawDescGZIP(), []int{2, 1} + return file_internal_conf_conf_proto_rawDescGZIP(), []int{2, 1} } func (x *Data_Redis) GetNetwork() string { @@ -718,7 +718,7 @@ type Data_MongoHost struct { func (x *Data_MongoHost) Reset() { *x = Data_MongoHost{} - mi := &file_conf_conf_proto_msgTypes[7] + mi := &file_internal_conf_conf_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -730,7 +730,7 @@ func (x *Data_MongoHost) String() string { func (*Data_MongoHost) ProtoMessage() {} func (x *Data_MongoHost) ProtoReflect() protoreflect.Message { - mi := &file_conf_conf_proto_msgTypes[7] + mi := &file_internal_conf_conf_proto_msgTypes[7] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -743,7 +743,7 @@ func (x *Data_MongoHost) ProtoReflect() protoreflect.Message { // Deprecated: Use Data_MongoHost.ProtoReflect.Descriptor instead. func (*Data_MongoHost) Descriptor() ([]byte, []int) { - return file_conf_conf_proto_rawDescGZIP(), []int{2, 2} + return file_internal_conf_conf_proto_rawDescGZIP(), []int{2, 2} } func (x *Data_MongoHost) GetHost() string { @@ -780,7 +780,7 @@ type Data_Mongo struct { func (x *Data_Mongo) Reset() { *x = Data_Mongo{} - mi := &file_conf_conf_proto_msgTypes[8] + mi := &file_internal_conf_conf_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -792,7 +792,7 @@ func (x *Data_Mongo) String() string { func (*Data_Mongo) ProtoMessage() {} func (x *Data_Mongo) ProtoReflect() protoreflect.Message { - mi := &file_conf_conf_proto_msgTypes[8] + mi := &file_internal_conf_conf_proto_msgTypes[8] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -805,7 +805,7 @@ func (x *Data_Mongo) ProtoReflect() protoreflect.Message { // Deprecated: Use Data_Mongo.ProtoReflect.Descriptor instead. func (*Data_Mongo) Descriptor() ([]byte, []int) { - return file_conf_conf_proto_rawDescGZIP(), []int{2, 3} + return file_internal_conf_conf_proto_rawDescGZIP(), []int{2, 3} } func (x *Data_Mongo) GetColl() string { @@ -904,7 +904,7 @@ type AdminBackend_JWT struct { func (x *AdminBackend_JWT) Reset() { *x = AdminBackend_JWT{} - mi := &file_conf_conf_proto_msgTypes[9] + mi := &file_internal_conf_conf_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -916,7 +916,7 @@ func (x *AdminBackend_JWT) String() string { func (*AdminBackend_JWT) ProtoMessage() {} func (x *AdminBackend_JWT) ProtoReflect() protoreflect.Message { - mi := &file_conf_conf_proto_msgTypes[9] + mi := &file_internal_conf_conf_proto_msgTypes[9] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -929,7 +929,7 @@ func (x *AdminBackend_JWT) ProtoReflect() protoreflect.Message { // Deprecated: Use AdminBackend_JWT.ProtoReflect.Descriptor instead. func (*AdminBackend_JWT) Descriptor() ([]byte, []int) { - return file_conf_conf_proto_rawDescGZIP(), []int{3, 0} + return file_internal_conf_conf_proto_rawDescGZIP(), []int{3, 0} } func (x *AdminBackend_JWT) GetSigningKey() string { @@ -972,7 +972,7 @@ type AdminBackend_Captcha struct { func (x *AdminBackend_Captcha) Reset() { *x = AdminBackend_Captcha{} - mi := &file_conf_conf_proto_msgTypes[10] + mi := &file_internal_conf_conf_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -984,7 +984,7 @@ func (x *AdminBackend_Captcha) String() string { func (*AdminBackend_Captcha) ProtoMessage() {} func (x *AdminBackend_Captcha) ProtoReflect() protoreflect.Message { - mi := &file_conf_conf_proto_msgTypes[10] + mi := &file_internal_conf_conf_proto_msgTypes[10] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -997,7 +997,7 @@ func (x *AdminBackend_Captcha) ProtoReflect() protoreflect.Message { // Deprecated: Use AdminBackend_Captcha.ProtoReflect.Descriptor instead. func (*AdminBackend_Captcha) Descriptor() ([]byte, []int) { - return file_conf_conf_proto_rawDescGZIP(), []int{3, 1} + return file_internal_conf_conf_proto_rawDescGZIP(), []int{3, 1} } func (x *AdminBackend_Captcha) GetKeyLong() int32 { @@ -1038,7 +1038,7 @@ type AdminBackend_Local struct { func (x *AdminBackend_Local) Reset() { *x = AdminBackend_Local{} - mi := &file_conf_conf_proto_msgTypes[11] + mi := &file_internal_conf_conf_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1050,7 +1050,7 @@ func (x *AdminBackend_Local) String() string { func (*AdminBackend_Local) ProtoMessage() {} func (x *AdminBackend_Local) ProtoReflect() protoreflect.Message { - mi := &file_conf_conf_proto_msgTypes[11] + mi := &file_internal_conf_conf_proto_msgTypes[11] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1063,7 +1063,7 @@ func (x *AdminBackend_Local) ProtoReflect() protoreflect.Message { // Deprecated: Use AdminBackend_Local.ProtoReflect.Descriptor instead. func (*AdminBackend_Local) Descriptor() ([]byte, []int) { - return file_conf_conf_proto_rawDescGZIP(), []int{3, 2} + return file_internal_conf_conf_proto_rawDescGZIP(), []int{3, 2} } func (x *AdminBackend_Local) GetStorePath() string { @@ -1096,7 +1096,7 @@ type AdminBackend_Email struct { func (x *AdminBackend_Email) Reset() { *x = AdminBackend_Email{} - mi := &file_conf_conf_proto_msgTypes[12] + mi := &file_internal_conf_conf_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1108,7 +1108,7 @@ func (x *AdminBackend_Email) String() string { func (*AdminBackend_Email) ProtoMessage() {} func (x *AdminBackend_Email) ProtoReflect() protoreflect.Message { - mi := &file_conf_conf_proto_msgTypes[12] + mi := &file_internal_conf_conf_proto_msgTypes[12] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1121,7 +1121,7 @@ func (x *AdminBackend_Email) ProtoReflect() protoreflect.Message { // Deprecated: Use AdminBackend_Email.ProtoReflect.Descriptor instead. func (*AdminBackend_Email) Descriptor() ([]byte, []int) { - return file_conf_conf_proto_rawDescGZIP(), []int{3, 3} + return file_internal_conf_conf_proto_rawDescGZIP(), []int{3, 3} } func (x *AdminBackend_Email) GetTo() string { @@ -1191,7 +1191,7 @@ type AdminBackend_Media struct { func (x *AdminBackend_Media) Reset() { *x = AdminBackend_Media{} - mi := &file_conf_conf_proto_msgTypes[13] + mi := &file_internal_conf_conf_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1203,7 +1203,7 @@ func (x *AdminBackend_Media) String() string { func (*AdminBackend_Media) ProtoMessage() {} func (x *AdminBackend_Media) ProtoReflect() protoreflect.Message { - mi := &file_conf_conf_proto_msgTypes[13] + mi := &file_internal_conf_conf_proto_msgTypes[13] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1216,7 +1216,7 @@ func (x *AdminBackend_Media) ProtoReflect() protoreflect.Message { // Deprecated: Use AdminBackend_Media.ProtoReflect.Descriptor instead. func (*AdminBackend_Media) Descriptor() ([]byte, []int) { - return file_conf_conf_proto_rawDescGZIP(), []int{3, 4} + return file_internal_conf_conf_proto_rawDescGZIP(), []int{3, 4} } func (x *AdminBackend_Media) GetSessionTtl() int32 { @@ -1249,7 +1249,7 @@ type AdminBackend_Disk struct { func (x *AdminBackend_Disk) Reset() { *x = AdminBackend_Disk{} - mi := &file_conf_conf_proto_msgTypes[14] + mi := &file_internal_conf_conf_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1261,7 +1261,7 @@ func (x *AdminBackend_Disk) String() string { func (*AdminBackend_Disk) ProtoMessage() {} func (x *AdminBackend_Disk) ProtoReflect() protoreflect.Message { - mi := &file_conf_conf_proto_msgTypes[14] + mi := &file_internal_conf_conf_proto_msgTypes[14] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1274,7 +1274,7 @@ func (x *AdminBackend_Disk) ProtoReflect() protoreflect.Message { // Deprecated: Use AdminBackend_Disk.ProtoReflect.Descriptor instead. func (*AdminBackend_Disk) Descriptor() ([]byte, []int) { - return file_conf_conf_proto_rawDescGZIP(), []int{3, 5} + return file_internal_conf_conf_proto_rawDescGZIP(), []int{3, 5} } func (x *AdminBackend_Disk) GetMountPoint() string { @@ -1300,7 +1300,7 @@ type AdminBackend_System struct { func (x *AdminBackend_System) Reset() { *x = AdminBackend_System{} - mi := &file_conf_conf_proto_msgTypes[15] + mi := &file_internal_conf_conf_proto_msgTypes[15] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1312,7 +1312,7 @@ func (x *AdminBackend_System) String() string { func (*AdminBackend_System) ProtoMessage() {} func (x *AdminBackend_System) ProtoReflect() protoreflect.Message { - mi := &file_conf_conf_proto_msgTypes[15] + mi := &file_internal_conf_conf_proto_msgTypes[15] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1325,7 +1325,7 @@ func (x *AdminBackend_System) ProtoReflect() protoreflect.Message { // Deprecated: Use AdminBackend_System.ProtoReflect.Descriptor instead. func (*AdminBackend_System) Descriptor() ([]byte, []int) { - return file_conf_conf_proto_rawDescGZIP(), []int{3, 6} + return file_internal_conf_conf_proto_rawDescGZIP(), []int{3, 6} } func (x *AdminBackend_System) GetUseRedis() bool { @@ -1406,7 +1406,7 @@ type AdminBackend_Zap struct { func (x *AdminBackend_Zap) Reset() { *x = AdminBackend_Zap{} - mi := &file_conf_conf_proto_msgTypes[16] + mi := &file_internal_conf_conf_proto_msgTypes[16] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1418,7 +1418,7 @@ func (x *AdminBackend_Zap) String() string { func (*AdminBackend_Zap) ProtoMessage() {} func (x *AdminBackend_Zap) ProtoReflect() protoreflect.Message { - mi := &file_conf_conf_proto_msgTypes[16] + mi := &file_internal_conf_conf_proto_msgTypes[16] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1431,7 +1431,7 @@ func (x *AdminBackend_Zap) ProtoReflect() protoreflect.Message { // Deprecated: Use AdminBackend_Zap.ProtoReflect.Descriptor instead. func (*AdminBackend_Zap) Descriptor() ([]byte, []int) { - return file_conf_conf_proto_rawDescGZIP(), []int{3, 7} + return file_internal_conf_conf_proto_rawDescGZIP(), []int{3, 7} } func (x *AdminBackend_Zap) GetLevel() string { @@ -1542,7 +1542,7 @@ type AdminBackend_CORS struct { func (x *AdminBackend_CORS) Reset() { *x = AdminBackend_CORS{} - mi := &file_conf_conf_proto_msgTypes[17] + mi := &file_internal_conf_conf_proto_msgTypes[17] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1554,7 +1554,7 @@ func (x *AdminBackend_CORS) String() string { func (*AdminBackend_CORS) ProtoMessage() {} func (x *AdminBackend_CORS) ProtoReflect() protoreflect.Message { - mi := &file_conf_conf_proto_msgTypes[17] + mi := &file_internal_conf_conf_proto_msgTypes[17] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1567,7 +1567,7 @@ func (x *AdminBackend_CORS) ProtoReflect() protoreflect.Message { // Deprecated: Use AdminBackend_CORS.ProtoReflect.Descriptor instead. func (*AdminBackend_CORS) Descriptor() ([]byte, []int) { - return file_conf_conf_proto_rawDescGZIP(), []int{3, 8} + return file_internal_conf_conf_proto_rawDescGZIP(), []int{3, 8} } func (x *AdminBackend_CORS) GetMode() string { @@ -1597,7 +1597,7 @@ type AdminBackend_CORSRule struct { func (x *AdminBackend_CORSRule) Reset() { *x = AdminBackend_CORSRule{} - mi := &file_conf_conf_proto_msgTypes[18] + mi := &file_internal_conf_conf_proto_msgTypes[18] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1609,7 +1609,7 @@ func (x *AdminBackend_CORSRule) String() string { func (*AdminBackend_CORSRule) ProtoMessage() {} func (x *AdminBackend_CORSRule) ProtoReflect() protoreflect.Message { - mi := &file_conf_conf_proto_msgTypes[18] + mi := &file_internal_conf_conf_proto_msgTypes[18] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1622,7 +1622,7 @@ func (x *AdminBackend_CORSRule) ProtoReflect() protoreflect.Message { // Deprecated: Use AdminBackend_CORSRule.ProtoReflect.Descriptor instead. func (*AdminBackend_CORSRule) Descriptor() ([]byte, []int) { - return file_conf_conf_proto_rawDescGZIP(), []int{3, 9} + return file_internal_conf_conf_proto_rawDescGZIP(), []int{3, 9} } func (x *AdminBackend_CORSRule) GetAllowOrigin() string { @@ -1671,7 +1671,7 @@ type AdminBackend_App struct { func (x *AdminBackend_App) Reset() { *x = AdminBackend_App{} - mi := &file_conf_conf_proto_msgTypes[19] + mi := &file_internal_conf_conf_proto_msgTypes[19] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1683,7 +1683,7 @@ func (x *AdminBackend_App) String() string { func (*AdminBackend_App) ProtoMessage() {} func (x *AdminBackend_App) ProtoReflect() protoreflect.Message { - mi := &file_conf_conf_proto_msgTypes[19] + mi := &file_internal_conf_conf_proto_msgTypes[19] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1696,7 +1696,7 @@ func (x *AdminBackend_App) ProtoReflect() protoreflect.Message { // Deprecated: Use AdminBackend_App.ProtoReflect.Descriptor instead. func (*AdminBackend_App) Descriptor() ([]byte, []int) { - return file_conf_conf_proto_rawDescGZIP(), []int{3, 10} + return file_internal_conf_conf_proto_rawDescGZIP(), []int{3, 10} } func (x *AdminBackend_App) GetNode() string { @@ -1737,7 +1737,7 @@ type AdminBackend_WebSocket struct { func (x *AdminBackend_WebSocket) Reset() { *x = AdminBackend_WebSocket{} - mi := &file_conf_conf_proto_msgTypes[20] + mi := &file_internal_conf_conf_proto_msgTypes[20] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1749,7 +1749,7 @@ func (x *AdminBackend_WebSocket) String() string { func (*AdminBackend_WebSocket) ProtoMessage() {} func (x *AdminBackend_WebSocket) ProtoReflect() protoreflect.Message { - mi := &file_conf_conf_proto_msgTypes[20] + mi := &file_internal_conf_conf_proto_msgTypes[20] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1762,7 +1762,7 @@ func (x *AdminBackend_WebSocket) ProtoReflect() protoreflect.Message { // Deprecated: Use AdminBackend_WebSocket.ProtoReflect.Descriptor instead. func (*AdminBackend_WebSocket) Descriptor() ([]byte, []int) { - return file_conf_conf_proto_rawDescGZIP(), []int{3, 11} + return file_internal_conf_conf_proto_rawDescGZIP(), []int{3, 11} } func (x *AdminBackend_WebSocket) GetEnabled() bool { @@ -1846,7 +1846,7 @@ type AdminBackend_MQ struct { func (x *AdminBackend_MQ) Reset() { *x = AdminBackend_MQ{} - mi := &file_conf_conf_proto_msgTypes[21] + mi := &file_internal_conf_conf_proto_msgTypes[21] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1858,7 +1858,7 @@ func (x *AdminBackend_MQ) String() string { func (*AdminBackend_MQ) ProtoMessage() {} func (x *AdminBackend_MQ) ProtoReflect() protoreflect.Message { - mi := &file_conf_conf_proto_msgTypes[21] + mi := &file_internal_conf_conf_proto_msgTypes[21] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1871,7 +1871,7 @@ func (x *AdminBackend_MQ) ProtoReflect() protoreflect.Message { // Deprecated: Use AdminBackend_MQ.ProtoReflect.Descriptor instead. func (*AdminBackend_MQ) Descriptor() ([]byte, []int) { - return file_conf_conf_proto_rawDescGZIP(), []int{3, 12} + return file_internal_conf_conf_proto_rawDescGZIP(), []int{3, 12} } func (x *AdminBackend_MQ) GetEnabled() bool { @@ -1946,7 +1946,7 @@ type AdminBackend_Storage struct { func (x *AdminBackend_Storage) Reset() { *x = AdminBackend_Storage{} - mi := &file_conf_conf_proto_msgTypes[22] + mi := &file_internal_conf_conf_proto_msgTypes[22] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1958,7 +1958,7 @@ func (x *AdminBackend_Storage) String() string { func (*AdminBackend_Storage) ProtoMessage() {} func (x *AdminBackend_Storage) ProtoReflect() protoreflect.Message { - mi := &file_conf_conf_proto_msgTypes[22] + mi := &file_internal_conf_conf_proto_msgTypes[22] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1971,7 +1971,7 @@ func (x *AdminBackend_Storage) ProtoReflect() protoreflect.Message { // Deprecated: Use AdminBackend_Storage.ProtoReflect.Descriptor instead. func (*AdminBackend_Storage) Descriptor() ([]byte, []int) { - return file_conf_conf_proto_rawDescGZIP(), []int{3, 13} + return file_internal_conf_conf_proto_rawDescGZIP(), []int{3, 13} } func (x *AdminBackend_Storage) GetType() string { @@ -2045,7 +2045,7 @@ type AdminBackend_Qiniu struct { func (x *AdminBackend_Qiniu) Reset() { *x = AdminBackend_Qiniu{} - mi := &file_conf_conf_proto_msgTypes[23] + mi := &file_internal_conf_conf_proto_msgTypes[23] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2057,7 +2057,7 @@ func (x *AdminBackend_Qiniu) String() string { func (*AdminBackend_Qiniu) ProtoMessage() {} func (x *AdminBackend_Qiniu) ProtoReflect() protoreflect.Message { - mi := &file_conf_conf_proto_msgTypes[23] + mi := &file_internal_conf_conf_proto_msgTypes[23] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2070,7 +2070,7 @@ func (x *AdminBackend_Qiniu) ProtoReflect() protoreflect.Message { // Deprecated: Use AdminBackend_Qiniu.ProtoReflect.Descriptor instead. func (*AdminBackend_Qiniu) Descriptor() ([]byte, []int) { - return file_conf_conf_proto_rawDescGZIP(), []int{3, 14} + return file_internal_conf_conf_proto_rawDescGZIP(), []int{3, 14} } func (x *AdminBackend_Qiniu) GetZone() string { @@ -2142,7 +2142,7 @@ type AdminBackend_ObjectStore struct { func (x *AdminBackend_ObjectStore) Reset() { *x = AdminBackend_ObjectStore{} - mi := &file_conf_conf_proto_msgTypes[24] + mi := &file_internal_conf_conf_proto_msgTypes[24] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2154,7 +2154,7 @@ func (x *AdminBackend_ObjectStore) String() string { func (*AdminBackend_ObjectStore) ProtoMessage() {} func (x *AdminBackend_ObjectStore) ProtoReflect() protoreflect.Message { - mi := &file_conf_conf_proto_msgTypes[24] + mi := &file_internal_conf_conf_proto_msgTypes[24] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2167,7 +2167,7 @@ func (x *AdminBackend_ObjectStore) ProtoReflect() protoreflect.Message { // Deprecated: Use AdminBackend_ObjectStore.ProtoReflect.Descriptor instead. func (*AdminBackend_ObjectStore) Descriptor() ([]byte, []int) { - return file_conf_conf_proto_rawDescGZIP(), []int{3, 15} + return file_internal_conf_conf_proto_rawDescGZIP(), []int{3, 15} } func (x *AdminBackend_ObjectStore) GetEndpoint() string { @@ -2240,11 +2240,11 @@ func (x *AdminBackend_ObjectStore) GetAccountId() string { return "" } -var File_conf_conf_proto protoreflect.FileDescriptor +var File_internal_conf_conf_proto protoreflect.FileDescriptor -const file_conf_conf_proto_rawDesc = "" + +const file_internal_conf_conf_proto_rawDesc = "" + "\n" + - "\x0fconf/conf.proto\x12\n" + + "\x18internal/conf/conf.proto\x12\n" + "kratos.api\x1a\x1egoogle/protobuf/duration.proto\"\x8d\x01\n" + "\tBootstrap\x12*\n" + "\x06server\x18\x01 \x01(\v2\x12.kratos.api.ServerR\x06server\x12$\n" + @@ -2463,22 +2463,22 @@ 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#Z!kra/app/system/internal/conf;confb\x06proto3" + " \x01(\tR\taccountIdB\x18Z\x16kra/internal/conf;confb\x06proto3" var ( - file_conf_conf_proto_rawDescOnce sync.Once - file_conf_conf_proto_rawDescData []byte + file_internal_conf_conf_proto_rawDescOnce sync.Once + file_internal_conf_conf_proto_rawDescData []byte ) -func file_conf_conf_proto_rawDescGZIP() []byte { - file_conf_conf_proto_rawDescOnce.Do(func() { - file_conf_conf_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_conf_conf_proto_rawDesc), len(file_conf_conf_proto_rawDesc))) +func file_internal_conf_conf_proto_rawDescGZIP() []byte { + file_internal_conf_conf_proto_rawDescOnce.Do(func() { + file_internal_conf_conf_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_internal_conf_conf_proto_rawDesc), len(file_internal_conf_conf_proto_rawDesc))) }) - return file_conf_conf_proto_rawDescData + return file_internal_conf_conf_proto_rawDescData } -var file_conf_conf_proto_msgTypes = make([]protoimpl.MessageInfo, 25) -var file_conf_conf_proto_goTypes = []any{ +var file_internal_conf_conf_proto_msgTypes = make([]protoimpl.MessageInfo, 25) +var file_internal_conf_conf_proto_goTypes = []any{ (*Bootstrap)(nil), // 0: kratos.api.Bootstrap (*Server)(nil), // 1: kratos.api.Server (*Data)(nil), // 2: kratos.api.Data @@ -2506,7 +2506,7 @@ var file_conf_conf_proto_goTypes = []any{ (*AdminBackend_ObjectStore)(nil), // 24: kratos.api.AdminBackend.ObjectStore (*durationpb.Duration)(nil), // 25: google.protobuf.Duration } -var file_conf_conf_proto_depIdxs = []int32{ +var file_internal_conf_conf_proto_depIdxs = []int32{ 1, // 0: kratos.api.Bootstrap.server:type_name -> kratos.api.Server 2, // 1: kratos.api.Bootstrap.data:type_name -> kratos.api.Data 3, // 2: kratos.api.Bootstrap.admin:type_name -> kratos.api.AdminBackend @@ -2554,26 +2554,26 @@ var file_conf_conf_proto_depIdxs = []int32{ 0, // [0:40] is the sub-list for field type_name } -func init() { file_conf_conf_proto_init() } -func file_conf_conf_proto_init() { - if File_conf_conf_proto != nil { +func init() { file_internal_conf_conf_proto_init() } +func file_internal_conf_conf_proto_init() { + if File_internal_conf_conf_proto != nil { return } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_conf_conf_proto_rawDesc), len(file_conf_conf_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_internal_conf_conf_proto_rawDesc), len(file_internal_conf_conf_proto_rawDesc)), NumEnums: 0, NumMessages: 25, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_conf_conf_proto_goTypes, - DependencyIndexes: file_conf_conf_proto_depIdxs, - MessageInfos: file_conf_conf_proto_msgTypes, + GoTypes: file_internal_conf_conf_proto_goTypes, + DependencyIndexes: file_internal_conf_conf_proto_depIdxs, + MessageInfos: file_internal_conf_conf_proto_msgTypes, }.Build() - File_conf_conf_proto = out.File - file_conf_conf_proto_goTypes = nil - file_conf_conf_proto_depIdxs = nil + File_internal_conf_conf_proto = out.File + file_internal_conf_conf_proto_goTypes = nil + file_internal_conf_conf_proto_depIdxs = nil } diff --git a/app/system/internal/conf/conf.proto b/internal/conf/conf.proto similarity index 100% rename from app/system/internal/conf/conf.proto rename to internal/conf/conf.proto diff --git a/app/system/internal/conf/runtime.go b/internal/conf/runtime.go similarity index 100% rename from app/system/internal/conf/runtime.go rename to internal/conf/runtime.go diff --git a/app/system/internal/conf/runtime_test.go b/internal/conf/runtime_test.go similarity index 100% rename from app/system/internal/conf/runtime_test.go rename to internal/conf/runtime_test.go diff --git a/app/system/internal/data/README.md b/internal/data/README.md similarity index 100% rename from app/system/internal/data/README.md rename to internal/data/README.md diff --git a/app/system/internal/data/config_helpers.go b/internal/data/config_helpers.go similarity index 95% rename from app/system/internal/data/config_helpers.go rename to internal/data/config_helpers.go index f8f09c5..33bb9f6 100644 --- a/app/system/internal/data/config_helpers.go +++ b/internal/data/config_helpers.go @@ -1,7 +1,7 @@ package data import ( - "kra/app/system/internal/conf" + "kra/internal/conf" "google.golang.org/protobuf/proto" ) diff --git a/app/system/internal/data/config_store.go b/internal/data/config_store.go similarity index 99% rename from app/system/internal/data/config_store.go rename to internal/data/config_store.go index 16ac8a9..7adb3d6 100644 --- a/app/system/internal/data/config_store.go +++ b/internal/data/config_store.go @@ -9,8 +9,8 @@ import ( "path/filepath" "strconv" - "kra/app/system/internal/conf" - "kra/app/system/internal/integration/storage" + "kra/internal/conf" + "kra/internal/integration/storage" "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" diff --git a/app/system/internal/data/config_watch.go b/internal/data/config_watch.go similarity index 100% rename from app/system/internal/data/config_watch.go rename to internal/data/config_watch.go diff --git a/app/system/internal/data/data.go b/internal/data/data.go similarity index 98% rename from app/system/internal/data/data.go rename to internal/data/data.go index 4f0435d..0b24268 100644 --- a/app/system/internal/data/data.go +++ b/internal/data/data.go @@ -11,10 +11,10 @@ import ( "github.com/google/wire" "github.com/redis/go-redis/v9" "gorm.io/gorm" - "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/internal/conf" + datapayment "kra/internal/data/payment" + datasystem "kra/internal/data/repository" + "kra/internal/integration/storage" "kra/pkg/module" ) diff --git a/app/system/internal/data/data_scope.go b/internal/data/data_scope.go similarity index 99% rename from app/system/internal/data/data_scope.go rename to internal/data/data_scope.go index 2aab56e..8211723 100644 --- a/app/system/internal/data/data_scope.go +++ b/internal/data/data_scope.go @@ -7,7 +7,7 @@ import ( "reflect" "strings" - "kra/app/system/internal/biz" + "kra/internal/biz" "gorm.io/gorm" "gorm.io/gorm/clause" diff --git a/app/system/internal/data/data_scope_audit.go b/internal/data/data_scope_audit.go similarity index 100% rename from app/system/internal/data/data_scope_audit.go rename to internal/data/data_scope_audit.go diff --git a/app/system/internal/data/data_scope_audit_test.go b/internal/data/data_scope_audit_test.go similarity index 100% rename from app/system/internal/data/data_scope_audit_test.go rename to internal/data/data_scope_audit_test.go diff --git a/app/system/internal/data/data_scope_record.go b/internal/data/data_scope_record.go similarity index 100% rename from app/system/internal/data/data_scope_record.go rename to internal/data/data_scope_record.go diff --git a/app/system/internal/data/data_scope_test.go b/internal/data/data_scope_test.go similarity index 99% rename from app/system/internal/data/data_scope_test.go rename to internal/data/data_scope_test.go index 60edbb4..56175e7 100644 --- a/app/system/internal/data/data_scope_test.go +++ b/internal/data/data_scope_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "kra/app/system/internal/biz" + "kra/internal/biz" "gorm.io/gorm" ) diff --git a/app/system/internal/data/database.go b/internal/data/database.go similarity index 99% rename from app/system/internal/data/database.go rename to internal/data/database.go index f929dd2..350450b 100644 --- a/app/system/internal/data/database.go +++ b/internal/data/database.go @@ -19,7 +19,7 @@ import ( "gorm.io/gorm" "gorm.io/gorm/logger" "gorm.io/gorm/schema" - "kra/app/system/internal/conf" + "kra/internal/conf" "kra/pkg/database/gormkit" ) diff --git a/app/system/internal/data/gorm_logger_test.go b/internal/data/gorm_logger_test.go similarity index 100% rename from app/system/internal/data/gorm_logger_test.go rename to internal/data/gorm_logger_test.go diff --git a/app/system/internal/data/initialization_backend.go b/internal/data/initialization_backend.go similarity index 98% rename from app/system/internal/data/initialization_backend.go rename to internal/data/initialization_backend.go index 528254f..933f673 100644 --- a/app/system/internal/data/initialization_backend.go +++ b/internal/data/initialization_backend.go @@ -5,9 +5,9 @@ import ( "errors" "fmt" - "kra/app/system/internal/biz" - "kra/app/system/internal/conf" - "kra/app/system/internal/integration/storage" + "kra/internal/biz" + "kra/internal/conf" + "kra/internal/integration/storage" "github.com/google/uuid" "google.golang.org/protobuf/encoding/protojson" diff --git a/app/system/internal/data/initialization_backend_test.go b/internal/data/initialization_backend_test.go similarity index 99% rename from app/system/internal/data/initialization_backend_test.go rename to internal/data/initialization_backend_test.go index 09d073b..1677659 100644 --- a/app/system/internal/data/initialization_backend_test.go +++ b/internal/data/initialization_backend_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "kra/app/system/internal/conf" + "kra/internal/conf" "gopkg.in/yaml.v3" ) diff --git a/app/system/internal/data/integration_config.go b/internal/data/integration_config.go similarity index 99% rename from app/system/internal/data/integration_config.go rename to internal/data/integration_config.go index 55ee235..492c988 100644 --- a/app/system/internal/data/integration_config.go +++ b/internal/data/integration_config.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "kra/app/system/internal/conf" + "kra/internal/conf" "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" diff --git a/app/system/internal/data/integration_config_test.go b/internal/data/integration_config_test.go similarity index 99% rename from app/system/internal/data/integration_config_test.go rename to internal/data/integration_config_test.go index 1cc057b..c018823 100644 --- a/app/system/internal/data/integration_config_test.go +++ b/internal/data/integration_config_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "kra/app/system/internal/conf" - "kra/app/system/internal/integration/storage" + "kra/internal/conf" + "kra/internal/integration/storage" "google.golang.org/protobuf/encoding/protojson" "gopkg.in/yaml.v3" diff --git a/app/system/internal/data/migrations.go b/internal/data/migrations.go similarity index 88% rename from app/system/internal/data/migrations.go rename to internal/data/migrations.go index edd3fca..287f339 100644 --- a/app/system/internal/data/migrations.go +++ b/internal/data/migrations.go @@ -1,8 +1,8 @@ package data import ( - datapayment "kra/app/system/internal/data/payment" - datasystem "kra/app/system/internal/data/repository" + datapayment "kra/internal/data/payment" + datasystem "kra/internal/data/repository" "kra/pkg/database/migration" "kra/pkg/module" diff --git a/app/system/internal/data/migrations_test.go b/internal/data/migrations_test.go similarity index 100% rename from app/system/internal/data/migrations_test.go rename to internal/data/migrations_test.go diff --git a/app/system/internal/data/mongo.go b/internal/data/mongo.go similarity index 98% rename from app/system/internal/data/mongo.go rename to internal/data/mongo.go index cd14509..a1c7d7f 100644 --- a/app/system/internal/data/mongo.go +++ b/internal/data/mongo.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "kra/app/system/internal/conf" + "kra/internal/conf" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" diff --git a/app/system/internal/data/payment/migrations.go b/internal/data/payment/migrations.go similarity index 100% rename from app/system/internal/data/payment/migrations.go rename to internal/data/payment/migrations.go diff --git a/app/system/internal/data/payment/models.go b/internal/data/payment/models.go similarity index 100% rename from app/system/internal/data/payment/models.go rename to internal/data/payment/models.go diff --git a/app/system/internal/data/payment/payment.go b/internal/data/payment/payment.go similarity index 99% rename from app/system/internal/data/payment/payment.go rename to internal/data/payment/payment.go index 5899b48..6ee86d5 100644 --- a/app/system/internal/data/payment/payment.go +++ b/internal/data/payment/payment.go @@ -11,8 +11,8 @@ import ( "strconv" "strings" - "kra/app/system/internal/biz" - datapayment "kra/app/system/internal/integration/payment" + "kra/internal/biz" + datapayment "kra/internal/integration/payment" "gorm.io/gorm" ) diff --git a/app/system/internal/data/payment/payment_config_test.go b/internal/data/payment/payment_config_test.go similarity index 98% rename from app/system/internal/data/payment/payment_config_test.go rename to internal/data/payment/payment_config_test.go index 35ac2c5..b4b34e5 100644 --- a/app/system/internal/data/payment/payment_config_test.go +++ b/internal/data/payment/payment_config_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "kra/app/system/internal/biz" + "kra/internal/biz" ) func TestValidatePaymentConfigRequiresDouyinAppIDWhenEnabled(t *testing.T) { diff --git a/app/system/internal/data/payment/payment_helpers.go b/internal/data/payment/payment_helpers.go similarity index 100% rename from app/system/internal/data/payment/payment_helpers.go rename to internal/data/payment/payment_helpers.go diff --git a/app/system/internal/data/payment/payment_native_test.go b/internal/data/payment/payment_native_test.go similarity index 96% rename from app/system/internal/data/payment/payment_native_test.go rename to internal/data/payment/payment_native_test.go index d1c559a..2c8e22f 100644 --- a/app/system/internal/data/payment/payment_native_test.go +++ b/internal/data/payment/payment_native_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "kra/app/system/internal/biz" + "kra/internal/biz" ) func TestPaymentDefinitionsProvideNonEmptyDefaults(t *testing.T) { diff --git a/app/system/internal/data/payment/payment_order.go b/internal/data/payment/payment_order.go similarity index 99% rename from app/system/internal/data/payment/payment_order.go rename to internal/data/payment/payment_order.go index d8847bf..776972d 100644 --- a/app/system/internal/data/payment/payment_order.go +++ b/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/internal/biz" + "kra/internal/biz" "kra/pkg/database/pagination" ) diff --git a/app/system/internal/data/payment/payment_order_test.go b/internal/data/payment/payment_order_test.go similarity index 99% rename from app/system/internal/data/payment/payment_order_test.go rename to internal/data/payment/payment_order_test.go index e5eb736..af5ced5 100644 --- a/app/system/internal/data/payment/payment_order_test.go +++ b/internal/data/payment/payment_order_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "kra/app/system/internal/biz" + "kra/internal/biz" ) func newPaymentOrderRepoForTest(t *testing.T) *paymentOrderRepo { diff --git a/app/system/internal/data/payment/provider.go b/internal/data/payment/provider.go similarity index 100% rename from app/system/internal/data/payment/provider.go rename to internal/data/payment/provider.go diff --git a/app/system/internal/data/payment/testing_support_test.go b/internal/data/payment/testing_support_test.go similarity index 100% rename from app/system/internal/data/payment/testing_support_test.go rename to internal/data/payment/testing_support_test.go diff --git a/app/system/internal/data/repository/announcement.go b/internal/data/repository/announcement.go similarity index 99% rename from app/system/internal/data/repository/announcement.go rename to internal/data/repository/announcement.go index 6f09f3d..41f09af 100644 --- a/app/system/internal/data/repository/announcement.go +++ b/internal/data/repository/announcement.go @@ -5,7 +5,7 @@ import ( "encoding/json" "time" - "kra/app/system/internal/biz" + "kra/internal/biz" "kra/pkg/database/gormkit" "kra/pkg/database/pagination" diff --git a/app/system/internal/data/repository/announcement_test.go b/internal/data/repository/announcement_test.go similarity index 97% rename from app/system/internal/data/repository/announcement_test.go rename to internal/data/repository/announcement_test.go index 0225c65..1623352 100644 --- a/app/system/internal/data/repository/announcement_test.go +++ b/internal/data/repository/announcement_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "kra/app/system/internal/biz" + "kra/internal/biz" ) func TestAnnouncementRepositoryKeepsRawIDQuerySemantics(t *testing.T) { diff --git a/app/system/internal/data/repository/api.go b/internal/data/repository/api.go similarity index 99% rename from app/system/internal/data/repository/api.go rename to internal/data/repository/api.go index eda9e5d..b598cfc 100644 --- a/app/system/internal/data/repository/api.go +++ b/internal/data/repository/api.go @@ -6,7 +6,7 @@ import ( "strconv" "time" - "kra/app/system/internal/biz" + "kra/internal/biz" "kra/pkg/database/pagination" "gorm.io/gorm" diff --git a/app/system/internal/data/repository/api_policy.go b/internal/data/repository/api_policy.go similarity index 99% rename from app/system/internal/data/repository/api_policy.go rename to internal/data/repository/api_policy.go index 9bcf877..95a4eb8 100644 --- a/app/system/internal/data/repository/api_policy.go +++ b/internal/data/repository/api_policy.go @@ -5,7 +5,7 @@ import ( "errors" "strconv" - "kra/app/system/internal/biz" + "kra/internal/biz" "github.com/casbin/casbin/v3" casbinmodel "github.com/casbin/casbin/v3/model" diff --git a/app/system/internal/data/repository/api_policy_test.go b/internal/data/repository/api_policy_test.go similarity index 98% rename from app/system/internal/data/repository/api_policy_test.go rename to internal/data/repository/api_policy_test.go index f15bdb0..2d87813 100644 --- a/app/system/internal/data/repository/api_policy_test.go +++ b/internal/data/repository/api_policy_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "kra/app/system/internal/biz" - "kra/app/system/internal/conf" + "kra/internal/biz" + "kra/internal/conf" ) func newPolicyTestData(t *testing.T) *Data { diff --git a/app/system/internal/data/repository/api_sync.go b/internal/data/repository/api_sync.go similarity index 98% rename from app/system/internal/data/repository/api_sync.go rename to internal/data/repository/api_sync.go index 52d2335..e3aa634 100644 --- a/app/system/internal/data/repository/api_sync.go +++ b/internal/data/repository/api_sync.go @@ -3,7 +3,7 @@ package system import ( "context" - "kra/app/system/internal/biz" + "kra/internal/biz" "gorm.io/gorm" ) diff --git a/app/system/internal/data/repository/api_token.go b/internal/data/repository/api_token.go similarity index 99% rename from app/system/internal/data/repository/api_token.go rename to internal/data/repository/api_token.go index 7ec3cbd..a17c8f3 100644 --- a/app/system/internal/data/repository/api_token.go +++ b/internal/data/repository/api_token.go @@ -5,7 +5,7 @@ import ( "errors" "time" - "kra/app/system/internal/biz" + "kra/internal/biz" "kra/pkg/database/pagination" "gorm.io/gorm" diff --git a/app/system/internal/data/repository/audit.go b/internal/data/repository/audit.go similarity index 92% rename from app/system/internal/data/repository/audit.go rename to internal/data/repository/audit.go index bb7d77f..e10dc88 100644 --- a/app/system/internal/data/repository/audit.go +++ b/internal/data/repository/audit.go @@ -1,6 +1,6 @@ package system -import "kra/app/system/internal/biz" +import "kra/internal/biz" type auditQueryRepo struct{ data Provider } type auditRecorderRepo struct{ data Provider } diff --git a/app/system/internal/data/repository/audit_delete_test.go b/internal/data/repository/audit_delete_test.go similarity index 100% rename from app/system/internal/data/repository/audit_delete_test.go rename to internal/data/repository/audit_delete_test.go diff --git a/app/system/internal/data/repository/authority.go b/internal/data/repository/authority.go similarity index 99% rename from app/system/internal/data/repository/authority.go rename to internal/data/repository/authority.go index bce997d..2eae127 100644 --- a/app/system/internal/data/repository/authority.go +++ b/internal/data/repository/authority.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "kra/app/system/internal/biz" + "kra/internal/biz" "gorm.io/gorm" ) diff --git a/app/system/internal/data/repository/authority_test.go b/internal/data/repository/authority_test.go similarity index 99% rename from app/system/internal/data/repository/authority_test.go rename to internal/data/repository/authority_test.go index c217d64..cec035d 100644 --- a/app/system/internal/data/repository/authority_test.go +++ b/internal/data/repository/authority_test.go @@ -5,8 +5,8 @@ import ( "errors" "testing" - "kra/app/system/internal/biz" - "kra/app/system/internal/conf" + "kra/internal/biz" + "kra/internal/conf" "gorm.io/gorm" ) diff --git a/app/system/internal/data/repository/bootstrap.go b/internal/data/repository/bootstrap.go similarity index 100% rename from app/system/internal/data/repository/bootstrap.go rename to internal/data/repository/bootstrap.go diff --git a/app/system/internal/data/repository/casbin.go b/internal/data/repository/casbin.go similarity index 100% rename from app/system/internal/data/repository/casbin.go rename to internal/data/repository/casbin.go diff --git a/app/system/internal/data/repository/data_access_log.go b/internal/data/repository/data_access_log.go similarity index 98% rename from app/system/internal/data/repository/data_access_log.go rename to internal/data/repository/data_access_log.go index 0bf97ee..ab92eff 100644 --- a/app/system/internal/data/repository/data_access_log.go +++ b/internal/data/repository/data_access_log.go @@ -4,7 +4,7 @@ import ( "context" "time" - "kra/app/system/internal/biz" + "kra/internal/biz" "kra/pkg/database/pagination" "gorm.io/gorm" diff --git a/app/system/internal/data/repository/department.go b/internal/data/repository/department.go similarity index 99% rename from app/system/internal/data/repository/department.go rename to internal/data/repository/department.go index 62d7250..0a4cf19 100644 --- a/app/system/internal/data/repository/department.go +++ b/internal/data/repository/department.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "kra/app/system/internal/biz" + "kra/internal/biz" "gorm.io/gorm" ) diff --git a/app/system/internal/data/repository/dictionary.go b/internal/data/repository/dictionary.go similarity index 99% rename from app/system/internal/data/repository/dictionary.go rename to internal/data/repository/dictionary.go index 4e85ff4..4ff35dd 100644 --- a/app/system/internal/data/repository/dictionary.go +++ b/internal/data/repository/dictionary.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "kra/app/system/internal/biz" + "kra/internal/biz" "kra/pkg/database/pagination" "gorm.io/gorm" diff --git a/app/system/internal/data/repository/dictionary_department_parity_test.go b/internal/data/repository/dictionary_department_parity_test.go similarity index 99% rename from app/system/internal/data/repository/dictionary_department_parity_test.go rename to internal/data/repository/dictionary_department_parity_test.go index efbff74..10954a4 100644 --- a/app/system/internal/data/repository/dictionary_department_parity_test.go +++ b/internal/data/repository/dictionary_department_parity_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "kra/app/system/internal/biz" + "kra/internal/biz" ) func TestDictionaryListPreservesPreloadCollectionShapes(t *testing.T) { diff --git a/app/system/internal/data/repository/error_record.go b/internal/data/repository/error_record.go similarity index 99% rename from app/system/internal/data/repository/error_record.go rename to internal/data/repository/error_record.go index ef4201b..01afda6 100644 --- a/app/system/internal/data/repository/error_record.go +++ b/internal/data/repository/error_record.go @@ -4,7 +4,7 @@ import ( "context" "time" - "kra/app/system/internal/biz" + "kra/internal/biz" "kra/pkg/database/pagination" "gorm.io/gorm" diff --git a/app/system/internal/data/repository/error_record_test.go b/internal/data/repository/error_record_test.go similarity index 99% rename from app/system/internal/data/repository/error_record_test.go rename to internal/data/repository/error_record_test.go index f0e50d9..d3c5e81 100644 --- a/app/system/internal/data/repository/error_record_test.go +++ b/internal/data/repository/error_record_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "kra/app/system/internal/biz" + "kra/internal/biz" ) func errorString(value string) *string { return &value } diff --git a/app/system/internal/data/repository/export.go b/internal/data/repository/export.go similarity index 99% rename from app/system/internal/data/repository/export.go rename to internal/data/repository/export.go index 7c9767e..c7c2065 100644 --- a/app/system/internal/data/repository/export.go +++ b/internal/data/repository/export.go @@ -7,7 +7,7 @@ import ( "fmt" "gorm.io/gorm" "gorm.io/gorm/clause" - "kra/app/system/internal/biz" + "kra/internal/biz" "strconv" "strings" "time" diff --git a/app/system/internal/data/repository/integration_config.go b/internal/data/repository/integration_config.go similarity index 99% rename from app/system/internal/data/repository/integration_config.go rename to internal/data/repository/integration_config.go index 1b94094..a649587 100644 --- a/app/system/internal/data/repository/integration_config.go +++ b/internal/data/repository/integration_config.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "kra/app/system/internal/biz" + "kra/internal/biz" "gorm.io/gorm" ) diff --git a/app/system/internal/data/repository/log_file.go b/internal/data/repository/log_file.go similarity index 99% rename from app/system/internal/data/repository/log_file.go rename to internal/data/repository/log_file.go index 0552427..3127fc8 100644 --- a/app/system/internal/data/repository/log_file.go +++ b/internal/data/repository/log_file.go @@ -14,7 +14,7 @@ import ( "strings" "time" - "kra/app/system/internal/biz" + "kra/internal/biz" ) const ( diff --git a/app/system/internal/data/repository/log_file_test.go b/internal/data/repository/log_file_test.go similarity index 95% rename from app/system/internal/data/repository/log_file_test.go rename to internal/data/repository/log_file_test.go index 844c2f9..f8588b6 100644 --- a/app/system/internal/data/repository/log_file_test.go +++ b/internal/data/repository/log_file_test.go @@ -7,8 +7,8 @@ import ( "path/filepath" "testing" - "kra/app/system/internal/biz" - "kra/app/system/internal/conf" + "kra/internal/biz" + "kra/internal/conf" ) func TestLogViewerReadsNestedCategoryFiles(t *testing.T) { diff --git a/app/system/internal/data/repository/login_log.go b/internal/data/repository/login_log.go similarity index 98% rename from app/system/internal/data/repository/login_log.go rename to internal/data/repository/login_log.go index 328adbf..32b88b4 100644 --- a/app/system/internal/data/repository/login_log.go +++ b/internal/data/repository/login_log.go @@ -4,7 +4,7 @@ import ( "context" "time" - "kra/app/system/internal/biz" + "kra/internal/biz" "kra/pkg/database/pagination" "gorm.io/gorm" diff --git a/app/system/internal/data/repository/media.go b/internal/data/repository/media.go similarity index 99% rename from app/system/internal/data/repository/media.go rename to internal/data/repository/media.go index dcaa7d3..67c53d4 100644 --- a/app/system/internal/data/repository/media.go +++ b/internal/data/repository/media.go @@ -5,7 +5,7 @@ import ( "errors" "time" - "kra/app/system/internal/biz" + "kra/internal/biz" "gorm.io/gorm" ) diff --git a/app/system/internal/data/repository/media_test.go b/internal/data/repository/media_test.go similarity index 96% rename from app/system/internal/data/repository/media_test.go rename to internal/data/repository/media_test.go index 63093ec..cd91a3e 100644 --- a/app/system/internal/data/repository/media_test.go +++ b/internal/data/repository/media_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "kra/app/system/internal/biz" + "kra/internal/biz" ) func TestMediaListKeepsZeroPageSizeContract(t *testing.T) { diff --git a/app/system/internal/data/repository/media_upload.go b/internal/data/repository/media_upload.go similarity index 99% rename from app/system/internal/data/repository/media_upload.go rename to internal/data/repository/media_upload.go index 33a8afe..ca30eba 100644 --- a/app/system/internal/data/repository/media_upload.go +++ b/internal/data/repository/media_upload.go @@ -5,7 +5,7 @@ import ( "errors" "time" - "kra/app/system/internal/biz" + "kra/internal/biz" "gorm.io/gorm" "gorm.io/gorm/clause" diff --git a/app/system/internal/data/repository/menu.go b/internal/data/repository/menu.go similarity index 99% rename from app/system/internal/data/repository/menu.go rename to internal/data/repository/menu.go index c2ead14..681a8d0 100644 --- a/app/system/internal/data/repository/menu.go +++ b/internal/data/repository/menu.go @@ -5,7 +5,7 @@ import ( "errors" "time" - "kra/app/system/internal/biz" + "kra/internal/biz" "gorm.io/gorm" ) diff --git a/app/system/internal/data/repository/menu_test.go b/internal/data/repository/menu_test.go similarity index 99% rename from app/system/internal/data/repository/menu_test.go rename to internal/data/repository/menu_test.go index d6ebb2e..b02e3a6 100644 --- a/app/system/internal/data/repository/menu_test.go +++ b/internal/data/repository/menu_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "kra/app/system/internal/biz" - "kra/app/system/internal/conf" + "kra/internal/biz" + "kra/internal/conf" ) func newMenuTestData(t *testing.T) *Data { diff --git a/app/system/internal/data/repository/migrations.go b/internal/data/repository/migrations.go similarity index 100% rename from app/system/internal/data/repository/migrations.go rename to internal/data/repository/migrations.go diff --git a/app/system/internal/data/repository/migrations_test.go b/internal/data/repository/migrations_test.go similarity index 100% rename from app/system/internal/data/repository/migrations_test.go rename to internal/data/repository/migrations_test.go diff --git a/app/system/internal/data/repository/models.go b/internal/data/repository/models.go similarity index 98% rename from app/system/internal/data/repository/models.go rename to internal/data/repository/models.go index a44699d..4ebe473 100644 --- a/app/system/internal/data/repository/models.go +++ b/internal/data/repository/models.go @@ -3,7 +3,7 @@ package system import ( "time" - "kra/app/system/internal/biz" + "kra/internal/biz" "gorm.io/gorm" ) diff --git a/app/system/internal/data/repository/operation_log.go b/internal/data/repository/operation_log.go similarity index 99% rename from app/system/internal/data/repository/operation_log.go rename to internal/data/repository/operation_log.go index c0ed61c..0e701c8 100644 --- a/app/system/internal/data/repository/operation_log.go +++ b/internal/data/repository/operation_log.go @@ -4,7 +4,7 @@ import ( "context" "time" - "kra/app/system/internal/biz" + "kra/internal/biz" "kra/pkg/database/pagination" "gorm.io/gorm" diff --git a/app/system/internal/data/repository/organization_test.go b/internal/data/repository/organization_test.go similarity index 100% rename from app/system/internal/data/repository/organization_test.go rename to internal/data/repository/organization_test.go diff --git a/app/system/internal/data/repository/parameter.go b/internal/data/repository/parameter.go similarity index 99% rename from app/system/internal/data/repository/parameter.go rename to internal/data/repository/parameter.go index fd72c17..625a4a7 100644 --- a/app/system/internal/data/repository/parameter.go +++ b/internal/data/repository/parameter.go @@ -4,7 +4,7 @@ import ( "context" "time" - "kra/app/system/internal/biz" + "kra/internal/biz" "kra/pkg/database/pagination" "gorm.io/gorm" diff --git a/app/system/internal/data/repository/parameter_test.go b/internal/data/repository/parameter_test.go similarity index 98% rename from app/system/internal/data/repository/parameter_test.go rename to internal/data/repository/parameter_test.go index e2a083c..d0430bb 100644 --- a/app/system/internal/data/repository/parameter_test.go +++ b/internal/data/repository/parameter_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "kra/app/system/internal/biz" + "kra/internal/biz" ) func TestParameterRepositoryPreservesModelMetadata(t *testing.T) { diff --git a/app/system/internal/data/repository/permission.go b/internal/data/repository/permission.go similarity index 99% rename from app/system/internal/data/repository/permission.go rename to internal/data/repository/permission.go index cd43c04..b98d67a 100644 --- a/app/system/internal/data/repository/permission.go +++ b/internal/data/repository/permission.go @@ -5,7 +5,7 @@ import ( "errors" "time" - "kra/app/system/internal/biz" + "kra/internal/biz" "gorm.io/gorm" ) diff --git a/app/system/internal/data/repository/permission_test.go b/internal/data/repository/permission_test.go similarity index 98% rename from app/system/internal/data/repository/permission_test.go rename to internal/data/repository/permission_test.go index 66e8aad..e5cbc0a 100644 --- a/app/system/internal/data/repository/permission_test.go +++ b/internal/data/repository/permission_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "kra/app/system/internal/biz" - "kra/app/system/internal/conf" + "kra/internal/biz" + "kra/internal/conf" ) func TestPermissionSelectedButtonsEmptyShape(t *testing.T) { diff --git a/app/system/internal/data/repository/position.go b/internal/data/repository/position.go similarity index 99% rename from app/system/internal/data/repository/position.go rename to internal/data/repository/position.go index 24c605d..321f953 100644 --- a/app/system/internal/data/repository/position.go +++ b/internal/data/repository/position.go @@ -5,7 +5,7 @@ import ( "errors" "time" - "kra/app/system/internal/biz" + "kra/internal/biz" "gorm.io/gorm" ) diff --git a/app/system/internal/data/repository/provider.go b/internal/data/repository/provider.go similarity index 90% rename from app/system/internal/data/repository/provider.go rename to internal/data/repository/provider.go index 56a1a00..e8f1b80 100644 --- a/app/system/internal/data/repository/provider.go +++ b/internal/data/repository/provider.go @@ -1,7 +1,7 @@ package system import ( - "kra/app/system/internal/conf" + "kra/internal/conf" "gorm.io/gorm" ) diff --git a/app/system/internal/data/repository/runtime.go b/internal/data/repository/runtime.go similarity index 98% rename from app/system/internal/data/repository/runtime.go rename to internal/data/repository/runtime.go index 3b1b3cd..fa0e737 100644 --- a/app/system/internal/data/repository/runtime.go +++ b/internal/data/repository/runtime.go @@ -6,9 +6,9 @@ import ( "errors" "time" - "kra/app/system/internal/biz" - "kra/app/system/internal/conf" - "kra/app/system/internal/security" + "kra/internal/biz" + "kra/internal/conf" + "kra/internal/security" jwt "github.com/golang-jwt/jwt/v5" ) diff --git a/app/system/internal/data/repository/security.go b/internal/data/repository/security.go similarity index 99% rename from app/system/internal/data/repository/security.go rename to internal/data/repository/security.go index 3bd8f31..a689b4a 100644 --- a/app/system/internal/data/repository/security.go +++ b/internal/data/repository/security.go @@ -5,7 +5,7 @@ import ( "errors" "time" - "kra/app/system/internal/biz" + "kra/internal/biz" "gorm.io/gorm" ) diff --git a/app/system/internal/data/repository/seed.go b/internal/data/repository/seed.go similarity index 99% rename from app/system/internal/data/repository/seed.go rename to internal/data/repository/seed.go index f3d4d8e..b12a4cd 100644 --- a/app/system/internal/data/repository/seed.go +++ b/internal/data/repository/seed.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "kra/app/system/internal/biz" + "kra/internal/biz" platformmodule "kra/pkg/module" "github.com/google/uuid" diff --git a/app/system/internal/data/repository/seed_test.go b/internal/data/repository/seed_test.go similarity index 98% rename from app/system/internal/data/repository/seed_test.go rename to internal/data/repository/seed_test.go index d706044..d98c5e0 100644 --- a/app/system/internal/data/repository/seed_test.go +++ b/internal/data/repository/seed_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "kra/app/system/internal/biz" + "kra/internal/biz" platformmodule "kra/pkg/module" ) diff --git a/app/system/internal/data/repository/system_init_ignore_test.go b/internal/data/repository/system_init_ignore_test.go similarity index 100% rename from app/system/internal/data/repository/system_init_ignore_test.go rename to internal/data/repository/system_init_ignore_test.go diff --git a/app/system/internal/data/repository/task.go b/internal/data/repository/task.go similarity index 99% rename from app/system/internal/data/repository/task.go rename to internal/data/repository/task.go index 6b013f7..c4c9cd7 100644 --- a/app/system/internal/data/repository/task.go +++ b/internal/data/repository/task.go @@ -2,7 +2,7 @@ package system import ( "context" - "kra/app/system/internal/biz" + "kra/internal/biz" "kra/pkg/database/gormkit" "kra/pkg/database/pagination" "time" diff --git a/app/system/internal/data/repository/task_test.go b/internal/data/repository/task_test.go similarity index 100% rename from app/system/internal/data/repository/task_test.go rename to internal/data/repository/task_test.go diff --git a/app/system/internal/data/repository/testing_support_test.go b/internal/data/repository/testing_support_test.go similarity index 98% rename from app/system/internal/data/repository/testing_support_test.go rename to internal/data/repository/testing_support_test.go index 39a5d5c..8c8a311 100644 --- a/app/system/internal/data/repository/testing_support_test.go +++ b/internal/data/repository/testing_support_test.go @@ -7,7 +7,7 @@ import ( "github.com/glebarez/sqlite" "gorm.io/gorm" - "kra/app/system/internal/conf" + "kra/internal/conf" ) // Data is a small in-package test harness. Production repositories depend on diff --git a/app/system/internal/data/repository/transactions_test.go b/internal/data/repository/transactions_test.go similarity index 99% rename from app/system/internal/data/repository/transactions_test.go rename to internal/data/repository/transactions_test.go index cc989b3..c3b00c4 100644 --- a/app/system/internal/data/repository/transactions_test.go +++ b/internal/data/repository/transactions_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "kra/app/system/internal/biz" - "kra/app/system/internal/conf" + "kra/internal/biz" + "kra/internal/conf" ) func newTransactionTestData(t *testing.T) *Data { diff --git a/app/system/internal/data/repository/user.go b/internal/data/repository/user.go similarity index 99% rename from app/system/internal/data/repository/user.go rename to internal/data/repository/user.go index 8323a8b..7524349 100644 --- a/app/system/internal/data/repository/user.go +++ b/internal/data/repository/user.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "kra/app/system/internal/biz" + "kra/internal/biz" "kra/pkg/database/pagination" "github.com/google/uuid" diff --git a/app/system/internal/data/repository/user_strict_test.go b/internal/data/repository/user_strict_test.go similarity index 99% rename from app/system/internal/data/repository/user_strict_test.go rename to internal/data/repository/user_strict_test.go index 4e37284..9933607 100644 --- a/app/system/internal/data/repository/user_strict_test.go +++ b/internal/data/repository/user_strict_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "kra/app/system/internal/biz" + "kra/internal/biz" ) func seedStrictUserTree(t *testing.T, data *Data) (actorID, childID, siblingID uint, users []userPO) { diff --git a/app/system/internal/data/repository/version.go b/internal/data/repository/version.go similarity index 99% rename from app/system/internal/data/repository/version.go rename to internal/data/repository/version.go index 4e1b984..d85644b 100644 --- a/app/system/internal/data/repository/version.go +++ b/internal/data/repository/version.go @@ -6,7 +6,7 @@ import ( "time" "gorm.io/gorm" - "kra/app/system/internal/biz" + "kra/internal/biz" "kra/pkg/database/pagination" ) diff --git a/app/system/internal/data/repository/version_test.go b/internal/data/repository/version_test.go similarity index 100% rename from app/system/internal/data/repository/version_test.go rename to internal/data/repository/version_test.go diff --git a/app/system/internal/data/runtime_clients.go b/internal/data/runtime_clients.go similarity index 100% rename from app/system/internal/data/runtime_clients.go rename to internal/data/runtime_clients.go diff --git a/app/system/internal/data/websocket_config.go b/internal/data/websocket_config.go similarity index 99% rename from app/system/internal/data/websocket_config.go rename to internal/data/websocket_config.go index 58e1253..93858d0 100644 --- a/app/system/internal/data/websocket_config.go +++ b/internal/data/websocket_config.go @@ -6,7 +6,7 @@ import ( "errors" "fmt" - "kra/app/system/internal/conf" + "kra/internal/conf" "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" diff --git a/app/system/internal/data/websocket_config_test.go b/internal/data/websocket_config_test.go similarity index 98% rename from app/system/internal/data/websocket_config_test.go rename to internal/data/websocket_config_test.go index 6df39ec..cbe2c64 100644 --- a/app/system/internal/data/websocket_config_test.go +++ b/internal/data/websocket_config_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "kra/app/system/internal/conf" + "kra/internal/conf" "google.golang.org/protobuf/types/known/durationpb" ) diff --git a/app/system/internal/initialize/backend.go b/internal/initialize/backend.go similarity index 91% rename from app/system/internal/initialize/backend.go rename to internal/initialize/backend.go index 23dba3e..821cbf1 100644 --- a/app/system/internal/initialize/backend.go +++ b/internal/initialize/backend.go @@ -3,8 +3,8 @@ package initialize import ( "context" - "kra/app/system/internal/biz" - "kra/app/system/internal/conf" + "kra/internal/biz" + "kra/internal/conf" "gorm.io/gorm" ) diff --git a/app/system/internal/initialize/compatibility.go b/internal/initialize/compatibility.go similarity index 99% rename from app/system/internal/initialize/compatibility.go rename to internal/initialize/compatibility.go index 6615c64..94bee24 100644 --- a/app/system/internal/initialize/compatibility.go +++ b/internal/initialize/compatibility.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "kra/app/system/internal/conf" + "kra/internal/conf" "google.golang.org/protobuf/types/known/durationpb" ) diff --git a/app/system/internal/initialize/configuration.go b/internal/initialize/configuration.go similarity index 99% rename from app/system/internal/initialize/configuration.go rename to internal/initialize/configuration.go index 49ab1f7..1689b0c 100644 --- a/app/system/internal/initialize/configuration.go +++ b/internal/initialize/configuration.go @@ -4,7 +4,7 @@ import ( "context" "encoding/json" - "kra/app/system/internal/conf" + "kra/internal/conf" "kra/pkg/protoutil" "google.golang.org/protobuf/encoding/protojson" diff --git a/app/system/internal/initialize/configuration_test.go b/internal/initialize/configuration_test.go similarity index 96% rename from app/system/internal/initialize/configuration_test.go rename to internal/initialize/configuration_test.go index 081d55a..a49c85e 100644 --- a/app/system/internal/initialize/configuration_test.go +++ b/internal/initialize/configuration_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "kra/app/system/internal/conf" + "kra/internal/conf" "kra/pkg/protoutil" "google.golang.org/protobuf/encoding/protojson" diff --git a/app/system/internal/initialize/initialize.go b/internal/initialize/initialize.go similarity index 93% rename from app/system/internal/initialize/initialize.go rename to internal/initialize/initialize.go index 85692af..ca676c6 100644 --- a/app/system/internal/initialize/initialize.go +++ b/internal/initialize/initialize.go @@ -3,8 +3,8 @@ package initialize import ( "context" - "kra/app/system/internal/biz" - datasystem "kra/app/system/internal/data/repository" + "kra/internal/biz" + datasystem "kra/internal/data/repository" platformmodule "kra/pkg/module" "gorm.io/gorm" diff --git a/app/system/internal/initialize/provider.go b/internal/initialize/provider.go similarity index 100% rename from app/system/internal/initialize/provider.go rename to internal/initialize/provider.go diff --git a/app/system/internal/integration/README.md b/internal/integration/README.md similarity index 96% rename from app/system/internal/integration/README.md rename to internal/integration/README.md index d5a8576..092f52f 100644 --- a/app/system/internal/integration/README.md +++ b/internal/integration/README.md @@ -1,6 +1,6 @@ # Integrations -`app/system/internal/integration` contains adapters that talk to systems outside the +`internal/integration` contains adapters that talk to systems outside the application process. They may open sockets, create SDK clients, keep reloadable state, or translate provider-specific protocols into `biz` interfaces. diff --git a/app/system/internal/integration/cache/cache.go b/internal/integration/cache/cache.go similarity index 98% rename from app/system/internal/integration/cache/cache.go rename to internal/integration/cache/cache.go index e146b0e..1393bab 100644 --- a/app/system/internal/integration/cache/cache.go +++ b/internal/integration/cache/cache.go @@ -7,7 +7,7 @@ import ( "time" "github.com/redis/go-redis/v9" - "kra/app/system/internal/biz" + "kra/internal/biz" ) type RedisProvider interface { diff --git a/app/system/internal/integration/email/email.go b/internal/integration/email/email.go similarity index 98% rename from app/system/internal/integration/email/email.go rename to internal/integration/email/email.go index 9162eb5..6332085 100644 --- a/app/system/internal/integration/email/email.go +++ b/internal/integration/email/email.go @@ -12,8 +12,8 @@ import ( "strings" "time" - "kra/app/system/internal/biz" - "kra/app/system/internal/conf" + "kra/internal/biz" + "kra/internal/conf" ) type emailRepo struct { diff --git a/app/system/internal/integration/mq/emqx.go b/internal/integration/mq/emqx.go similarity index 99% rename from app/system/internal/integration/mq/emqx.go rename to internal/integration/mq/emqx.go index f45d327..b648715 100644 --- a/app/system/internal/integration/mq/emqx.go +++ b/internal/integration/mq/emqx.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "kra/app/system/internal/conf" + "kra/internal/conf" "kra/pkg/mq" ) diff --git a/app/system/internal/integration/mq/emqx_test.go b/internal/integration/mq/emqx_test.go similarity index 100% rename from app/system/internal/integration/mq/emqx_test.go rename to internal/integration/mq/emqx_test.go diff --git a/app/system/internal/integration/payment/adapter.go b/internal/integration/payment/adapter.go similarity index 98% rename from app/system/internal/integration/payment/adapter.go rename to internal/integration/payment/adapter.go index 2703688..6526702 100644 --- a/app/system/internal/integration/payment/adapter.go +++ b/internal/integration/payment/adapter.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "kra/app/system/internal/biz" + "kra/internal/biz" ) // Adapter is the provider boundary used by the payment repository. Provider diff --git a/app/system/internal/integration/payment/adapter_test.go b/internal/integration/payment/adapter_test.go similarity index 92% rename from app/system/internal/integration/payment/adapter_test.go rename to internal/integration/payment/adapter_test.go index c6a37cf..29d6129 100644 --- a/app/system/internal/integration/payment/adapter_test.go +++ b/internal/integration/payment/adapter_test.go @@ -3,7 +3,7 @@ package payment import ( "testing" - "kra/app/system/internal/biz" + "kra/internal/biz" ) func TestEverySupportedProviderHasAdapter(t *testing.T) { diff --git a/app/system/internal/integration/payment/alipay.go b/internal/integration/payment/alipay.go similarity index 99% rename from app/system/internal/integration/payment/alipay.go rename to internal/integration/payment/alipay.go index f762398..8ad00f2 100644 --- a/app/system/internal/integration/payment/alipay.go +++ b/internal/integration/payment/alipay.go @@ -13,7 +13,7 @@ import ( "strings" "time" - "kra/app/system/internal/biz" + "kra/internal/biz" "github.com/go-pay/gopay" gopayAlipay "github.com/go-pay/gopay/alipay" diff --git a/app/system/internal/integration/payment/alipay_v3.go b/internal/integration/payment/alipay_v3.go similarity index 99% rename from app/system/internal/integration/payment/alipay_v3.go rename to internal/integration/payment/alipay_v3.go index fb40cb0..af71081 100644 --- a/app/system/internal/integration/payment/alipay_v3.go +++ b/internal/integration/payment/alipay_v3.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "kra/app/system/internal/biz" + "kra/internal/biz" "github.com/go-pay/gopay" gopayAlipay "github.com/go-pay/gopay/alipay" diff --git a/app/system/internal/integration/payment/alipay_v3_test.go b/internal/integration/payment/alipay_v3_test.go similarity index 99% rename from app/system/internal/integration/payment/alipay_v3_test.go rename to internal/integration/payment/alipay_v3_test.go index e4dccfb..37edf0d 100644 --- a/app/system/internal/integration/payment/alipay_v3_test.go +++ b/internal/integration/payment/alipay_v3_test.go @@ -17,7 +17,7 @@ import ( "testing" "time" - "kra/app/system/internal/biz" + "kra/internal/biz" gopayAlipay "github.com/go-pay/gopay/alipay" gopayAlipayV3 "github.com/go-pay/gopay/alipay/v3" diff --git a/app/system/internal/integration/payment/allinpay.go b/internal/integration/payment/allinpay.go similarity index 99% rename from app/system/internal/integration/payment/allinpay.go rename to internal/integration/payment/allinpay.go index f0a423a..37ffe10 100644 --- a/app/system/internal/integration/payment/allinpay.go +++ b/internal/integration/payment/allinpay.go @@ -15,7 +15,7 @@ import ( "strings" "sync" - "kra/app/system/internal/biz" + "kra/internal/biz" "github.com/go-pay/crypto/xpem" "github.com/go-pay/crypto/xrsa" diff --git a/app/system/internal/integration/payment/allinpay_test.go b/internal/integration/payment/allinpay_test.go similarity index 99% rename from app/system/internal/integration/payment/allinpay_test.go rename to internal/integration/payment/allinpay_test.go index 578c5c1..7a09ce6 100644 --- a/app/system/internal/integration/payment/allinpay_test.go +++ b/internal/integration/payment/allinpay_test.go @@ -18,7 +18,7 @@ import ( "strings" "testing" - "kra/app/system/internal/biz" + "kra/internal/biz" "github.com/go-pay/gopay" "github.com/go-pay/gopay/allinpay" diff --git a/app/system/internal/integration/payment/apple.go b/internal/integration/payment/apple.go similarity index 99% rename from app/system/internal/integration/payment/apple.go rename to internal/integration/payment/apple.go index f8d7a1d..c62e1c7 100644 --- a/app/system/internal/integration/payment/apple.go +++ b/internal/integration/payment/apple.go @@ -8,7 +8,7 @@ import ( "math" "strings" - "kra/app/system/internal/biz" + "kra/internal/biz" gopayApple "github.com/go-pay/gopay/apple" "github.com/google/uuid" diff --git a/app/system/internal/integration/payment/apple_jws.go b/internal/integration/payment/apple_jws.go similarity index 100% rename from app/system/internal/integration/payment/apple_jws.go rename to internal/integration/payment/apple_jws.go diff --git a/app/system/internal/integration/payment/apple_jws_test.go b/internal/integration/payment/apple_jws_test.go similarity index 100% rename from app/system/internal/integration/payment/apple_jws_test.go rename to internal/integration/payment/apple_jws_test.go diff --git a/app/system/internal/integration/payment/douyin.go b/internal/integration/payment/douyin.go similarity index 99% rename from app/system/internal/integration/payment/douyin.go rename to internal/integration/payment/douyin.go index 87580cc..748d187 100644 --- a/app/system/internal/integration/payment/douyin.go +++ b/internal/integration/payment/douyin.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "kra/app/system/internal/biz" + "kra/internal/biz" "github.com/go-pay/gopay" "github.com/go-pay/gopay/douyin" diff --git a/app/system/internal/integration/payment/gopay.go b/internal/integration/payment/gopay.go similarity index 100% rename from app/system/internal/integration/payment/gopay.go rename to internal/integration/payment/gopay.go diff --git a/app/system/internal/integration/payment/gopay_helpers.go b/internal/integration/payment/gopay_helpers.go similarity index 99% rename from app/system/internal/integration/payment/gopay_helpers.go rename to internal/integration/payment/gopay_helpers.go index 66f5768..62bfd80 100644 --- a/app/system/internal/integration/payment/gopay_helpers.go +++ b/internal/integration/payment/gopay_helpers.go @@ -7,7 +7,7 @@ import ( "net/http" "strings" - "kra/app/system/internal/biz" + "kra/internal/biz" "github.com/go-pay/gopay" "github.com/go-pay/gopay/douyin" diff --git a/app/system/internal/integration/payment/gopay_test.go b/internal/integration/payment/gopay_test.go similarity index 99% rename from app/system/internal/integration/payment/gopay_test.go rename to internal/integration/payment/gopay_test.go index ff50cab..066f079 100644 --- a/app/system/internal/integration/payment/gopay_test.go +++ b/internal/integration/payment/gopay_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "kra/app/system/internal/biz" + "kra/internal/biz" "kra/pkg/paymentkit" gopayAlipay "github.com/go-pay/gopay/alipay" diff --git a/app/system/internal/integration/payment/identity_test.go b/internal/integration/payment/identity_test.go similarity index 99% rename from app/system/internal/integration/payment/identity_test.go rename to internal/integration/payment/identity_test.go index d0341e3..31b6cb7 100644 --- a/app/system/internal/integration/payment/identity_test.go +++ b/internal/integration/payment/identity_test.go @@ -18,7 +18,7 @@ import ( "strings" "testing" - "kra/app/system/internal/biz" + "kra/internal/biz" "github.com/go-pay/gopay" "github.com/go-pay/gopay/allinpay" diff --git a/app/system/internal/integration/payment/lakala.go b/internal/integration/payment/lakala.go similarity index 99% rename from app/system/internal/integration/payment/lakala.go rename to internal/integration/payment/lakala.go index 9d4f608..6eae7a3 100644 --- a/app/system/internal/integration/payment/lakala.go +++ b/internal/integration/payment/lakala.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - "kra/app/system/internal/biz" + "kra/internal/biz" "github.com/go-pay/gopay" "github.com/go-pay/gopay/lakala" diff --git a/app/system/internal/integration/payment/lakala_test.go b/internal/integration/payment/lakala_test.go similarity index 99% rename from app/system/internal/integration/payment/lakala_test.go rename to internal/integration/payment/lakala_test.go index 8688bba..2972435 100644 --- a/app/system/internal/integration/payment/lakala_test.go +++ b/internal/integration/payment/lakala_test.go @@ -3,7 +3,7 @@ package payment import ( "testing" - "kra/app/system/internal/biz" + "kra/internal/biz" "github.com/go-pay/gopay/lakala" ) diff --git a/app/system/internal/integration/payment/native_test.go b/internal/integration/payment/native_test.go similarity index 99% rename from app/system/internal/integration/payment/native_test.go rename to internal/integration/payment/native_test.go index 1ef401b..2c488da 100644 --- a/app/system/internal/integration/payment/native_test.go +++ b/internal/integration/payment/native_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "kra/app/system/internal/biz" + "kra/internal/biz" ) func TestWechatV2SignOfficialStyle(t *testing.T) { diff --git a/app/system/internal/integration/payment/paypal.go b/internal/integration/payment/paypal.go similarity index 99% rename from app/system/internal/integration/payment/paypal.go rename to internal/integration/payment/paypal.go index ccd2767..58c38d5 100644 --- a/app/system/internal/integration/payment/paypal.go +++ b/internal/integration/payment/paypal.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "kra/app/system/internal/biz" + "kra/internal/biz" "github.com/go-pay/gopay" "github.com/go-pay/gopay/paypal" diff --git a/app/system/internal/integration/payment/paypal_test.go b/internal/integration/payment/paypal_test.go similarity index 99% rename from app/system/internal/integration/payment/paypal_test.go rename to internal/integration/payment/paypal_test.go index 105c19d..a5c4c38 100644 --- a/app/system/internal/integration/payment/paypal_test.go +++ b/internal/integration/payment/paypal_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "kra/app/system/internal/biz" + "kra/internal/biz" "github.com/go-pay/gopay/paypal" ) diff --git a/app/system/internal/integration/payment/qq.go b/internal/integration/payment/qq.go similarity index 99% rename from app/system/internal/integration/payment/qq.go rename to internal/integration/payment/qq.go index 5475bb6..4477efb 100644 --- a/app/system/internal/integration/payment/qq.go +++ b/internal/integration/payment/qq.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "kra/app/system/internal/biz" + "kra/internal/biz" "github.com/go-pay/gopay" gopayQQ "github.com/go-pay/gopay/qq" diff --git a/app/system/internal/integration/payment/qq_test.go b/internal/integration/payment/qq_test.go similarity index 99% rename from app/system/internal/integration/payment/qq_test.go rename to internal/integration/payment/qq_test.go index ea762a9..76fffaa 100644 --- a/app/system/internal/integration/payment/qq_test.go +++ b/internal/integration/payment/qq_test.go @@ -11,7 +11,7 @@ import ( "net/http/httptest" "testing" - "kra/app/system/internal/biz" + "kra/internal/biz" "kra/pkg/paymentkit" "github.com/go-pay/gopay" diff --git a/app/system/internal/integration/payment/refund_boundary_test.go b/internal/integration/payment/refund_boundary_test.go similarity index 99% rename from app/system/internal/integration/payment/refund_boundary_test.go rename to internal/integration/payment/refund_boundary_test.go index 6c2621d..f098458 100644 --- a/app/system/internal/integration/payment/refund_boundary_test.go +++ b/internal/integration/payment/refund_boundary_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "kra/app/system/internal/biz" + "kra/internal/biz" "github.com/go-pay/gopay" gopayQQ "github.com/go-pay/gopay/qq" diff --git a/app/system/internal/integration/payment/response_validation_test.go b/internal/integration/payment/response_validation_test.go similarity index 99% rename from app/system/internal/integration/payment/response_validation_test.go rename to internal/integration/payment/response_validation_test.go index 78a32dd..4a1bd13 100644 --- a/app/system/internal/integration/payment/response_validation_test.go +++ b/internal/integration/payment/response_validation_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "kra/app/system/internal/biz" + "kra/internal/biz" gopayAlipay "github.com/go-pay/gopay/alipay" "github.com/go-pay/gopay/douyin" diff --git a/app/system/internal/integration/payment/result.go b/internal/integration/payment/result.go similarity index 99% rename from app/system/internal/integration/payment/result.go rename to internal/integration/payment/result.go index aedd127..fcf63ce 100644 --- a/app/system/internal/integration/payment/result.go +++ b/internal/integration/payment/result.go @@ -7,7 +7,7 @@ import ( "net/url" "strings" - "kra/app/system/internal/biz" + "kra/internal/biz" "kra/pkg/paymentkit" ) diff --git a/app/system/internal/integration/payment/result_test.go b/internal/integration/payment/result_test.go similarity index 93% rename from app/system/internal/integration/payment/result_test.go rename to internal/integration/payment/result_test.go index 80d3d6d..bfb0812 100644 --- a/app/system/internal/integration/payment/result_test.go +++ b/internal/integration/payment/result_test.go @@ -3,7 +3,7 @@ package payment import ( "testing" - "kra/app/system/internal/biz" + "kra/internal/biz" ) func TestCallbackFieldsAcceptsCaseInsensitiveContentType(t *testing.T) { diff --git a/app/system/internal/integration/payment/saobei.go b/internal/integration/payment/saobei.go similarity index 99% rename from app/system/internal/integration/payment/saobei.go rename to internal/integration/payment/saobei.go index 2b68adf..7102a58 100644 --- a/app/system/internal/integration/payment/saobei.go +++ b/internal/integration/payment/saobei.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "kra/app/system/internal/biz" + "kra/internal/biz" "github.com/go-pay/gopay" "github.com/go-pay/gopay/saobei" diff --git a/app/system/internal/integration/payment/saobei_test.go b/internal/integration/payment/saobei_test.go similarity index 99% rename from app/system/internal/integration/payment/saobei_test.go rename to internal/integration/payment/saobei_test.go index 6fdef6a..c58b8ff 100644 --- a/app/system/internal/integration/payment/saobei_test.go +++ b/internal/integration/payment/saobei_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "kra/app/system/internal/biz" + "kra/internal/biz" "github.com/go-pay/gopay" "github.com/go-pay/gopay/saobei" diff --git a/app/system/internal/integration/payment/vendor.go b/internal/integration/payment/vendor.go similarity index 99% rename from app/system/internal/integration/payment/vendor.go rename to internal/integration/payment/vendor.go index ac0cd26..2488b74 100644 --- a/app/system/internal/integration/payment/vendor.go +++ b/internal/integration/payment/vendor.go @@ -14,7 +14,7 @@ import ( "strings" "time" - "kra/app/system/internal/biz" + "kra/internal/biz" "kra/pkg/paymentkit" ) diff --git a/app/system/internal/integration/payment/vendor_test.go b/internal/integration/payment/vendor_test.go similarity index 100% rename from app/system/internal/integration/payment/vendor_test.go rename to internal/integration/payment/vendor_test.go diff --git a/app/system/internal/integration/payment/wechat_v2.go b/internal/integration/payment/wechat_v2.go similarity index 99% rename from app/system/internal/integration/payment/wechat_v2.go rename to internal/integration/payment/wechat_v2.go index 9dfe19d..904b291 100644 --- a/app/system/internal/integration/payment/wechat_v2.go +++ b/internal/integration/payment/wechat_v2.go @@ -13,7 +13,7 @@ import ( "strings" "time" - "kra/app/system/internal/biz" + "kra/internal/biz" "github.com/go-pay/gopay" "github.com/go-pay/gopay/pkg/xhttp" diff --git a/app/system/internal/integration/payment/wechat_v3.go b/internal/integration/payment/wechat_v3.go similarity index 99% rename from app/system/internal/integration/payment/wechat_v3.go rename to internal/integration/payment/wechat_v3.go index e35884c..9d49b55 100644 --- a/app/system/internal/integration/payment/wechat_v3.go +++ b/internal/integration/payment/wechat_v3.go @@ -13,7 +13,7 @@ import ( "strings" "time" - "kra/app/system/internal/biz" + "kra/internal/biz" "github.com/go-pay/gopay" gopayWechatV3 "github.com/go-pay/gopay/wechat/v3" diff --git a/app/system/internal/integration/payment/wechat_v3_codepay_test.go b/internal/integration/payment/wechat_v3_codepay_test.go similarity index 99% rename from app/system/internal/integration/payment/wechat_v3_codepay_test.go rename to internal/integration/payment/wechat_v3_codepay_test.go index 88cb878..64e6019 100644 --- a/app/system/internal/integration/payment/wechat_v3_codepay_test.go +++ b/internal/integration/payment/wechat_v3_codepay_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "kra/app/system/internal/biz" + "kra/internal/biz" gopayWechatV3 "github.com/go-pay/gopay/wechat/v3" ) diff --git a/app/system/internal/integration/payment/wechat_v3_douyin_refund_test.go b/internal/integration/payment/wechat_v3_douyin_refund_test.go similarity index 99% rename from app/system/internal/integration/payment/wechat_v3_douyin_refund_test.go rename to internal/integration/payment/wechat_v3_douyin_refund_test.go index 9950542..966c0b8 100644 --- a/app/system/internal/integration/payment/wechat_v3_douyin_refund_test.go +++ b/internal/integration/payment/wechat_v3_douyin_refund_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "kra/app/system/internal/biz" + "kra/internal/biz" gopayDouyin "github.com/go-pay/gopay/douyin" gopayWechatV3 "github.com/go-pay/gopay/wechat/v3" diff --git a/app/system/internal/integration/provider.go b/internal/integration/provider.go similarity index 69% rename from app/system/internal/integration/provider.go rename to internal/integration/provider.go index 12f2094..bd5a4d6 100644 --- a/app/system/internal/integration/provider.go +++ b/internal/integration/provider.go @@ -4,12 +4,12 @@ package integration import ( - "kra/app/system/internal/biz" - "kra/app/system/internal/integration/cache" - "kra/app/system/internal/integration/email" - mqintegration "kra/app/system/internal/integration/mq" - "kra/app/system/internal/integration/storage" - websocketintegration "kra/app/system/internal/integration/websocket" + "kra/internal/biz" + "kra/internal/integration/cache" + "kra/internal/integration/email" + mqintegration "kra/internal/integration/mq" + "kra/internal/integration/storage" + websocketintegration "kra/internal/integration/websocket" "kra/pkg/mq" platformws "kra/pkg/websocket" diff --git a/app/system/internal/integration/storage/aliyun_storage.go b/internal/integration/storage/aliyun_storage.go similarity index 98% rename from app/system/internal/integration/storage/aliyun_storage.go rename to internal/integration/storage/aliyun_storage.go index 932382a..cd8b61a 100644 --- a/app/system/internal/integration/storage/aliyun_storage.go +++ b/internal/integration/storage/aliyun_storage.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/aliyun/aliyun-oss-go-sdk/oss" - "kra/app/system/internal/biz" - "kra/app/system/internal/conf" + "kra/internal/biz" + "kra/internal/conf" ) type aliyunStorage struct { diff --git a/app/system/internal/integration/storage/aws_storage.go b/internal/integration/storage/aws_storage.go similarity index 98% rename from app/system/internal/integration/storage/aws_storage.go rename to internal/integration/storage/aws_storage.go index 29fcbb2..d355274 100644 --- a/app/system/internal/integration/storage/aws_storage.go +++ b/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/internal/biz" - "kra/app/system/internal/conf" + "kra/internal/biz" + "kra/internal/conf" ) type awsStorage struct { diff --git a/app/system/internal/integration/storage/compose.go b/internal/integration/storage/compose.go similarity index 100% rename from app/system/internal/integration/storage/compose.go rename to internal/integration/storage/compose.go diff --git a/app/system/internal/integration/storage/compose_test.go b/internal/integration/storage/compose_test.go similarity index 100% rename from app/system/internal/integration/storage/compose_test.go rename to internal/integration/storage/compose_test.go diff --git a/app/system/internal/integration/storage/huawei_storage.go b/internal/integration/storage/huawei_storage.go similarity index 98% rename from app/system/internal/integration/storage/huawei_storage.go rename to internal/integration/storage/huawei_storage.go index 6dbc686..ebc1320 100644 --- a/app/system/internal/integration/storage/huawei_storage.go +++ b/internal/integration/storage/huawei_storage.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/huaweicloud/huaweicloud-sdk-go-obs/obs" - "kra/app/system/internal/biz" - "kra/app/system/internal/conf" + "kra/internal/biz" + "kra/internal/conf" ) type huaweiStorage struct { diff --git a/app/system/internal/integration/storage/local.go b/internal/integration/storage/local.go similarity index 98% rename from app/system/internal/integration/storage/local.go rename to internal/integration/storage/local.go index c78c2b0..7d83314 100644 --- a/app/system/internal/integration/storage/local.go +++ b/internal/integration/storage/local.go @@ -10,8 +10,8 @@ import ( "sort" "strings" - "kra/app/system/internal/biz" - "kra/app/system/internal/conf" + "kra/internal/biz" + "kra/internal/conf" ) type fileStorage struct { diff --git a/app/system/internal/integration/storage/qiniu_storage.go b/internal/integration/storage/qiniu_storage.go similarity index 98% rename from app/system/internal/integration/storage/qiniu_storage.go rename to internal/integration/storage/qiniu_storage.go index e11ec96..debed10 100644 --- a/app/system/internal/integration/storage/qiniu_storage.go +++ b/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/internal/biz" - "kra/app/system/internal/conf" + "kra/internal/biz" + "kra/internal/conf" ) type qiniuStorage struct { diff --git a/app/system/internal/integration/storage/reloadable.go b/internal/integration/storage/reloadable.go similarity index 96% rename from app/system/internal/integration/storage/reloadable.go rename to internal/integration/storage/reloadable.go index 19908ae..ea70b3d 100644 --- a/app/system/internal/integration/storage/reloadable.go +++ b/internal/integration/storage/reloadable.go @@ -5,8 +5,8 @@ import ( "io" "sync" - "kra/app/system/internal/biz" - "kra/app/system/internal/conf" + "kra/internal/biz" + "kra/internal/conf" ) type Reloadable struct { diff --git a/app/system/internal/integration/storage/s3_storage.go b/internal/integration/storage/s3_storage.go similarity index 98% rename from app/system/internal/integration/storage/s3_storage.go rename to internal/integration/storage/s3_storage.go index 696c617..4003229 100644 --- a/app/system/internal/integration/storage/s3_storage.go +++ b/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/internal/biz" - "kra/app/system/internal/conf" + "kra/internal/biz" + "kra/internal/conf" ) type s3Storage struct { diff --git a/app/system/internal/integration/storage/tencent_storage.go b/internal/integration/storage/tencent_storage.go similarity index 98% rename from app/system/internal/integration/storage/tencent_storage.go rename to internal/integration/storage/tencent_storage.go index 95c411a..f04602e 100644 --- a/app/system/internal/integration/storage/tencent_storage.go +++ b/internal/integration/storage/tencent_storage.go @@ -11,8 +11,8 @@ import ( "time" cos "github.com/tencentyun/cos-go-sdk-v5" - "kra/app/system/internal/biz" - "kra/app/system/internal/conf" + "kra/internal/biz" + "kra/internal/conf" ) type tencentStorage struct { diff --git a/app/system/internal/integration/websocket/server.go b/internal/integration/websocket/server.go similarity index 99% rename from app/system/internal/integration/websocket/server.go rename to internal/integration/websocket/server.go index 8e0f8e1..fef3ca3 100644 --- a/app/system/internal/integration/websocket/server.go +++ b/internal/integration/websocket/server.go @@ -8,7 +8,7 @@ import ( "time" melody "github.com/olahol/melody" - "kra/app/system/internal/conf" + "kra/internal/conf" platformws "kra/pkg/websocket" ) diff --git a/app/system/internal/security/token.go b/internal/security/token.go similarity index 100% rename from app/system/internal/security/token.go rename to internal/security/token.go diff --git a/app/system/internal/server/README.md b/internal/server/README.md similarity index 100% rename from app/system/internal/server/README.md rename to internal/server/README.md diff --git a/app/system/internal/server/gin.go b/internal/server/gin.go similarity index 96% rename from app/system/internal/server/gin.go rename to internal/server/gin.go index 9a1edde..4623edb 100644 --- a/app/system/internal/server/gin.go +++ b/internal/server/gin.go @@ -10,13 +10,13 @@ import ( "strings" "time" - "kra/app/system/internal/conf" - websocket "kra/app/system/internal/integration/websocket" - "kra/app/system/internal/server/handler" - "kra/app/system/internal/server/httpx" - "kra/app/system/internal/server/middleware" - "kra/app/system/internal/server/router" - "kra/app/system/internal/service" + "kra/internal/conf" + websocket "kra/internal/integration/websocket" + "kra/internal/server/handler" + "kra/internal/server/httpx" + "kra/internal/server/middleware" + "kra/internal/server/router" + "kra/internal/service" platformmodule "kra/pkg/module" "github.com/gin-gonic/gin" diff --git a/app/system/internal/server/gin_test.go b/internal/server/gin_test.go similarity index 99% rename from app/system/internal/server/gin_test.go rename to internal/server/gin_test.go index f8a0074..e89f7b5 100644 --- a/app/system/internal/server/gin_test.go +++ b/internal/server/gin_test.go @@ -11,8 +11,8 @@ import ( "strings" "testing" - "kra/app/system/internal/conf" - "kra/app/system/internal/server/handler" + "kra/internal/conf" + "kra/internal/server/handler" "github.com/gin-gonic/gin" ) diff --git a/app/system/internal/server/handler/announcement.go b/internal/server/handler/announcement.go similarity index 98% rename from app/system/internal/server/handler/announcement.go rename to internal/server/handler/announcement.go index b7deb52..f4b002a 100644 --- a/app/system/internal/server/handler/announcement.go +++ b/internal/server/handler/announcement.go @@ -1,7 +1,7 @@ package handler import ( - "kra/app/system/internal/service" + "kra/internal/service" "time" "github.com/gin-gonic/gin" diff --git a/app/system/internal/server/handler/api.go b/internal/server/handler/api.go similarity index 99% rename from app/system/internal/server/handler/api.go rename to internal/server/handler/api.go index 01620bf..5c61759 100644 --- a/app/system/internal/server/handler/api.go +++ b/internal/server/handler/api.go @@ -1,7 +1,7 @@ package handler import ( - "kra/app/system/internal/service" + "kra/internal/service" "github.com/gin-gonic/gin" ) diff --git a/app/system/internal/server/handler/api_token.go b/internal/server/handler/api_token.go similarity index 97% rename from app/system/internal/server/handler/api_token.go rename to internal/server/handler/api_token.go index 1c3c7ca..6953eae 100644 --- a/app/system/internal/server/handler/api_token.go +++ b/internal/server/handler/api_token.go @@ -1,7 +1,7 @@ package handler import ( - "kra/app/system/internal/service" + "kra/internal/service" "github.com/gin-gonic/gin" ) diff --git a/app/system/internal/server/handler/audit.go b/internal/server/handler/audit.go similarity index 99% rename from app/system/internal/server/handler/audit.go rename to internal/server/handler/audit.go index 4e90c54..e860a80 100644 --- a/app/system/internal/server/handler/audit.go +++ b/internal/server/handler/audit.go @@ -6,8 +6,8 @@ import ( "strconv" "time" - "kra/app/system/internal/biz" - "kra/app/system/internal/service" + "kra/internal/biz" + "kra/internal/service" "github.com/gin-gonic/gin" ) diff --git a/app/system/internal/server/handler/authority.go b/internal/server/handler/authority.go similarity index 99% rename from app/system/internal/server/handler/authority.go rename to internal/server/handler/authority.go index 2e76684..5af9d73 100644 --- a/app/system/internal/server/handler/authority.go +++ b/internal/server/handler/authority.go @@ -1,7 +1,7 @@ package handler import ( - "kra/app/system/internal/service" + "kra/internal/service" "github.com/gin-gonic/gin" ) diff --git a/app/system/internal/server/handler/dictionary.go b/internal/server/handler/dictionary.go similarity index 99% rename from app/system/internal/server/handler/dictionary.go rename to internal/server/handler/dictionary.go index 6ee2aa6..ad9f991 100644 --- a/app/system/internal/server/handler/dictionary.go +++ b/internal/server/handler/dictionary.go @@ -1,7 +1,7 @@ package handler import ( - "kra/app/system/internal/service" + "kra/internal/service" "strconv" "github.com/gin-gonic/gin" diff --git a/app/system/internal/server/handler/email.go b/internal/server/handler/email.go similarity index 95% rename from app/system/internal/server/handler/email.go rename to internal/server/handler/email.go index b88c3f9..4be30bb 100644 --- a/app/system/internal/server/handler/email.go +++ b/internal/server/handler/email.go @@ -1,7 +1,7 @@ package handler import ( - "kra/app/system/internal/service" + "kra/internal/service" "github.com/gin-gonic/gin" ) diff --git a/app/system/internal/server/handler/export.go b/internal/server/handler/export.go similarity index 99% rename from app/system/internal/server/handler/export.go rename to internal/server/handler/export.go index 4230fdb..c64de7b 100644 --- a/app/system/internal/server/handler/export.go +++ b/internal/server/handler/export.go @@ -2,7 +2,7 @@ package handler import ( "errors" - "kra/app/system/internal/service" + "kra/internal/service" "net/http" "net/url" "strings" diff --git a/app/system/internal/server/handler/export_test.go b/internal/server/handler/export_test.go similarity index 100% rename from app/system/internal/server/handler/export_test.go rename to internal/server/handler/export_test.go diff --git a/app/system/internal/server/handler/http.go b/internal/server/handler/http.go similarity index 89% rename from app/system/internal/server/handler/http.go rename to internal/server/handler/http.go index 28893fd..8f4ed69 100644 --- a/app/system/internal/server/handler/http.go +++ b/internal/server/handler/http.go @@ -2,9 +2,9 @@ package handler import ( "github.com/gin-gonic/gin" - "kra/app/system/internal/biz" - "kra/app/system/internal/server/httpx" - "kra/app/system/internal/server/middleware" + "kra/internal/biz" + "kra/internal/server/httpx" + "kra/internal/server/middleware" ) const ( diff --git a/app/system/internal/server/handler/integration_config.go b/internal/server/handler/integration_config.go similarity index 97% rename from app/system/internal/server/handler/integration_config.go rename to internal/server/handler/integration_config.go index b8d2c97..173f340 100644 --- a/app/system/internal/server/handler/integration_config.go +++ b/internal/server/handler/integration_config.go @@ -1,7 +1,7 @@ package handler import ( - "kra/app/system/internal/service" + "kra/internal/service" "github.com/gin-gonic/gin" ) diff --git a/app/system/internal/server/handler/media.go b/internal/server/handler/media.go similarity index 99% rename from app/system/internal/server/handler/media.go rename to internal/server/handler/media.go index c1f18a7..a60922f 100644 --- a/app/system/internal/server/handler/media.go +++ b/internal/server/handler/media.go @@ -2,7 +2,7 @@ package handler import ( "errors" - "kra/app/system/internal/service" + "kra/internal/service" "net/http" "strconv" diff --git a/app/system/internal/server/handler/menu.go b/internal/server/handler/menu.go similarity index 99% rename from app/system/internal/server/handler/menu.go rename to internal/server/handler/menu.go index 7415e5d..4e3acd1 100644 --- a/app/system/internal/server/handler/menu.go +++ b/internal/server/handler/menu.go @@ -1,7 +1,7 @@ package handler import ( - "kra/app/system/internal/service" + "kra/internal/service" "github.com/gin-gonic/gin" ) diff --git a/app/system/internal/server/handler/navigation.go b/internal/server/handler/navigation.go similarity index 93% rename from app/system/internal/server/handler/navigation.go rename to internal/server/handler/navigation.go index b1947be..8fb97d9 100644 --- a/app/system/internal/server/handler/navigation.go +++ b/internal/server/handler/navigation.go @@ -1,7 +1,7 @@ package handler import ( - "kra/app/system/internal/service" + "kra/internal/service" "github.com/gin-gonic/gin" ) diff --git a/app/system/internal/server/handler/organization.go b/internal/server/handler/organization.go similarity index 99% rename from app/system/internal/server/handler/organization.go rename to internal/server/handler/organization.go index 0ac5308..187df43 100644 --- a/app/system/internal/server/handler/organization.go +++ b/internal/server/handler/organization.go @@ -1,7 +1,7 @@ package handler import ( - "kra/app/system/internal/service" + "kra/internal/service" "github.com/gin-gonic/gin" ) diff --git a/app/system/internal/server/handler/parameter.go b/internal/server/handler/parameter.go similarity index 98% rename from app/system/internal/server/handler/parameter.go rename to internal/server/handler/parameter.go index 134d77c..34da9af 100644 --- a/app/system/internal/server/handler/parameter.go +++ b/internal/server/handler/parameter.go @@ -1,7 +1,7 @@ package handler import ( - "kra/app/system/internal/service" + "kra/internal/service" "github.com/gin-gonic/gin" ) diff --git a/app/system/internal/server/handler/payment.go b/internal/server/handler/payment.go similarity index 99% rename from app/system/internal/server/handler/payment.go rename to internal/server/handler/payment.go index b3c63ee..121d172 100644 --- a/app/system/internal/server/handler/payment.go +++ b/internal/server/handler/payment.go @@ -2,7 +2,7 @@ package handler import ( "io" - "kra/app/system/internal/service" + "kra/internal/service" "net/http" "github.com/gin-gonic/gin" diff --git a/app/system/internal/server/handler/payment_test.go b/internal/server/handler/payment_test.go similarity index 95% rename from app/system/internal/server/handler/payment_test.go rename to internal/server/handler/payment_test.go index 1a54029..2f47ae9 100644 --- a/app/system/internal/server/handler/payment_test.go +++ b/internal/server/handler/payment_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/gin-gonic/gin" - "kra/app/system/internal/service" + "kra/internal/service" ) func TestWritePaymentCallbackAckDoesNotExposeError(t *testing.T) { diff --git a/app/system/internal/server/handler/permission.go b/internal/server/handler/permission.go similarity index 97% rename from app/system/internal/server/handler/permission.go rename to internal/server/handler/permission.go index 2cc5ec6..57e8eb7 100644 --- a/app/system/internal/server/handler/permission.go +++ b/internal/server/handler/permission.go @@ -1,7 +1,7 @@ package handler import ( - "kra/app/system/internal/service" + "kra/internal/service" "github.com/gin-gonic/gin" ) diff --git a/app/system/internal/server/handler/provider.go b/internal/server/handler/provider.go similarity index 100% rename from app/system/internal/server/handler/provider.go rename to internal/server/handler/provider.go diff --git a/app/system/internal/server/handler/public.go b/internal/server/handler/public.go similarity index 98% rename from app/system/internal/server/handler/public.go rename to internal/server/handler/public.go index 9200a5a..b763329 100644 --- a/app/system/internal/server/handler/public.go +++ b/internal/server/handler/public.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "kra/app/system/internal/biz" - "kra/app/system/internal/service" + "kra/internal/biz" + "kra/internal/service" "github.com/gin-gonic/gin" "github.com/mojocn/base64Captcha" diff --git a/app/system/internal/server/handler/query.go b/internal/server/handler/query.go similarity index 100% rename from app/system/internal/server/handler/query.go rename to internal/server/handler/query.go diff --git a/app/system/internal/server/handler/session.go b/internal/server/handler/session.go similarity index 93% rename from app/system/internal/server/handler/session.go rename to internal/server/handler/session.go index 77adffa..0e7d598 100644 --- a/app/system/internal/server/handler/session.go +++ b/internal/server/handler/session.go @@ -1,7 +1,7 @@ package handler import ( - "kra/app/system/internal/service" + "kra/internal/service" "github.com/gin-gonic/gin" ) diff --git a/app/system/internal/server/handler/set.go b/internal/server/handler/set.go similarity index 100% rename from app/system/internal/server/handler/set.go rename to internal/server/handler/set.go diff --git a/app/system/internal/server/handler/system_config.go b/internal/server/handler/system_config.go similarity index 98% rename from app/system/internal/server/handler/system_config.go rename to internal/server/handler/system_config.go index b4085db..221ad27 100644 --- a/app/system/internal/server/handler/system_config.go +++ b/internal/server/handler/system_config.go @@ -1,7 +1,7 @@ package handler import ( - "kra/app/system/internal/service" + "kra/internal/service" "github.com/gin-gonic/gin" ) diff --git a/app/system/internal/server/handler/task.go b/internal/server/handler/task.go similarity index 99% rename from app/system/internal/server/handler/task.go rename to internal/server/handler/task.go index bb88120..29d2664 100644 --- a/app/system/internal/server/handler/task.go +++ b/internal/server/handler/task.go @@ -2,7 +2,7 @@ package handler import ( "fmt" - "kra/app/system/internal/service" + "kra/internal/service" "net/http" "time" diff --git a/app/system/internal/server/handler/user.go b/internal/server/handler/user.go similarity index 99% rename from app/system/internal/server/handler/user.go rename to internal/server/handler/user.go index 0ef7bfb..13d0b22 100644 --- a/app/system/internal/server/handler/user.go +++ b/internal/server/handler/user.go @@ -1,7 +1,7 @@ package handler import ( - "kra/app/system/internal/service" + "kra/internal/service" "strconv" "time" diff --git a/app/system/internal/server/handler/version.go b/internal/server/handler/version.go similarity index 98% rename from app/system/internal/server/handler/version.go rename to internal/server/handler/version.go index a42201a..944af99 100644 --- a/app/system/internal/server/handler/version.go +++ b/internal/server/handler/version.go @@ -7,8 +7,8 @@ import ( "strconv" "time" - "kra/app/system/internal/biz" - "kra/app/system/internal/service" + "kra/internal/biz" + "kra/internal/service" "github.com/gin-gonic/gin" ) diff --git a/app/system/internal/server/httpx/cookie.go b/internal/server/httpx/cookie.go similarity index 100% rename from app/system/internal/server/httpx/cookie.go rename to internal/server/httpx/cookie.go diff --git a/app/system/internal/server/httpx/response.go b/internal/server/httpx/response.go similarity index 100% rename from app/system/internal/server/httpx/response.go rename to internal/server/httpx/response.go diff --git a/app/system/internal/server/middleware/access.go b/internal/server/middleware/access.go similarity index 93% rename from app/system/internal/server/middleware/access.go rename to internal/server/middleware/access.go index bd1b281..5d54ec7 100644 --- a/app/system/internal/server/middleware/access.go +++ b/internal/server/middleware/access.go @@ -3,9 +3,9 @@ package middleware import ( "context" - "kra/app/system/internal/biz" - "kra/app/system/internal/conf" - "kra/app/system/internal/service" + "kra/internal/biz" + "kra/internal/conf" + "kra/internal/service" "github.com/gin-gonic/gin" ) diff --git a/app/system/internal/server/middleware/access_log.go b/internal/server/middleware/access_log.go similarity index 98% rename from app/system/internal/server/middleware/access_log.go rename to internal/server/middleware/access_log.go index 17338e0..a5c7997 100644 --- a/app/system/internal/server/middleware/access_log.go +++ b/internal/server/middleware/access_log.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "kra/app/system/internal/biz" - "kra/app/system/internal/conf" + "kra/internal/biz" + "kra/internal/conf" "github.com/gin-gonic/gin" ) diff --git a/app/system/internal/server/middleware/access_log_test.go b/internal/server/middleware/access_log_test.go similarity index 98% rename from app/system/internal/server/middleware/access_log_test.go rename to internal/server/middleware/access_log_test.go index 2bfdc2a..67bd9bc 100644 --- a/app/system/internal/server/middleware/access_log_test.go +++ b/internal/server/middleware/access_log_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "kra/app/system/internal/conf" + "kra/internal/conf" "github.com/gin-gonic/gin" ) diff --git a/app/system/internal/server/middleware/access_test.go b/internal/server/middleware/access_test.go similarity index 95% rename from app/system/internal/server/middleware/access_test.go rename to internal/server/middleware/access_test.go index 12429a2..68c94a6 100644 --- a/app/system/internal/server/middleware/access_test.go +++ b/internal/server/middleware/access_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "kra/app/system/internal/biz" - "kra/app/system/internal/conf" + "kra/internal/biz" + "kra/internal/conf" "github.com/gin-gonic/gin" ) diff --git a/app/system/internal/server/middleware/audit.go b/internal/server/middleware/audit.go similarity index 99% rename from app/system/internal/server/middleware/audit.go rename to internal/server/middleware/audit.go index aa88b75..ed13a6e 100644 --- a/app/system/internal/server/middleware/audit.go +++ b/internal/server/middleware/audit.go @@ -12,8 +12,8 @@ import ( "strings" "time" - "kra/app/system/internal/conf" - "kra/app/system/internal/service" + "kra/internal/conf" + "kra/internal/service" "github.com/gin-gonic/gin" ) diff --git a/app/system/internal/server/middleware/auth.go b/internal/server/middleware/auth.go similarity index 97% rename from app/system/internal/server/middleware/auth.go rename to internal/server/middleware/auth.go index 269941c..2ca661d 100644 --- a/app/system/internal/server/middleware/auth.go +++ b/internal/server/middleware/auth.go @@ -6,8 +6,8 @@ import ( "strconv" "strings" - "kra/app/system/internal/biz" - "kra/app/system/internal/service" + "kra/internal/biz" + "kra/internal/service" "github.com/gin-gonic/gin" "golang.org/x/sync/singleflight" diff --git a/app/system/internal/server/middleware/capture.go b/internal/server/middleware/capture.go similarity index 100% rename from app/system/internal/server/middleware/capture.go rename to internal/server/middleware/capture.go diff --git a/app/system/internal/server/middleware/cors.go b/internal/server/middleware/cors.go similarity index 98% rename from app/system/internal/server/middleware/cors.go rename to internal/server/middleware/cors.go index aa2b5cb..a5000a9 100644 --- a/app/system/internal/server/middleware/cors.go +++ b/internal/server/middleware/cors.go @@ -4,7 +4,7 @@ import ( "net/http" "strings" - "kra/app/system/internal/conf" + "kra/internal/conf" "github.com/gin-gonic/gin" ) diff --git a/app/system/internal/server/middleware/cors_test.go b/internal/server/middleware/cors_test.go similarity index 97% rename from app/system/internal/server/middleware/cors_test.go rename to internal/server/middleware/cors_test.go index bfd5a8f..8cd5d58 100644 --- a/app/system/internal/server/middleware/cors_test.go +++ b/internal/server/middleware/cors_test.go @@ -5,7 +5,7 @@ import ( "net/http/httptest" "testing" - "kra/app/system/internal/conf" + "kra/internal/conf" "github.com/gin-gonic/gin" ) diff --git a/app/system/internal/server/middleware/error_audit.go b/internal/server/middleware/error_audit.go similarity index 100% rename from app/system/internal/server/middleware/error_audit.go rename to internal/server/middleware/error_audit.go diff --git a/app/system/internal/server/middleware/error_audit_test.go b/internal/server/middleware/error_audit_test.go similarity index 100% rename from app/system/internal/server/middleware/error_audit_test.go rename to internal/server/middleware/error_audit_test.go diff --git a/app/system/internal/server/middleware/http.go b/internal/server/middleware/http.go similarity index 93% rename from app/system/internal/server/middleware/http.go rename to internal/server/middleware/http.go index 49e9589..ceb2a5b 100644 --- a/app/system/internal/server/middleware/http.go +++ b/internal/server/middleware/http.go @@ -2,7 +2,7 @@ package middleware import ( "github.com/gin-gonic/gin" - "kra/app/system/internal/server/httpx" + "kra/internal/server/httpx" ) const ( diff --git a/app/system/internal/server/middleware/rate_limit.go b/internal/server/middleware/rate_limit.go similarity index 97% rename from app/system/internal/server/middleware/rate_limit.go rename to internal/server/middleware/rate_limit.go index 7991d1b..1417794 100644 --- a/app/system/internal/server/middleware/rate_limit.go +++ b/internal/server/middleware/rate_limit.go @@ -1,7 +1,7 @@ package middleware import ( - "kra/app/system/internal/service" + "kra/internal/service" "net/http" "strings" "time" diff --git a/app/system/internal/server/middleware/rate_limit_test.go b/internal/server/middleware/rate_limit_test.go similarity index 97% rename from app/system/internal/server/middleware/rate_limit_test.go rename to internal/server/middleware/rate_limit_test.go index 452964e..8a1afff 100644 --- a/app/system/internal/server/middleware/rate_limit_test.go +++ b/internal/server/middleware/rate_limit_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "kra/app/system/internal/biz" - "kra/app/system/internal/service" + "kra/internal/biz" + "kra/internal/service" "github.com/gin-gonic/gin" ) diff --git a/app/system/internal/server/middleware/recovery.go b/internal/server/middleware/recovery.go similarity index 100% rename from app/system/internal/server/middleware/recovery.go rename to internal/server/middleware/recovery.go diff --git a/app/system/internal/server/middleware/request.go b/internal/server/middleware/request.go similarity index 100% rename from app/system/internal/server/middleware/request.go rename to internal/server/middleware/request.go diff --git a/app/system/internal/server/providers_system.go b/internal/server/providers_system.go similarity index 100% rename from app/system/internal/server/providers_system.go rename to internal/server/providers_system.go diff --git a/app/system/internal/server/router/aliases.go b/internal/server/router/aliases.go similarity index 94% rename from app/system/internal/server/router/aliases.go rename to internal/server/router/aliases.go index 0a4c671..5e3370f 100644 --- a/app/system/internal/server/router/aliases.go +++ b/internal/server/router/aliases.go @@ -1,6 +1,6 @@ package router -import "kra/app/system/internal/server/handler" +import "kra/internal/server/handler" type Set = handler.Set type Announcement = handler.Announcement diff --git a/app/system/internal/server/router/announcement.go b/internal/server/router/announcement.go similarity index 100% rename from app/system/internal/server/router/announcement.go rename to internal/server/router/announcement.go diff --git a/app/system/internal/server/router/api.go b/internal/server/router/api.go similarity index 100% rename from app/system/internal/server/router/api.go rename to internal/server/router/api.go diff --git a/app/system/internal/server/router/api_token.go b/internal/server/router/api_token.go similarity index 100% rename from app/system/internal/server/router/api_token.go rename to internal/server/router/api_token.go diff --git a/app/system/internal/server/router/audit.go b/internal/server/router/audit.go similarity index 100% rename from app/system/internal/server/router/audit.go rename to internal/server/router/audit.go diff --git a/app/system/internal/server/router/authority.go b/internal/server/router/authority.go similarity index 100% rename from app/system/internal/server/router/authority.go rename to internal/server/router/authority.go diff --git a/app/system/internal/server/router/dictionary.go b/internal/server/router/dictionary.go similarity index 100% rename from app/system/internal/server/router/dictionary.go rename to internal/server/router/dictionary.go diff --git a/app/system/internal/server/router/email.go b/internal/server/router/email.go similarity index 100% rename from app/system/internal/server/router/email.go rename to internal/server/router/email.go diff --git a/app/system/internal/server/router/export.go b/internal/server/router/export.go similarity index 100% rename from app/system/internal/server/router/export.go rename to internal/server/router/export.go diff --git a/app/system/internal/server/router/integration_config.go b/internal/server/router/integration_config.go similarity index 100% rename from app/system/internal/server/router/integration_config.go rename to internal/server/router/integration_config.go diff --git a/app/system/internal/server/router/media.go b/internal/server/router/media.go similarity index 100% rename from app/system/internal/server/router/media.go rename to internal/server/router/media.go diff --git a/app/system/internal/server/router/menu.go b/internal/server/router/menu.go similarity index 100% rename from app/system/internal/server/router/menu.go rename to internal/server/router/menu.go diff --git a/app/system/internal/server/router/organization.go b/internal/server/router/organization.go similarity index 100% rename from app/system/internal/server/router/organization.go rename to internal/server/router/organization.go diff --git a/app/system/internal/server/router/parameter.go b/internal/server/router/parameter.go similarity index 100% rename from app/system/internal/server/router/parameter.go rename to internal/server/router/parameter.go diff --git a/app/system/internal/server/router/payment.go b/internal/server/router/payment.go similarity index 100% rename from app/system/internal/server/router/payment.go rename to internal/server/router/payment.go diff --git a/app/system/internal/server/router/permission.go b/internal/server/router/permission.go similarity index 100% rename from app/system/internal/server/router/permission.go rename to internal/server/router/permission.go diff --git a/app/system/internal/server/router/provider.go b/internal/server/router/provider.go similarity index 100% rename from app/system/internal/server/router/provider.go rename to internal/server/router/provider.go diff --git a/app/system/internal/server/router/public.go b/internal/server/router/public.go similarity index 100% rename from app/system/internal/server/router/public.go rename to internal/server/router/public.go diff --git a/app/system/internal/server/router/routes.go b/internal/server/router/routes.go similarity index 100% rename from app/system/internal/server/router/routes.go rename to internal/server/router/routes.go diff --git a/app/system/internal/server/router/system_config.go b/internal/server/router/system_config.go similarity index 100% rename from app/system/internal/server/router/system_config.go rename to internal/server/router/system_config.go diff --git a/app/system/internal/server/router/task.go b/internal/server/router/task.go similarity index 100% rename from app/system/internal/server/router/task.go rename to internal/server/router/task.go diff --git a/app/system/internal/server/router/user.go b/internal/server/router/user.go similarity index 100% rename from app/system/internal/server/router/user.go rename to internal/server/router/user.go diff --git a/app/system/internal/server/router/version.go b/internal/server/router/version.go similarity index 100% rename from app/system/internal/server/router/version.go rename to internal/server/router/version.go diff --git a/app/system/internal/server/swagger.go b/internal/server/swagger.go similarity index 99% rename from app/system/internal/server/swagger.go rename to internal/server/swagger.go index 1accd2e..5bb1011 100644 --- a/app/system/internal/server/swagger.go +++ b/internal/server/swagger.go @@ -8,7 +8,7 @@ import ( "strings" "sync" - "kra/app/system/internal/service" + "kra/internal/service" "github.com/gin-gonic/gin" swaggerFiles "github.com/swaggo/files" diff --git a/app/system/internal/service/README.md b/internal/service/README.md similarity index 100% rename from app/system/internal/service/README.md rename to internal/service/README.md diff --git a/app/system/internal/service/access_control.go b/internal/service/access_control.go similarity index 96% rename from app/system/internal/service/access_control.go rename to internal/service/access_control.go index 844ccee..220aace 100644 --- a/app/system/internal/service/access_control.go +++ b/internal/service/access_control.go @@ -3,7 +3,7 @@ package service import ( "context" - "kra/app/system/internal/biz" + "kra/internal/biz" ) type AccessControlService struct{ uc *biz.AccessControlUsecase } diff --git a/app/system/internal/service/announcement.go b/internal/service/announcement.go similarity index 98% rename from app/system/internal/service/announcement.go rename to internal/service/announcement.go index 73411cc..51f8607 100644 --- a/app/system/internal/service/announcement.go +++ b/internal/service/announcement.go @@ -5,7 +5,7 @@ import ( "encoding/json" "time" - "kra/app/system/internal/biz" + "kra/internal/biz" ) type AnnouncementInput struct { diff --git a/app/system/internal/service/api.go b/internal/service/api.go similarity index 99% rename from app/system/internal/service/api.go rename to internal/service/api.go index eee8c5e..1a93b0c 100644 --- a/app/system/internal/service/api.go +++ b/internal/service/api.go @@ -4,7 +4,7 @@ import ( "context" "strings" - "kra/app/system/internal/biz" + "kra/internal/biz" ) type APIService struct { diff --git a/app/system/internal/service/api_token.go b/internal/service/api_token.go similarity index 98% rename from app/system/internal/service/api_token.go rename to internal/service/api_token.go index 75a2e1a..0627119 100644 --- a/app/system/internal/service/api_token.go +++ b/internal/service/api_token.go @@ -4,7 +4,7 @@ import ( "context" "time" - "kra/app/system/internal/biz" + "kra/internal/biz" ) type TokenService struct { diff --git a/app/system/internal/service/audit.go b/internal/service/audit.go similarity index 99% rename from app/system/internal/service/audit.go rename to internal/service/audit.go index c362c3e..58e8980 100644 --- a/app/system/internal/service/audit.go +++ b/internal/service/audit.go @@ -3,7 +3,7 @@ package service import ( "context" - "kra/app/system/internal/biz" + "kra/internal/biz" ) type AuditService struct{ uc *biz.AuditUsecase } diff --git a/app/system/internal/service/audit_error.go b/internal/service/audit_error.go similarity index 98% rename from app/system/internal/service/audit_error.go rename to internal/service/audit_error.go index 330ebee..7643bf6 100644 --- a/app/system/internal/service/audit_error.go +++ b/internal/service/audit_error.go @@ -4,7 +4,7 @@ import ( "context" "time" - "kra/app/system/internal/biz" + "kra/internal/biz" ) func errorDTO(v *biz.ErrorRecord) *ErrorRecordResponse { diff --git a/app/system/internal/service/audit_log_file.go b/internal/service/audit_log_file.go similarity index 97% rename from app/system/internal/service/audit_log_file.go rename to internal/service/audit_log_file.go index 7d42c87..16fda6e 100644 --- a/app/system/internal/service/audit_log_file.go +++ b/internal/service/audit_log_file.go @@ -3,7 +3,7 @@ package service import ( "context" - "kra/app/system/internal/biz" + "kra/internal/biz" ) type LogViewerService struct{ uc *biz.LogViewerUsecase } diff --git a/app/system/internal/service/authentication.go b/internal/service/authentication.go similarity index 97% rename from app/system/internal/service/authentication.go rename to internal/service/authentication.go index 3d8165d..e0485b3 100644 --- a/app/system/internal/service/authentication.go +++ b/internal/service/authentication.go @@ -3,7 +3,7 @@ package service import ( "context" - "kra/app/system/internal/biz" + "kra/internal/biz" ) type AuthService struct { diff --git a/app/system/internal/service/authority.go b/internal/service/authority.go similarity index 99% rename from app/system/internal/service/authority.go rename to internal/service/authority.go index 9b91243..9df426b 100644 --- a/app/system/internal/service/authority.go +++ b/internal/service/authority.go @@ -3,7 +3,7 @@ package service import ( "context" - "kra/app/system/internal/biz" + "kra/internal/biz" ) type AuthorityService struct{ uc *biz.AuthorityUsecase } diff --git a/app/system/internal/service/department.go b/internal/service/department.go similarity index 98% rename from app/system/internal/service/department.go rename to internal/service/department.go index 1d61253..86adbf5 100644 --- a/app/system/internal/service/department.go +++ b/internal/service/department.go @@ -3,7 +3,7 @@ package service import ( "context" - "kra/app/system/internal/biz" + "kra/internal/biz" ) type DepartmentService struct{ uc *biz.DepartmentUsecase } diff --git a/app/system/internal/service/department_test.go b/internal/service/department_test.go similarity index 93% rename from app/system/internal/service/department_test.go rename to internal/service/department_test.go index 6ff5be5..1efc873 100644 --- a/app/system/internal/service/department_test.go +++ b/internal/service/department_test.go @@ -3,7 +3,7 @@ package service import ( "testing" - "kra/app/system/internal/biz" + "kra/internal/biz" ) func TestDepartmentResponsePreservesNilAndEmptyChildren(t *testing.T) { diff --git a/app/system/internal/service/dictionary.go b/internal/service/dictionary.go similarity index 99% rename from app/system/internal/service/dictionary.go rename to internal/service/dictionary.go index 7f7179f..11a7a1e 100644 --- a/app/system/internal/service/dictionary.go +++ b/internal/service/dictionary.go @@ -3,7 +3,7 @@ package service import ( "context" - "kra/app/system/internal/biz" + "kra/internal/biz" ) type DictionaryService struct{ uc *biz.DictionaryUsecase } diff --git a/app/system/internal/service/dictionary_import.go b/internal/service/dictionary_import.go similarity index 98% rename from app/system/internal/service/dictionary_import.go rename to internal/service/dictionary_import.go index 1ff815c..1332c46 100644 --- a/app/system/internal/service/dictionary_import.go +++ b/internal/service/dictionary_import.go @@ -5,7 +5,7 @@ import ( "encoding/json" "errors" - "kra/app/system/internal/biz" + "kra/internal/biz" ) func (s *DictionaryService) ImportDictionaryJSON(ctx context.Context, raw string) error { diff --git a/app/system/internal/service/dictionary_test.go b/internal/service/dictionary_test.go similarity index 95% rename from app/system/internal/service/dictionary_test.go rename to internal/service/dictionary_test.go index eb7f09d..7a49645 100644 --- a/app/system/internal/service/dictionary_test.go +++ b/internal/service/dictionary_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "kra/app/system/internal/biz" + "kra/internal/biz" ) type dictionaryExportRepo struct { diff --git a/app/system/internal/service/dto/announcement.go b/internal/service/dto/announcement.go similarity index 100% rename from app/system/internal/service/dto/announcement.go rename to internal/service/dto/announcement.go diff --git a/app/system/internal/service/dto/api.go b/internal/service/dto/api.go similarity index 100% rename from app/system/internal/service/dto/api.go rename to internal/service/dto/api.go diff --git a/app/system/internal/service/dto/audit.go b/internal/service/dto/audit.go similarity index 100% rename from app/system/internal/service/dto/audit.go rename to internal/service/dto/audit.go diff --git a/app/system/internal/service/dto/audit_test.go b/internal/service/dto/audit_test.go similarity index 100% rename from app/system/internal/service/dto/audit_test.go rename to internal/service/dto/audit_test.go diff --git a/app/system/internal/service/dto/authentication.go b/internal/service/dto/authentication.go similarity index 100% rename from app/system/internal/service/dto/authentication.go rename to internal/service/dto/authentication.go diff --git a/app/system/internal/service/dto/authority.go b/internal/service/dto/authority.go similarity index 100% rename from app/system/internal/service/dto/authority.go rename to internal/service/dto/authority.go diff --git a/app/system/internal/service/dto/email.go b/internal/service/dto/email.go similarity index 100% rename from app/system/internal/service/dto/email.go rename to internal/service/dto/email.go diff --git a/app/system/internal/service/dto/export.go b/internal/service/dto/export.go similarity index 100% rename from app/system/internal/service/dto/export.go rename to internal/service/dto/export.go diff --git a/app/system/internal/service/dto/integration_config.go b/internal/service/dto/integration_config.go similarity index 95% rename from app/system/internal/service/dto/integration_config.go rename to internal/service/dto/integration_config.go index e61c600..8c38013 100644 --- a/app/system/internal/service/dto/integration_config.go +++ b/internal/service/dto/integration_config.go @@ -3,7 +3,7 @@ package dto import ( "encoding/json" - "kra/app/system/internal/biz" + "kra/internal/biz" ) type IntegrationConfigRequest struct { diff --git a/app/system/internal/service/dto/media.go b/internal/service/dto/media.go similarity index 100% rename from app/system/internal/service/dto/media.go rename to internal/service/dto/media.go diff --git a/app/system/internal/service/dto/menu.go b/internal/service/dto/menu.go similarity index 100% rename from app/system/internal/service/dto/menu.go rename to internal/service/dto/menu.go diff --git a/app/system/internal/service/dto/organization.go b/internal/service/dto/organization.go similarity index 100% rename from app/system/internal/service/dto/organization.go rename to internal/service/dto/organization.go diff --git a/app/system/internal/service/dto/payment.go b/internal/service/dto/payment.go similarity index 100% rename from app/system/internal/service/dto/payment.go rename to internal/service/dto/payment.go diff --git a/app/system/internal/service/dto/permission.go b/internal/service/dto/permission.go similarity index 100% rename from app/system/internal/service/dto/permission.go rename to internal/service/dto/permission.go diff --git a/app/system/internal/service/dto/settings.go b/internal/service/dto/settings.go similarity index 100% rename from app/system/internal/service/dto/settings.go rename to internal/service/dto/settings.go diff --git a/app/system/internal/service/dto/system.go b/internal/service/dto/system.go similarity index 100% rename from app/system/internal/service/dto/system.go rename to internal/service/dto/system.go diff --git a/app/system/internal/service/dto/system_config.go b/internal/service/dto/system_config.go similarity index 100% rename from app/system/internal/service/dto/system_config.go rename to internal/service/dto/system_config.go diff --git a/app/system/internal/service/dto/system_init.go b/internal/service/dto/system_init.go similarity index 100% rename from app/system/internal/service/dto/system_init.go rename to internal/service/dto/system_init.go diff --git a/app/system/internal/service/dto/task.go b/internal/service/dto/task.go similarity index 100% rename from app/system/internal/service/dto/task.go rename to internal/service/dto/task.go diff --git a/app/system/internal/service/dto/version.go b/internal/service/dto/version.go similarity index 100% rename from app/system/internal/service/dto/version.go rename to internal/service/dto/version.go diff --git a/app/system/internal/service/dto_alias.go b/internal/service/dto_alias.go similarity index 99% rename from app/system/internal/service/dto_alias.go rename to internal/service/dto_alias.go index 107cf2d..bfd6d22 100644 --- a/app/system/internal/service/dto_alias.go +++ b/internal/service/dto_alias.go @@ -1,7 +1,7 @@ package service // DTO aliases keep the service API stable while request/response contracts live in service/dto. -import "kra/app/system/internal/service/dto" +import "kra/internal/service/dto" type AnnouncementRequest = dto.AnnouncementRequest type AnnouncementResponse = dto.AnnouncementResponse diff --git a/app/system/internal/service/email.go b/internal/service/email.go similarity index 94% rename from app/system/internal/service/email.go rename to internal/service/email.go index 221ad8f..3f8051a 100644 --- a/app/system/internal/service/email.go +++ b/internal/service/email.go @@ -2,7 +2,7 @@ package service import ( "context" - "kra/app/system/internal/biz" + "kra/internal/biz" ) type EmailService struct{ uc *biz.EmailUsecase } diff --git a/app/system/internal/service/export.go b/internal/service/export.go similarity index 99% rename from app/system/internal/service/export.go rename to internal/service/export.go index 76cf5dd..0cf7ed7 100644 --- a/app/system/internal/service/export.go +++ b/internal/service/export.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "kra/app/system/internal/biz" + "kra/internal/biz" "github.com/google/uuid" ) diff --git a/app/system/internal/service/export_excel.go b/internal/service/export_excel.go similarity index 100% rename from app/system/internal/service/export_excel.go rename to internal/service/export_excel.go diff --git a/app/system/internal/service/integration_config.go b/internal/service/integration_config.go similarity index 99% rename from app/system/internal/service/integration_config.go rename to internal/service/integration_config.go index a0f607a..dff4240 100644 --- a/app/system/internal/service/integration_config.go +++ b/internal/service/integration_config.go @@ -4,7 +4,7 @@ import ( "context" "encoding/json" - "kra/app/system/internal/biz" + "kra/internal/biz" ) type IntegrationConfigService struct{ uc *biz.IntegrationConfigUsecase } diff --git a/app/system/internal/service/media.go b/internal/service/media.go similarity index 99% rename from app/system/internal/service/media.go rename to internal/service/media.go index 3b33752..44a291b 100644 --- a/app/system/internal/service/media.go +++ b/internal/service/media.go @@ -4,7 +4,7 @@ import ( "context" "io" - "kra/app/system/internal/biz" + "kra/internal/biz" ) type MediaService struct { diff --git a/app/system/internal/service/media_upload.go b/internal/service/media_upload.go similarity index 100% rename from app/system/internal/service/media_upload.go rename to internal/service/media_upload.go diff --git a/app/system/internal/service/menu.go b/internal/service/menu.go similarity index 99% rename from app/system/internal/service/menu.go rename to internal/service/menu.go index 04feaaa..a9abcaa 100644 --- a/app/system/internal/service/menu.go +++ b/internal/service/menu.go @@ -3,7 +3,7 @@ package service import ( "context" - "kra/app/system/internal/biz" + "kra/internal/biz" ) type MenuService struct{ uc *biz.MenuUsecase } diff --git a/app/system/internal/service/menu_test.go b/internal/service/menu_test.go similarity index 98% rename from app/system/internal/service/menu_test.go rename to internal/service/menu_test.go index 43e729b..7140bfb 100644 --- a/app/system/internal/service/menu_test.go +++ b/internal/service/menu_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "kra/app/system/internal/biz" + "kra/internal/biz" ) func TestMenuDomainPreservesRelationIdentity(t *testing.T) { diff --git a/app/system/internal/service/parameter.go b/internal/service/parameter.go similarity index 98% rename from app/system/internal/service/parameter.go rename to internal/service/parameter.go index 6a3b2d5..7f6518d 100644 --- a/app/system/internal/service/parameter.go +++ b/internal/service/parameter.go @@ -4,7 +4,7 @@ import ( "context" "time" - "kra/app/system/internal/biz" + "kra/internal/biz" ) type ParameterService struct{ uc *biz.ParameterUsecase } diff --git a/app/system/internal/service/payment.go b/internal/service/payment.go similarity index 99% rename from app/system/internal/service/payment.go rename to internal/service/payment.go index 0ad5d71..a34bca0 100644 --- a/app/system/internal/service/payment.go +++ b/internal/service/payment.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "kra/app/system/internal/biz" + "kra/internal/biz" ) type PaymentService struct{ uc *biz.PaymentUsecase } diff --git a/app/system/internal/service/permission.go b/internal/service/permission.go similarity index 95% rename from app/system/internal/service/permission.go rename to internal/service/permission.go index 0bec8ff..eae7542 100644 --- a/app/system/internal/service/permission.go +++ b/internal/service/permission.go @@ -3,7 +3,7 @@ package service import ( "context" - "kra/app/system/internal/biz" + "kra/internal/biz" ) type PermissionService struct{ uc *biz.PermissionUsecase } diff --git a/app/system/internal/service/position.go b/internal/service/position.go similarity index 98% rename from app/system/internal/service/position.go rename to internal/service/position.go index d7b3bf2..ba78584 100644 --- a/app/system/internal/service/position.go +++ b/internal/service/position.go @@ -3,7 +3,7 @@ package service import ( "context" - "kra/app/system/internal/biz" + "kra/internal/biz" ) type PositionService struct{ uc *biz.PositionUsecase } diff --git a/app/system/internal/service/route_metadata.go b/internal/service/route_metadata.go similarity index 100% rename from app/system/internal/service/route_metadata.go rename to internal/service/route_metadata.go diff --git a/app/system/internal/service/route_path.go b/internal/service/route_path.go similarity index 100% rename from app/system/internal/service/route_path.go rename to internal/service/route_path.go diff --git a/app/system/internal/service/route_path_test.go b/internal/service/route_path_test.go similarity index 100% rename from app/system/internal/service/route_path_test.go rename to internal/service/route_path_test.go diff --git a/app/system/internal/service/security.go b/internal/service/security.go similarity index 98% rename from app/system/internal/service/security.go rename to internal/service/security.go index 2f1b90f..0ef5c1d 100644 --- a/app/system/internal/service/security.go +++ b/internal/service/security.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "kra/app/system/internal/biz" + "kra/internal/biz" ) type PasswordPolicyError struct{ Err error } diff --git a/app/system/internal/service/security_session.go b/internal/service/security_session.go similarity index 98% rename from app/system/internal/service/security_session.go rename to internal/service/security_session.go index 79469c2..2473a32 100644 --- a/app/system/internal/service/security_session.go +++ b/internal/service/security_session.go @@ -4,7 +4,7 @@ import ( "context" "time" - "kra/app/system/internal/biz" + "kra/internal/biz" ) type SecurityService struct { diff --git a/app/system/internal/service/service.go b/internal/service/service.go similarity index 100% rename from app/system/internal/service/service.go rename to internal/service/service.go diff --git a/app/system/internal/service/system.go b/internal/service/system.go similarity index 93% rename from app/system/internal/service/system.go rename to internal/service/system.go index 5224443..1857d6a 100644 --- a/app/system/internal/service/system.go +++ b/internal/service/system.go @@ -3,7 +3,7 @@ package service import ( "context" - "kra/app/system/internal/biz" + "kra/internal/biz" ) type SystemConfigService struct { diff --git a/app/system/internal/service/system_config.go b/internal/service/system_config.go similarity index 100% rename from app/system/internal/service/system_config.go rename to internal/service/system_config.go diff --git a/app/system/internal/service/system_info.go b/internal/service/system_info.go similarity index 100% rename from app/system/internal/service/system_info.go rename to internal/service/system_info.go diff --git a/app/system/internal/service/system_init.go b/internal/service/system_init.go similarity index 97% rename from app/system/internal/service/system_init.go rename to internal/service/system_init.go index 4a7bb80..91289b9 100644 --- a/app/system/internal/service/system_init.go +++ b/internal/service/system_init.go @@ -3,7 +3,7 @@ package service import ( "context" - "kra/app/system/internal/biz" + "kra/internal/biz" ) func (s *SystemConfigService) Initialize(ctx context.Context, input *DatabaseInitRequest, apis []*biz.API) error { diff --git a/app/system/internal/service/task.go b/internal/service/task.go similarity index 99% rename from app/system/internal/service/task.go rename to internal/service/task.go index 4dfc515..584c3da 100644 --- a/app/system/internal/service/task.go +++ b/internal/service/task.go @@ -5,7 +5,7 @@ import ( "encoding/json" "time" - "kra/app/system/internal/biz" + "kra/internal/biz" ) type TaskService struct { diff --git a/app/system/internal/service/user.go b/internal/service/user.go similarity index 99% rename from app/system/internal/service/user.go rename to internal/service/user.go index b536681..2eab145 100644 --- a/app/system/internal/service/user.go +++ b/internal/service/user.go @@ -3,7 +3,7 @@ package service import ( "context" - "kra/app/system/internal/biz" + "kra/internal/biz" ) type userInput struct { diff --git a/app/system/internal/service/user_conversion.go b/internal/service/user_conversion.go similarity index 98% rename from app/system/internal/service/user_conversion.go rename to internal/service/user_conversion.go index 0b709a8..9644586 100644 --- a/app/system/internal/service/user_conversion.go +++ b/internal/service/user_conversion.go @@ -1,7 +1,7 @@ package service import ( - "kra/app/system/internal/biz" + "kra/internal/biz" ) func convertAuthority(value biz.Authority) *AuthorityResponse { diff --git a/app/system/internal/service/version.go b/internal/service/version.go similarity index 99% rename from app/system/internal/service/version.go rename to internal/service/version.go index 6c8804f..38ae427 100644 --- a/app/system/internal/service/version.go +++ b/internal/service/version.go @@ -5,7 +5,7 @@ import ( "encoding/json" "time" - "kra/app/system/internal/biz" + "kra/internal/biz" ) type VersionService struct{ uc *biz.VersionUsecase } diff --git a/app/system/internal/worker/task_executor.go b/internal/worker/task_executor.go similarity index 98% rename from app/system/internal/worker/task_executor.go rename to internal/worker/task_executor.go index 4c51d71..3482367 100644 --- a/app/system/internal/worker/task_executor.go +++ b/internal/worker/task_executor.go @@ -14,8 +14,8 @@ import ( "syscall" "time" - "kra/app/system/internal/biz" - "kra/app/system/internal/conf" + "kra/internal/biz" + "kra/internal/conf" ) type TaskExecutor struct { diff --git a/app/system/internal/worker/task_executor_test.go b/internal/worker/task_executor_test.go similarity index 98% rename from app/system/internal/worker/task_executor_test.go rename to internal/worker/task_executor_test.go index 54455a7..b141aa0 100644 --- a/app/system/internal/worker/task_executor_test.go +++ b/internal/worker/task_executor_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "kra/app/system/internal/biz" + "kra/internal/biz" ) func TestPrivateIP(t *testing.T) { diff --git a/app/system/internal/worker/task_registry.go b/internal/worker/task_registry.go similarity index 95% rename from app/system/internal/worker/task_registry.go rename to internal/worker/task_registry.go index 59b3051..2b58f19 100644 --- a/app/system/internal/worker/task_registry.go +++ b/internal/worker/task_registry.go @@ -4,8 +4,8 @@ import ( "context" "encoding/json" - "kra/app/system/internal/biz" - "kra/app/system/internal/conf" + "kra/internal/biz" + "kra/internal/conf" platformtask "kra/pkg/task" ) diff --git a/app/system/internal/worker/task_runtime_test.go b/internal/worker/task_runtime_test.go similarity index 99% rename from app/system/internal/worker/task_runtime_test.go rename to internal/worker/task_runtime_test.go index ea0200e..d016301 100644 --- a/app/system/internal/worker/task_runtime_test.go +++ b/internal/worker/task_runtime_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "kra/app/system/internal/biz" + "kra/internal/biz" ) type workerTaskRepo struct { diff --git a/app/system/internal/worker/task_scheduler.go b/internal/worker/task_scheduler.go similarity index 99% rename from app/system/internal/worker/task_scheduler.go rename to internal/worker/task_scheduler.go index 430e53a..66d3656 100644 --- a/app/system/internal/worker/task_scheduler.go +++ b/internal/worker/task_scheduler.go @@ -10,7 +10,7 @@ import ( "time" "github.com/robfig/cron/v3" - "kra/app/system/internal/biz" + "kra/internal/biz" ) type TaskScheduler struct { diff --git a/app/system/internal/worker/task_scheduler_test.go b/internal/worker/task_scheduler_test.go similarity index 100% rename from app/system/internal/worker/task_scheduler_test.go rename to internal/worker/task_scheduler_test.go diff --git a/app/system/internal/worker/worker.go b/internal/worker/worker.go similarity index 100% rename from app/system/internal/worker/worker.go rename to internal/worker/worker.go