diff --git a/internal/db/models/client_browser_model_ext.go b/internal/db/models/client_browser_model_ext.go deleted file mode 100644 index 2640e7f9..00000000 --- a/internal/db/models/client_browser_model_ext.go +++ /dev/null @@ -1 +0,0 @@ -package models diff --git a/internal/db/models/client_system_model_ext.go b/internal/db/models/client_system_model_ext.go deleted file mode 100644 index 2640e7f9..00000000 --- a/internal/db/models/client_system_model_ext.go +++ /dev/null @@ -1 +0,0 @@ -package models diff --git a/internal/db/models/client_browser_dao.go b/internal/db/models/clients/client_browser_dao.go similarity index 96% rename from internal/db/models/client_browser_dao.go rename to internal/db/models/clients/client_browser_dao.go index bed7ecdc..4b2fff82 100644 --- a/internal/db/models/client_browser_dao.go +++ b/internal/db/models/clients/client_browser_dao.go @@ -1,6 +1,7 @@ -package models +package clients import ( + "github.com/TeaOSLab/EdgeAPI/internal/db/models" "github.com/TeaOSLab/EdgeAPI/internal/goman" "github.com/TeaOSLab/EdgeAPI/internal/remotelogs" "github.com/TeaOSLab/EdgeAPI/internal/utils/ttlcache" @@ -130,7 +131,7 @@ func (this *ClientBrowserDAO) CreateBrowserIfNotExists(tx *dbs.Tx, browserName s op.CreatedDay = timeutil.Format("Ymd") op.State = ClientBrowserStateEnabled browserId, err = this.SaveInt64(tx, op) - if err != nil && CheckSQLErrCode(err, 1062 /** duplicate entry **/) { + if err != nil && models.CheckSQLErrCode(err, 1062 /** duplicate entry **/) { return nil } diff --git a/internal/db/models/client_browser_dao_test.go b/internal/db/models/clients/client_browser_dao_test.go similarity index 96% rename from internal/db/models/client_browser_dao_test.go rename to internal/db/models/clients/client_browser_dao_test.go index f5125003..4518f5aa 100644 --- a/internal/db/models/client_browser_dao_test.go +++ b/internal/db/models/clients/client_browser_dao_test.go @@ -1,4 +1,4 @@ -package models_test +package clients_test import ( "github.com/TeaOSLab/EdgeAPI/internal/db/models" diff --git a/internal/db/models/client_browser_model.go b/internal/db/models/clients/client_browser_model.go similarity index 97% rename from internal/db/models/client_browser_model.go rename to internal/db/models/clients/client_browser_model.go index e266110b..3c9d75e8 100644 --- a/internal/db/models/client_browser_model.go +++ b/internal/db/models/clients/client_browser_model.go @@ -1,4 +1,4 @@ -package models +package clients import "github.com/iwind/TeaGo/dbs" diff --git a/internal/db/models/clients/client_browser_model_ext.go b/internal/db/models/clients/client_browser_model_ext.go new file mode 100644 index 00000000..2ea39020 --- /dev/null +++ b/internal/db/models/clients/client_browser_model_ext.go @@ -0,0 +1 @@ +package clients diff --git a/internal/db/models/client_system_dao.go b/internal/db/models/clients/client_system_dao.go similarity index 96% rename from internal/db/models/client_system_dao.go rename to internal/db/models/clients/client_system_dao.go index e1d37f64..0ebd808e 100644 --- a/internal/db/models/client_system_dao.go +++ b/internal/db/models/clients/client_system_dao.go @@ -1,6 +1,7 @@ -package models +package clients import ( + "github.com/TeaOSLab/EdgeAPI/internal/db/models" "github.com/TeaOSLab/EdgeAPI/internal/goman" "github.com/TeaOSLab/EdgeAPI/internal/remotelogs" "github.com/TeaOSLab/EdgeAPI/internal/utils/ttlcache" @@ -129,7 +130,7 @@ func (this *ClientSystemDAO) CreateSystemIfNotExists(tx *dbs.Tx, systemName stri op.CreatedDay = timeutil.Format("Ymd") op.State = ClientSystemStateEnabled systemId, err = this.SaveInt64(tx, op) - if err != nil && CheckSQLErrCode(err, 1062 /** duplicate entry **/) { + if err != nil && models.CheckSQLErrCode(err, 1062 /** duplicate entry **/) { return nil } diff --git a/internal/db/models/client_system_dao_test.go b/internal/db/models/clients/client_system_dao_test.go similarity index 96% rename from internal/db/models/client_system_dao_test.go rename to internal/db/models/clients/client_system_dao_test.go index 414be4b2..73607611 100644 --- a/internal/db/models/client_system_dao_test.go +++ b/internal/db/models/clients/client_system_dao_test.go @@ -1,4 +1,4 @@ -package models_test +package clients_test import ( "github.com/TeaOSLab/EdgeAPI/internal/db/models" diff --git a/internal/db/models/client_system_model.go b/internal/db/models/clients/client_system_model.go similarity index 97% rename from internal/db/models/client_system_model.go rename to internal/db/models/clients/client_system_model.go index cb798cdd..1fb12da1 100644 --- a/internal/db/models/client_system_model.go +++ b/internal/db/models/clients/client_system_model.go @@ -1,4 +1,4 @@ -package models +package clients import "github.com/iwind/TeaGo/dbs" diff --git a/internal/db/models/clients/client_system_model_ext.go b/internal/db/models/clients/client_system_model_ext.go new file mode 100644 index 00000000..2ea39020 --- /dev/null +++ b/internal/db/models/clients/client_system_model_ext.go @@ -0,0 +1 @@ +package clients diff --git a/internal/rpc/services/service_server.go b/internal/rpc/services/service_server.go index c26121dc..ce134f7e 100644 --- a/internal/rpc/services/service_server.go +++ b/internal/rpc/services/service_server.go @@ -6,6 +6,7 @@ import ( "errors" "fmt" "github.com/TeaOSLab/EdgeAPI/internal/db/models" + "github.com/TeaOSLab/EdgeAPI/internal/db/models/clients" "github.com/TeaOSLab/EdgeAPI/internal/db/models/dns" "github.com/TeaOSLab/EdgeAPI/internal/db/models/regions" "github.com/TeaOSLab/EdgeAPI/internal/utils" @@ -1714,7 +1715,7 @@ func (this *ServerService) UploadServerHTTPRequestStat(ctx context.Context, req return err } if systemId == 0 { - err = models.SharedClientSystemDAO.CreateSystemIfNotExists(tx, result.Name) + err = clients.SharedClientSystemDAO.CreateSystemIfNotExists(tx, result.Name) if err != nil { return err } @@ -1745,7 +1746,7 @@ func (this *ServerService) UploadServerHTTPRequestStat(ctx context.Context, req return err } if browserId == 0 { - err = models.SharedClientBrowserDAO.CreateBrowserIfNotExists(tx, result.Name) + err = clients.SharedClientBrowserDAO.CreateBrowserIfNotExists(tx, result.Name) if err != nil { return err }