diff --git a/.gitignore b/.gitignore index 3bf30a3..012c6d2 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ cmd/authlibskin/config.yaml cmd/authlibskin/skin cmd/authlibskin/authlibskin.exe server/static/files -cmd/authlibskin/config.toml +config.toml out/ -stats.html \ No newline at end of file +stats.html +.idea \ No newline at end of file diff --git a/README.md b/README.md index ff39aae..1cadb6e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # TinySkin -Fork from [authlib-skin](https://github.com/xmdhs/authlib-skin). +Fork from [authlib-skin](https://tinyskin). 轻量级的 Yggdrasil 服务端实现,后端 Go,前端 react。 diff --git a/db/ent/client.go b/db/ent/client.go index d03837c..fadd50a 100644 --- a/db/ent/client.go +++ b/db/ent/client.go @@ -8,17 +8,17 @@ import ( "fmt" "log" - "github.com/xmdhs/authlib-skin/db/ent/migrate" + "tinyskin/db/ent/migrate" "entgo.io/ent" "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/xmdhs/authlib-skin/db/ent/texture" - "github.com/xmdhs/authlib-skin/db/ent/user" - "github.com/xmdhs/authlib-skin/db/ent/userprofile" - "github.com/xmdhs/authlib-skin/db/ent/usertexture" - "github.com/xmdhs/authlib-skin/db/ent/usertoken" + "tinyskin/db/ent/texture" + "tinyskin/db/ent/user" + "tinyskin/db/ent/userprofile" + "tinyskin/db/ent/usertexture" + "tinyskin/db/ent/usertoken" ) // Client is the client that holds all ent builders. diff --git a/db/ent/ent.go b/db/ent/ent.go index 8ef748e..9e1c836 100644 --- a/db/ent/ent.go +++ b/db/ent/ent.go @@ -12,11 +12,11 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/xmdhs/authlib-skin/db/ent/texture" - "github.com/xmdhs/authlib-skin/db/ent/user" - "github.com/xmdhs/authlib-skin/db/ent/userprofile" - "github.com/xmdhs/authlib-skin/db/ent/usertexture" - "github.com/xmdhs/authlib-skin/db/ent/usertoken" + "tinyskin/db/ent/texture" + "tinyskin/db/ent/user" + "tinyskin/db/ent/userprofile" + "tinyskin/db/ent/usertexture" + "tinyskin/db/ent/usertoken" ) // ent aliases to avoid import conflicts in user's code. diff --git a/db/ent/enttest/enttest.go b/db/ent/enttest/enttest.go index 2cb4e57..d95c4a7 100644 --- a/db/ent/enttest/enttest.go +++ b/db/ent/enttest/enttest.go @@ -5,12 +5,12 @@ package enttest import ( "context" - "github.com/xmdhs/authlib-skin/db/ent" + "tinyskin/db/ent" // required by schema hooks. - _ "github.com/xmdhs/authlib-skin/db/ent/runtime" + _ "tinyskin/db/ent/runtime" "entgo.io/ent/dialect/sql/schema" - "github.com/xmdhs/authlib-skin/db/ent/migrate" + "tinyskin/db/ent/migrate" ) type ( diff --git a/db/ent/hook/hook.go b/db/ent/hook/hook.go index b19ae4a..bb662a8 100644 --- a/db/ent/hook/hook.go +++ b/db/ent/hook/hook.go @@ -6,7 +6,7 @@ import ( "context" "fmt" - "github.com/xmdhs/authlib-skin/db/ent" + "tinyskin/db/ent" ) // The TextureFunc type is an adapter to allow the use of ordinary diff --git a/db/ent/mutation.go b/db/ent/mutation.go index 5ca47ec..aced8fe 100644 --- a/db/ent/mutation.go +++ b/db/ent/mutation.go @@ -10,12 +10,12 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" - "github.com/xmdhs/authlib-skin/db/ent/predicate" - "github.com/xmdhs/authlib-skin/db/ent/texture" - "github.com/xmdhs/authlib-skin/db/ent/user" - "github.com/xmdhs/authlib-skin/db/ent/userprofile" - "github.com/xmdhs/authlib-skin/db/ent/usertexture" - "github.com/xmdhs/authlib-skin/db/ent/usertoken" + "tinyskin/db/ent/predicate" + "tinyskin/db/ent/texture" + "tinyskin/db/ent/user" + "tinyskin/db/ent/userprofile" + "tinyskin/db/ent/usertexture" + "tinyskin/db/ent/usertoken" ) const ( diff --git a/db/ent/runtime/runtime.go b/db/ent/runtime/runtime.go index eff54c3..f44377e 100644 --- a/db/ent/runtime/runtime.go +++ b/db/ent/runtime/runtime.go @@ -2,7 +2,7 @@ package runtime -// The schema-stitching logic is generated in github.com/xmdhs/authlib-skin/db/ent/runtime.go +// The schema-stitching logic is generated in tinyskin/db/ent/runtime.go const ( Version = "(devel)" // Version of ent codegen. diff --git a/db/ent/texture.go b/db/ent/texture.go index e29d734..f116e7a 100644 --- a/db/ent/texture.go +++ b/db/ent/texture.go @@ -8,8 +8,8 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" - "github.com/xmdhs/authlib-skin/db/ent/texture" - "github.com/xmdhs/authlib-skin/db/ent/user" + "tinyskin/db/ent/texture" + "tinyskin/db/ent/user" ) // Texture is the model entity for the Texture schema. diff --git a/db/ent/texture/where.go b/db/ent/texture/where.go index 16eb75b..1cdb0bd 100644 --- a/db/ent/texture/where.go +++ b/db/ent/texture/where.go @@ -5,7 +5,7 @@ package texture import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/xmdhs/authlib-skin/db/ent/predicate" + "tinyskin/db/ent/predicate" ) // ID filters vertices based on their ID field. diff --git a/db/ent/texture_create.go b/db/ent/texture_create.go index 3cd045c..f298e92 100644 --- a/db/ent/texture_create.go +++ b/db/ent/texture_create.go @@ -9,10 +9,10 @@ import ( "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/xmdhs/authlib-skin/db/ent/texture" - "github.com/xmdhs/authlib-skin/db/ent/user" - "github.com/xmdhs/authlib-skin/db/ent/userprofile" - "github.com/xmdhs/authlib-skin/db/ent/usertexture" + "tinyskin/db/ent/texture" + "tinyskin/db/ent/user" + "tinyskin/db/ent/userprofile" + "tinyskin/db/ent/usertexture" ) // TextureCreate is the builder for creating a Texture entity. diff --git a/db/ent/texture_delete.go b/db/ent/texture_delete.go index fcdf8c7..2bd0ca1 100644 --- a/db/ent/texture_delete.go +++ b/db/ent/texture_delete.go @@ -8,8 +8,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/xmdhs/authlib-skin/db/ent/predicate" - "github.com/xmdhs/authlib-skin/db/ent/texture" + "tinyskin/db/ent/predicate" + "tinyskin/db/ent/texture" ) // TextureDelete is the builder for deleting a Texture entity. diff --git a/db/ent/texture_query.go b/db/ent/texture_query.go index cf8b3eb..5125d3a 100644 --- a/db/ent/texture_query.go +++ b/db/ent/texture_query.go @@ -12,11 +12,11 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/xmdhs/authlib-skin/db/ent/predicate" - "github.com/xmdhs/authlib-skin/db/ent/texture" - "github.com/xmdhs/authlib-skin/db/ent/user" - "github.com/xmdhs/authlib-skin/db/ent/userprofile" - "github.com/xmdhs/authlib-skin/db/ent/usertexture" + "tinyskin/db/ent/predicate" + "tinyskin/db/ent/texture" + "tinyskin/db/ent/user" + "tinyskin/db/ent/userprofile" + "tinyskin/db/ent/usertexture" ) // TextureQuery is the builder for querying Texture entities. diff --git a/db/ent/texture_update.go b/db/ent/texture_update.go index 359cf71..e7f5d80 100644 --- a/db/ent/texture_update.go +++ b/db/ent/texture_update.go @@ -10,11 +10,11 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/xmdhs/authlib-skin/db/ent/predicate" - "github.com/xmdhs/authlib-skin/db/ent/texture" - "github.com/xmdhs/authlib-skin/db/ent/user" - "github.com/xmdhs/authlib-skin/db/ent/userprofile" - "github.com/xmdhs/authlib-skin/db/ent/usertexture" + "tinyskin/db/ent/predicate" + "tinyskin/db/ent/texture" + "tinyskin/db/ent/user" + "tinyskin/db/ent/userprofile" + "tinyskin/db/ent/usertexture" ) // TextureUpdate is the builder for updating Texture entities. diff --git a/db/ent/user.go b/db/ent/user.go index 21ff390..7bbd2ac 100644 --- a/db/ent/user.go +++ b/db/ent/user.go @@ -8,9 +8,9 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" - "github.com/xmdhs/authlib-skin/db/ent/user" - "github.com/xmdhs/authlib-skin/db/ent/userprofile" - "github.com/xmdhs/authlib-skin/db/ent/usertoken" + "tinyskin/db/ent/user" + "tinyskin/db/ent/userprofile" + "tinyskin/db/ent/usertoken" ) // User is the model entity for the User schema. diff --git a/db/ent/user/where.go b/db/ent/user/where.go index f19d46e..c265af1 100644 --- a/db/ent/user/where.go +++ b/db/ent/user/where.go @@ -5,7 +5,7 @@ package user import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/xmdhs/authlib-skin/db/ent/predicate" + "tinyskin/db/ent/predicate" ) // ID filters vertices based on their ID field. diff --git a/db/ent/user_create.go b/db/ent/user_create.go index 8aa35c2..2403117 100644 --- a/db/ent/user_create.go +++ b/db/ent/user_create.go @@ -9,10 +9,10 @@ import ( "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/xmdhs/authlib-skin/db/ent/texture" - "github.com/xmdhs/authlib-skin/db/ent/user" - "github.com/xmdhs/authlib-skin/db/ent/userprofile" - "github.com/xmdhs/authlib-skin/db/ent/usertoken" + "tinyskin/db/ent/texture" + "tinyskin/db/ent/user" + "tinyskin/db/ent/userprofile" + "tinyskin/db/ent/usertoken" ) // UserCreate is the builder for creating a User entity. diff --git a/db/ent/user_delete.go b/db/ent/user_delete.go index c7c11e2..aa12fdd 100644 --- a/db/ent/user_delete.go +++ b/db/ent/user_delete.go @@ -8,8 +8,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/xmdhs/authlib-skin/db/ent/predicate" - "github.com/xmdhs/authlib-skin/db/ent/user" + "tinyskin/db/ent/predicate" + "tinyskin/db/ent/user" ) // UserDelete is the builder for deleting a User entity. diff --git a/db/ent/user_query.go b/db/ent/user_query.go index fb2b507..bd98cc8 100644 --- a/db/ent/user_query.go +++ b/db/ent/user_query.go @@ -12,11 +12,11 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/xmdhs/authlib-skin/db/ent/predicate" - "github.com/xmdhs/authlib-skin/db/ent/texture" - "github.com/xmdhs/authlib-skin/db/ent/user" - "github.com/xmdhs/authlib-skin/db/ent/userprofile" - "github.com/xmdhs/authlib-skin/db/ent/usertoken" + "tinyskin/db/ent/predicate" + "tinyskin/db/ent/texture" + "tinyskin/db/ent/user" + "tinyskin/db/ent/userprofile" + "tinyskin/db/ent/usertoken" ) // UserQuery is the builder for querying User entities. diff --git a/db/ent/user_update.go b/db/ent/user_update.go index 9a9141f..268ae4a 100644 --- a/db/ent/user_update.go +++ b/db/ent/user_update.go @@ -10,11 +10,11 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/xmdhs/authlib-skin/db/ent/predicate" - "github.com/xmdhs/authlib-skin/db/ent/texture" - "github.com/xmdhs/authlib-skin/db/ent/user" - "github.com/xmdhs/authlib-skin/db/ent/userprofile" - "github.com/xmdhs/authlib-skin/db/ent/usertoken" + "tinyskin/db/ent/predicate" + "tinyskin/db/ent/texture" + "tinyskin/db/ent/user" + "tinyskin/db/ent/userprofile" + "tinyskin/db/ent/usertoken" ) // UserUpdate is the builder for updating User entities. diff --git a/db/ent/userprofile.go b/db/ent/userprofile.go index f59359c..a1410be 100644 --- a/db/ent/userprofile.go +++ b/db/ent/userprofile.go @@ -8,8 +8,8 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" - "github.com/xmdhs/authlib-skin/db/ent/user" - "github.com/xmdhs/authlib-skin/db/ent/userprofile" + "tinyskin/db/ent/user" + "tinyskin/db/ent/userprofile" ) // UserProfile is the model entity for the UserProfile schema. diff --git a/db/ent/userprofile/where.go b/db/ent/userprofile/where.go index 01c4b1a..1e52be2 100644 --- a/db/ent/userprofile/where.go +++ b/db/ent/userprofile/where.go @@ -5,7 +5,7 @@ package userprofile import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/xmdhs/authlib-skin/db/ent/predicate" + "tinyskin/db/ent/predicate" ) // ID filters vertices based on their ID field. diff --git a/db/ent/userprofile_create.go b/db/ent/userprofile_create.go index 6b17bc8..601c57e 100644 --- a/db/ent/userprofile_create.go +++ b/db/ent/userprofile_create.go @@ -9,10 +9,10 @@ import ( "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/xmdhs/authlib-skin/db/ent/texture" - "github.com/xmdhs/authlib-skin/db/ent/user" - "github.com/xmdhs/authlib-skin/db/ent/userprofile" - "github.com/xmdhs/authlib-skin/db/ent/usertexture" + "tinyskin/db/ent/texture" + "tinyskin/db/ent/user" + "tinyskin/db/ent/userprofile" + "tinyskin/db/ent/usertexture" ) // UserProfileCreate is the builder for creating a UserProfile entity. diff --git a/db/ent/userprofile_delete.go b/db/ent/userprofile_delete.go index 1575761..16c1683 100644 --- a/db/ent/userprofile_delete.go +++ b/db/ent/userprofile_delete.go @@ -8,8 +8,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/xmdhs/authlib-skin/db/ent/predicate" - "github.com/xmdhs/authlib-skin/db/ent/userprofile" + "tinyskin/db/ent/predicate" + "tinyskin/db/ent/userprofile" ) // UserProfileDelete is the builder for deleting a UserProfile entity. diff --git a/db/ent/userprofile_query.go b/db/ent/userprofile_query.go index 41ab268..46648b8 100644 --- a/db/ent/userprofile_query.go +++ b/db/ent/userprofile_query.go @@ -12,11 +12,11 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/xmdhs/authlib-skin/db/ent/predicate" - "github.com/xmdhs/authlib-skin/db/ent/texture" - "github.com/xmdhs/authlib-skin/db/ent/user" - "github.com/xmdhs/authlib-skin/db/ent/userprofile" - "github.com/xmdhs/authlib-skin/db/ent/usertexture" + "tinyskin/db/ent/predicate" + "tinyskin/db/ent/texture" + "tinyskin/db/ent/user" + "tinyskin/db/ent/userprofile" + "tinyskin/db/ent/usertexture" ) // UserProfileQuery is the builder for querying UserProfile entities. diff --git a/db/ent/userprofile_update.go b/db/ent/userprofile_update.go index 210775b..72b8737 100644 --- a/db/ent/userprofile_update.go +++ b/db/ent/userprofile_update.go @@ -10,11 +10,11 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/xmdhs/authlib-skin/db/ent/predicate" - "github.com/xmdhs/authlib-skin/db/ent/texture" - "github.com/xmdhs/authlib-skin/db/ent/user" - "github.com/xmdhs/authlib-skin/db/ent/userprofile" - "github.com/xmdhs/authlib-skin/db/ent/usertexture" + "tinyskin/db/ent/predicate" + "tinyskin/db/ent/texture" + "tinyskin/db/ent/user" + "tinyskin/db/ent/userprofile" + "tinyskin/db/ent/usertexture" ) // UserProfileUpdate is the builder for updating UserProfile entities. diff --git a/db/ent/usertexture.go b/db/ent/usertexture.go index d792079..078904a 100644 --- a/db/ent/usertexture.go +++ b/db/ent/usertexture.go @@ -8,9 +8,9 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" - "github.com/xmdhs/authlib-skin/db/ent/texture" - "github.com/xmdhs/authlib-skin/db/ent/userprofile" - "github.com/xmdhs/authlib-skin/db/ent/usertexture" + "tinyskin/db/ent/texture" + "tinyskin/db/ent/userprofile" + "tinyskin/db/ent/usertexture" ) // UserTexture is the model entity for the UserTexture schema. diff --git a/db/ent/usertexture/where.go b/db/ent/usertexture/where.go index 19ff4cf..e066060 100644 --- a/db/ent/usertexture/where.go +++ b/db/ent/usertexture/where.go @@ -5,7 +5,7 @@ package usertexture import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/xmdhs/authlib-skin/db/ent/predicate" + "tinyskin/db/ent/predicate" ) // ID filters vertices based on their ID field. diff --git a/db/ent/usertexture_create.go b/db/ent/usertexture_create.go index accead8..ad752f4 100644 --- a/db/ent/usertexture_create.go +++ b/db/ent/usertexture_create.go @@ -9,9 +9,9 @@ import ( "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/xmdhs/authlib-skin/db/ent/texture" - "github.com/xmdhs/authlib-skin/db/ent/userprofile" - "github.com/xmdhs/authlib-skin/db/ent/usertexture" + "tinyskin/db/ent/texture" + "tinyskin/db/ent/userprofile" + "tinyskin/db/ent/usertexture" ) // UserTextureCreate is the builder for creating a UserTexture entity. diff --git a/db/ent/usertexture_delete.go b/db/ent/usertexture_delete.go index 62b7bb0..dadadcf 100644 --- a/db/ent/usertexture_delete.go +++ b/db/ent/usertexture_delete.go @@ -8,8 +8,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/xmdhs/authlib-skin/db/ent/predicate" - "github.com/xmdhs/authlib-skin/db/ent/usertexture" + "tinyskin/db/ent/predicate" + "tinyskin/db/ent/usertexture" ) // UserTextureDelete is the builder for deleting a UserTexture entity. diff --git a/db/ent/usertexture_query.go b/db/ent/usertexture_query.go index 4ce98f9..b352e75 100644 --- a/db/ent/usertexture_query.go +++ b/db/ent/usertexture_query.go @@ -11,10 +11,10 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/xmdhs/authlib-skin/db/ent/predicate" - "github.com/xmdhs/authlib-skin/db/ent/texture" - "github.com/xmdhs/authlib-skin/db/ent/userprofile" - "github.com/xmdhs/authlib-skin/db/ent/usertexture" + "tinyskin/db/ent/predicate" + "tinyskin/db/ent/texture" + "tinyskin/db/ent/userprofile" + "tinyskin/db/ent/usertexture" ) // UserTextureQuery is the builder for querying UserTexture entities. diff --git a/db/ent/usertexture_update.go b/db/ent/usertexture_update.go index 5d6c474..8fc9f3e 100644 --- a/db/ent/usertexture_update.go +++ b/db/ent/usertexture_update.go @@ -10,10 +10,10 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/xmdhs/authlib-skin/db/ent/predicate" - "github.com/xmdhs/authlib-skin/db/ent/texture" - "github.com/xmdhs/authlib-skin/db/ent/userprofile" - "github.com/xmdhs/authlib-skin/db/ent/usertexture" + "tinyskin/db/ent/predicate" + "tinyskin/db/ent/texture" + "tinyskin/db/ent/userprofile" + "tinyskin/db/ent/usertexture" ) // UserTextureUpdate is the builder for updating UserTexture entities. diff --git a/db/ent/usertoken.go b/db/ent/usertoken.go index c944538..c711838 100644 --- a/db/ent/usertoken.go +++ b/db/ent/usertoken.go @@ -8,8 +8,8 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" - "github.com/xmdhs/authlib-skin/db/ent/user" - "github.com/xmdhs/authlib-skin/db/ent/usertoken" + "tinyskin/db/ent/user" + "tinyskin/db/ent/usertoken" ) // UserToken is the model entity for the UserToken schema. diff --git a/db/ent/usertoken/where.go b/db/ent/usertoken/where.go index fb39a0f..f65cf9f 100644 --- a/db/ent/usertoken/where.go +++ b/db/ent/usertoken/where.go @@ -5,7 +5,7 @@ package usertoken import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/xmdhs/authlib-skin/db/ent/predicate" + "tinyskin/db/ent/predicate" ) // ID filters vertices based on their ID field. diff --git a/db/ent/usertoken_create.go b/db/ent/usertoken_create.go index 3bf2219..7794637 100644 --- a/db/ent/usertoken_create.go +++ b/db/ent/usertoken_create.go @@ -9,8 +9,8 @@ import ( "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/xmdhs/authlib-skin/db/ent/user" - "github.com/xmdhs/authlib-skin/db/ent/usertoken" + "tinyskin/db/ent/user" + "tinyskin/db/ent/usertoken" ) // UserTokenCreate is the builder for creating a UserToken entity. diff --git a/db/ent/usertoken_delete.go b/db/ent/usertoken_delete.go index 1f6a2ba..5e423f7 100644 --- a/db/ent/usertoken_delete.go +++ b/db/ent/usertoken_delete.go @@ -8,8 +8,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/xmdhs/authlib-skin/db/ent/predicate" - "github.com/xmdhs/authlib-skin/db/ent/usertoken" + "tinyskin/db/ent/predicate" + "tinyskin/db/ent/usertoken" ) // UserTokenDelete is the builder for deleting a UserToken entity. diff --git a/db/ent/usertoken_query.go b/db/ent/usertoken_query.go index 6a6bc9d..ac35ee4 100644 --- a/db/ent/usertoken_query.go +++ b/db/ent/usertoken_query.go @@ -11,9 +11,9 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/xmdhs/authlib-skin/db/ent/predicate" - "github.com/xmdhs/authlib-skin/db/ent/user" - "github.com/xmdhs/authlib-skin/db/ent/usertoken" + "tinyskin/db/ent/predicate" + "tinyskin/db/ent/user" + "tinyskin/db/ent/usertoken" ) // UserTokenQuery is the builder for querying UserToken entities. diff --git a/db/ent/usertoken_update.go b/db/ent/usertoken_update.go index 457eeeb..580af6c 100644 --- a/db/ent/usertoken_update.go +++ b/db/ent/usertoken_update.go @@ -10,9 +10,9 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/xmdhs/authlib-skin/db/ent/predicate" - "github.com/xmdhs/authlib-skin/db/ent/user" - "github.com/xmdhs/authlib-skin/db/ent/usertoken" + "tinyskin/db/ent/predicate" + "tinyskin/db/ent/user" + "tinyskin/db/ent/usertoken" ) // UserTokenUpdate is the builder for updating UserToken entities. diff --git a/docker-compose.yml b/docker-compose.yml index e28dc2b..da97d07 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,17 +7,17 @@ networks: services: - authlib-skin: + tinyskin: build: . - container_name: authlib-skin + container_name: tinyskin volumes: - - /srv/server/authlib-skin:/app/config + - /srv/server/tinyskin:/app/config restart: always labels: - traefik.enable=true - - traefik.http.routers.authlib-skin.rule=Host(`auth.hfbz.net`) - - traefik.http.routers.authlib-skin.entrypoints=web,websecure - - traefik.http.routers.authlib-skin.middlewares=CORS@file - - traefik.http.services.authlib-skin.loadbalancer.server.port=8080 + - traefik.http.routers.tinyskin.rule=Host(`auth.hfbz.net`) + - traefik.http.routers.tinyskin.entrypoints=web,websecure + - traefik.http.routers.tinyskin.middlewares=CORS@file + - traefik.http.services.tinyskin.loadbalancer.server.port=8080 networks: - traefik diff --git a/go.mod b/go.mod index 3c8e4c5..2331283 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/xmdhs/authlib-skin +module tinyskin go 1.23 diff --git a/handle/admin.go b/handle/admin.go index 2a1a31b..b8b90da 100644 --- a/handle/admin.go +++ b/handle/admin.go @@ -7,13 +7,14 @@ import ( "strconv" "strings" + "tinyskin/handle/handelerror" + "tinyskin/model" + "tinyskin/service" + "github.com/go-chi/chi/v5" "github.com/go-playground/validator/v10" - "github.com/xmdhs/authlib-skin/handle/handelerror" - "github.com/xmdhs/authlib-skin/model" - "github.com/xmdhs/authlib-skin/service" - U "github.com/xmdhs/authlib-skin/utils" + U "tinyskin/utils" ) type AdminHandel struct { diff --git a/handle/config.go b/handle/config.go index b87a32b..b2ba03c 100644 --- a/handle/config.go +++ b/handle/config.go @@ -4,8 +4,8 @@ import ( "encoding/json" "net/http" - "github.com/xmdhs/authlib-skin/model" - "github.com/xmdhs/authlib-skin/service" + "tinyskin/model" + "tinyskin/service" ) type Handel struct { diff --git a/handle/handelerror/error.go b/handle/handelerror/error.go index ac68ea4..e55c25a 100644 --- a/handle/handelerror/error.go +++ b/handle/handelerror/error.go @@ -7,11 +7,11 @@ import ( "log/slog" "net/http" - "github.com/xmdhs/authlib-skin/model" - "github.com/xmdhs/authlib-skin/service" - "github.com/xmdhs/authlib-skin/service/auth" - "github.com/xmdhs/authlib-skin/service/captcha" - "github.com/xmdhs/authlib-skin/service/email" + "tinyskin/model" + "tinyskin/service" + "tinyskin/service/auth" + "tinyskin/service/captcha" + "tinyskin/service/email" ) type HandleError struct { diff --git a/handle/handle.go b/handle/handle.go index 339bd88..3c707fe 100644 --- a/handle/handle.go +++ b/handle/handle.go @@ -6,9 +6,10 @@ import ( "io" "net/netip" + "tinyskin/model" + "github.com/google/wire" "github.com/samber/lo" - "github.com/xmdhs/authlib-skin/model" ) var HandelSet = wire.NewSet(NewUserHandel, NewAdminHandel, NewHandel) diff --git a/handle/user.go b/handle/user.go index b0af80e..b109afc 100644 --- a/handle/user.go +++ b/handle/user.go @@ -13,13 +13,14 @@ import ( "strings" "sync" + "tinyskin/config" + "tinyskin/handle/handelerror" + "tinyskin/model" + "tinyskin/service" + "tinyskin/utils" + "github.com/go-chi/chi/v5" "github.com/go-playground/validator/v10" - "github.com/xmdhs/authlib-skin/config" - "github.com/xmdhs/authlib-skin/handle/handelerror" - "github.com/xmdhs/authlib-skin/model" - "github.com/xmdhs/authlib-skin/service" - "github.com/xmdhs/authlib-skin/utils" ) type UserHandel struct { diff --git a/handle/yggdrasil/error.go b/handle/yggdrasil/error.go index 920aab8..e7856c4 100644 --- a/handle/yggdrasil/error.go +++ b/handle/yggdrasil/error.go @@ -5,7 +5,7 @@ import ( "encoding/json" "net/http" - "github.com/xmdhs/authlib-skin/model/yggdrasil" + "tinyskin/model/yggdrasil" ) func handleYgError(ctx context.Context, w http.ResponseWriter, e yggdrasil.Error, httpcode int) { diff --git a/handle/yggdrasil/session.go b/handle/yggdrasil/session.go index 1501946..512bdf8 100644 --- a/handle/yggdrasil/session.go +++ b/handle/yggdrasil/session.go @@ -4,10 +4,11 @@ import ( "encoding/json" "net/http" + "tinyskin/model" + "tinyskin/model/yggdrasil" + "tinyskin/utils" + "github.com/samber/lo" - "github.com/xmdhs/authlib-skin/model" - "github.com/xmdhs/authlib-skin/model/yggdrasil" - "github.com/xmdhs/authlib-skin/utils" ) func (y *Yggdrasil) SessionJoin() http.HandlerFunc { diff --git a/handle/yggdrasil/texture.go b/handle/yggdrasil/texture.go index a805ce4..a15ce1b 100644 --- a/handle/yggdrasil/texture.go +++ b/handle/yggdrasil/texture.go @@ -7,11 +7,12 @@ import ( "net/http" "strings" - "github.com/go-chi/chi/v5" - "github.com/xmdhs/authlib-skin/model" - "github.com/xmdhs/authlib-skin/model/yggdrasil" + "tinyskin/model" + "tinyskin/model/yggdrasil" - yggdrasilS "github.com/xmdhs/authlib-skin/service/yggdrasil" + "github.com/go-chi/chi/v5" + + yggdrasilS "tinyskin/service/yggdrasil" ) func (y *Yggdrasil) getTokenbyAuthorization(ctx context.Context, w http.ResponseWriter, r *http.Request) string { diff --git a/handle/yggdrasil/user.go b/handle/yggdrasil/user.go index 8ec254f..e28d257 100644 --- a/handle/yggdrasil/user.go +++ b/handle/yggdrasil/user.go @@ -5,11 +5,12 @@ import ( "errors" "net/http" + "tinyskin/model" + "tinyskin/model/yggdrasil" + yggdrasilS "tinyskin/service/yggdrasil" + "github.com/go-chi/chi/v5" "github.com/samber/lo" - "github.com/xmdhs/authlib-skin/model" - "github.com/xmdhs/authlib-skin/model/yggdrasil" - yggdrasilS "github.com/xmdhs/authlib-skin/service/yggdrasil" ) func (y *Yggdrasil) Authenticate() http.HandlerFunc { diff --git a/handle/yggdrasil/yggdrasil.go b/handle/yggdrasil/yggdrasil.go index 85895a6..51f5c01 100644 --- a/handle/yggdrasil/yggdrasil.go +++ b/handle/yggdrasil/yggdrasil.go @@ -11,13 +11,14 @@ import ( "net/http" "net/url" + "tinyskin/config" + "tinyskin/model/yggdrasil" + "tinyskin/service/auth" + yggdrasilS "tinyskin/service/yggdrasil" + "tinyskin/utils" + "github.com/go-playground/validator/v10" "github.com/samber/lo" - "github.com/xmdhs/authlib-skin/config" - "github.com/xmdhs/authlib-skin/model/yggdrasil" - "github.com/xmdhs/authlib-skin/service/auth" - yggdrasilS "github.com/xmdhs/authlib-skin/service/yggdrasil" - "github.com/xmdhs/authlib-skin/utils" ) type PubRsaKey string diff --git a/main.go b/main.go index 38a196c..dd469a8 100644 --- a/main.go +++ b/main.go @@ -11,11 +11,12 @@ import ( _ "embed" + "tinyskin/config" + "tinyskin/server" + "tinyskin/utils/sign" + "github.com/pelletier/go-toml/v2" "github.com/samber/lo" - "github.com/xmdhs/authlib-skin/config" - "github.com/xmdhs/authlib-skin/server" - "github.com/xmdhs/authlib-skin/utils/sign" ) var configPath string diff --git a/server/provide.go b/server/provide.go index 74ed9c2..e5d3d61 100644 --- a/server/provide.go +++ b/server/provide.go @@ -10,16 +10,17 @@ import ( "os" "time" + "tinyskin/config" + "tinyskin/db/cache" + "tinyskin/db/ent" + "tinyskin/db/ent/migrate" + "tinyskin/handle/yggdrasil" + "tinyskin/utils/sign" + entsql "entgo.io/ent/dialect/sql" "github.com/go-playground/validator/v10" _ "github.com/go-sql-driver/mysql" "github.com/google/wire" - "github.com/xmdhs/authlib-skin/config" - "github.com/xmdhs/authlib-skin/db/cache" - "github.com/xmdhs/authlib-skin/db/ent" - "github.com/xmdhs/authlib-skin/db/ent/migrate" - "github.com/xmdhs/authlib-skin/handle/yggdrasil" - "github.com/xmdhs/authlib-skin/utils/sign" ) func ProvideSlog(c config.Config) slog.Handler { diff --git a/server/route/route.go b/server/route/route.go index 0fef661..81876ad 100644 --- a/server/route/route.go +++ b/server/route/route.go @@ -5,13 +5,14 @@ import ( "log/slog" "net/http" + "tinyskin/config" + "tinyskin/handle" + "tinyskin/handle/yggdrasil" + "tinyskin/server/static" + "github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5/middleware" "github.com/go-chi/cors" - "github.com/xmdhs/authlib-skin/config" - "github.com/xmdhs/authlib-skin/handle" - "github.com/xmdhs/authlib-skin/handle/yggdrasil" - "github.com/xmdhs/authlib-skin/server/static" ) func NewRoute(handelY *yggdrasil.Yggdrasil, handel *handle.Handel, c config.Config, sl slog.Handler, diff --git a/server/server.go b/server/server.go index 9118611..efc4974 100644 --- a/server/server.go +++ b/server/server.go @@ -4,7 +4,7 @@ import ( "net/http" "time" - "github.com/xmdhs/authlib-skin/config" + "tinyskin/config" ) func NewServer(c config.Config, route http.Handler) (*http.Server, func()) { diff --git a/server/wire.go b/server/wire.go index f183ab6..7502407 100644 --- a/server/wire.go +++ b/server/wire.go @@ -6,17 +6,18 @@ import ( "context" "net/http" + "tinyskin/config" + "tinyskin/handle" + "tinyskin/handle/handelerror" + "tinyskin/handle/yggdrasil" + "tinyskin/server/route" + "tinyskin/service" + "tinyskin/service/auth" + "tinyskin/service/captcha" + "tinyskin/service/email" + yggdrasilS "tinyskin/service/yggdrasil" + "github.com/google/wire" - "github.com/xmdhs/authlib-skin/config" - "github.com/xmdhs/authlib-skin/handle" - "github.com/xmdhs/authlib-skin/handle/handelerror" - "github.com/xmdhs/authlib-skin/handle/yggdrasil" - "github.com/xmdhs/authlib-skin/server/route" - "github.com/xmdhs/authlib-skin/service" - "github.com/xmdhs/authlib-skin/service/auth" - "github.com/xmdhs/authlib-skin/service/captcha" - "github.com/xmdhs/authlib-skin/service/email" - yggdrasilS "github.com/xmdhs/authlib-skin/service/yggdrasil" ) var serviceSet = wire.NewSet(service.Service, yggdrasilS.NewYggdrasil, email.NewEmail, auth.NewAuthService, diff --git a/server/wire_gen.go b/server/wire_gen.go index 7478f20..115bfc4 100644 --- a/server/wire_gen.go +++ b/server/wire_gen.go @@ -9,16 +9,16 @@ package server import ( "context" "github.com/google/wire" - "github.com/xmdhs/authlib-skin/config" - "github.com/xmdhs/authlib-skin/handle" - "github.com/xmdhs/authlib-skin/handle/handelerror" - yggdrasil2 "github.com/xmdhs/authlib-skin/handle/yggdrasil" - "github.com/xmdhs/authlib-skin/server/route" - "github.com/xmdhs/authlib-skin/service" - "github.com/xmdhs/authlib-skin/service/auth" - "github.com/xmdhs/authlib-skin/service/captcha" - "github.com/xmdhs/authlib-skin/service/email" - "github.com/xmdhs/authlib-skin/service/yggdrasil" + "tinyskin/config" + "tinyskin/handle" + "tinyskin/handle/handelerror" + yggdrasil2 "tinyskin/handle/yggdrasil" + "tinyskin/server/route" + "tinyskin/service" + "tinyskin/service/auth" + "tinyskin/service/captcha" + "tinyskin/service/email" + "tinyskin/service/yggdrasil" "net/http" ) diff --git a/service/admin.go b/service/admin.go index 8d98a67..82f7b5d 100644 --- a/service/admin.go +++ b/service/admin.go @@ -6,18 +6,18 @@ import ( "fmt" "strconv" - "github.com/xmdhs/authlib-skin/config" - "github.com/xmdhs/authlib-skin/db/cache" - "github.com/xmdhs/authlib-skin/db/ent" - "github.com/xmdhs/authlib-skin/db/ent/predicate" - "github.com/xmdhs/authlib-skin/db/ent/user" - "github.com/xmdhs/authlib-skin/db/ent/userprofile" - "github.com/xmdhs/authlib-skin/db/ent/usertoken" - "github.com/xmdhs/authlib-skin/model" - "github.com/xmdhs/authlib-skin/model/yggdrasil" - "github.com/xmdhs/authlib-skin/service/auth" - utilsService "github.com/xmdhs/authlib-skin/service/utils" - "github.com/xmdhs/authlib-skin/utils" + "tinyskin/config" + "tinyskin/db/cache" + "tinyskin/db/ent" + "tinyskin/db/ent/predicate" + "tinyskin/db/ent/user" + "tinyskin/db/ent/userprofile" + "tinyskin/db/ent/usertoken" + "tinyskin/model" + "tinyskin/model/yggdrasil" + "tinyskin/service/auth" + utilsService "tinyskin/service/utils" + "tinyskin/utils" ) type AdminService struct { diff --git a/service/admin_test.go b/service/admin_test.go index 144f987..0ddf251 100644 --- a/service/admin_test.go +++ b/service/admin_test.go @@ -4,9 +4,10 @@ import ( "context" "testing" + "tinyskin/model" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/xmdhs/authlib-skin/model" ) func TestAdminSerice_Auth(t *testing.T) { diff --git a/service/auth/auth.go b/service/auth/auth.go index db40c0e..2d074d8 100644 --- a/service/auth/auth.go +++ b/service/auth/auth.go @@ -8,14 +8,15 @@ import ( "strconv" "time" + "tinyskin/db/cache" + "tinyskin/db/ent" + "tinyskin/db/ent/user" + "tinyskin/db/ent/usertoken" + "tinyskin/model" + "tinyskin/model/yggdrasil" + "tinyskin/utils" + "github.com/golang-jwt/jwt/v5" - "github.com/xmdhs/authlib-skin/db/cache" - "github.com/xmdhs/authlib-skin/db/ent" - "github.com/xmdhs/authlib-skin/db/ent/user" - "github.com/xmdhs/authlib-skin/db/ent/usertoken" - "github.com/xmdhs/authlib-skin/model" - "github.com/xmdhs/authlib-skin/model/yggdrasil" - "github.com/xmdhs/authlib-skin/utils" ) type AuthService struct { diff --git a/service/auth/utils.go b/service/auth/utils.go index feb5c7d..a6e753e 100644 --- a/service/auth/utils.go +++ b/service/auth/utils.go @@ -5,8 +5,9 @@ import ( "fmt" "time" + "tinyskin/model" + "github.com/golang-jwt/jwt/v5" - "github.com/xmdhs/authlib-skin/model" ) func IsAdmin(state int) bool { diff --git a/service/captcha/captcha.go b/service/captcha/captcha.go index 606cc1c..f8a038f 100644 --- a/service/captcha/captcha.go +++ b/service/captcha/captcha.go @@ -9,7 +9,7 @@ import ( "net/http" "strings" - "github.com/xmdhs/authlib-skin/config" + "tinyskin/config" ) type CaptchaService struct { diff --git a/service/email/email.go b/service/email/email.go index c1b0789..319781c 100644 --- a/service/email/email.go +++ b/service/email/email.go @@ -11,11 +11,12 @@ import ( "net/url" "time" + "tinyskin/config" + "tinyskin/db/cache" + "github.com/golang-jwt/jwt/v5" "github.com/samber/lo" "github.com/wneessen/go-mail" - "github.com/xmdhs/authlib-skin/config" - "github.com/xmdhs/authlib-skin/db/cache" ) type EmailConfig struct { diff --git a/service/texture.go b/service/texture.go index 07a23ac..564f04c 100644 --- a/service/texture.go +++ b/service/texture.go @@ -9,15 +9,15 @@ import ( "os" "path/filepath" - "github.com/xmdhs/authlib-skin/config" - "github.com/xmdhs/authlib-skin/db/cache" - "github.com/xmdhs/authlib-skin/db/ent" - "github.com/xmdhs/authlib-skin/db/ent/texture" - "github.com/xmdhs/authlib-skin/db/ent/user" - "github.com/xmdhs/authlib-skin/db/ent/userprofile" - "github.com/xmdhs/authlib-skin/model" - utilsService "github.com/xmdhs/authlib-skin/service/utils" - "github.com/xmdhs/authlib-skin/utils" + "tinyskin/config" + "tinyskin/db/cache" + "tinyskin/db/ent" + "tinyskin/db/ent/texture" + "tinyskin/db/ent/user" + "tinyskin/db/ent/userprofile" + "tinyskin/model" + utilsService "tinyskin/service/utils" + "tinyskin/utils" ) type TextureService struct { diff --git a/service/user.go b/service/user.go index ab943f7..05a1e75 100644 --- a/service/user.go +++ b/service/user.go @@ -8,17 +8,18 @@ import ( "strings" "time" + "tinyskin/config" + "tinyskin/db/cache" + "tinyskin/db/ent" + "tinyskin/db/ent/user" + "tinyskin/db/ent/userprofile" + "tinyskin/model" + "tinyskin/service/auth" + "tinyskin/service/captcha" + "tinyskin/service/email" + "tinyskin/utils" + "github.com/google/uuid" - "github.com/xmdhs/authlib-skin/config" - "github.com/xmdhs/authlib-skin/db/cache" - "github.com/xmdhs/authlib-skin/db/ent" - "github.com/xmdhs/authlib-skin/db/ent/user" - "github.com/xmdhs/authlib-skin/db/ent/userprofile" - "github.com/xmdhs/authlib-skin/model" - "github.com/xmdhs/authlib-skin/service/auth" - "github.com/xmdhs/authlib-skin/service/captcha" - "github.com/xmdhs/authlib-skin/service/email" - "github.com/xmdhs/authlib-skin/utils" ) var ( diff --git a/service/user_test.go b/service/user_test.go index 73a5878..a62d831 100644 --- a/service/user_test.go +++ b/service/user_test.go @@ -8,16 +8,17 @@ import ( "os" "testing" + "tinyskin/config" + "tinyskin/db/cache" + "tinyskin/db/ent" + "tinyskin/db/ent/migrate" + "tinyskin/model" + "tinyskin/service/auth" + "tinyskin/service/captcha" + "tinyskin/service/email" + _ "github.com/go-sql-driver/mysql" "github.com/samber/lo" - "github.com/xmdhs/authlib-skin/config" - "github.com/xmdhs/authlib-skin/db/cache" - "github.com/xmdhs/authlib-skin/db/ent" - "github.com/xmdhs/authlib-skin/db/ent/migrate" - "github.com/xmdhs/authlib-skin/model" - "github.com/xmdhs/authlib-skin/service/auth" - "github.com/xmdhs/authlib-skin/service/captcha" - "github.com/xmdhs/authlib-skin/service/email" ) var ( diff --git a/service/utils/texture.go b/service/utils/texture.go index 6b63af2..70412b0 100644 --- a/service/utils/texture.go +++ b/service/utils/texture.go @@ -7,10 +7,11 @@ import ( "os" "path/filepath" + "tinyskin/db/ent" + "tinyskin/db/ent/texture" + "tinyskin/db/ent/usertexture" + "github.com/samber/lo" - "github.com/xmdhs/authlib-skin/db/ent" - "github.com/xmdhs/authlib-skin/db/ent/texture" - "github.com/xmdhs/authlib-skin/db/ent/usertexture" ) func DelTexture(ctx context.Context, userProfileID int, textureType string, client *ent.Client, texturePath string) error { diff --git a/service/web.go b/service/web.go index 0e81a88..d8b0e0c 100644 --- a/service/web.go +++ b/service/web.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/xmdhs/authlib-skin/config" - "github.com/xmdhs/authlib-skin/db/ent" - "github.com/xmdhs/authlib-skin/model" - "github.com/xmdhs/authlib-skin/utils" + "tinyskin/config" + "tinyskin/db/ent" + "tinyskin/model" + "tinyskin/utils" ) type WebService struct { diff --git a/service/yggdrasil/session.go b/service/yggdrasil/session.go index 821fe30..dc1f36b 100644 --- a/service/yggdrasil/session.go +++ b/service/yggdrasil/session.go @@ -5,11 +5,11 @@ import ( "fmt" "time" - "github.com/xmdhs/authlib-skin/db/cache" - "github.com/xmdhs/authlib-skin/db/ent/userprofile" - "github.com/xmdhs/authlib-skin/model" - "github.com/xmdhs/authlib-skin/model/yggdrasil" - "github.com/xmdhs/authlib-skin/service/auth" + "tinyskin/db/cache" + "tinyskin/db/ent/userprofile" + "tinyskin/model" + "tinyskin/model/yggdrasil" + "tinyskin/service/auth" ) type sessionWithIP struct { diff --git a/service/yggdrasil/texture.go b/service/yggdrasil/texture.go index 503a61a..9c5dde5 100644 --- a/service/yggdrasil/texture.go +++ b/service/yggdrasil/texture.go @@ -5,10 +5,10 @@ import ( "errors" "fmt" - "github.com/xmdhs/authlib-skin/db/ent/user" - "github.com/xmdhs/authlib-skin/db/ent/userprofile" - "github.com/xmdhs/authlib-skin/model" - utilsService "github.com/xmdhs/authlib-skin/service/utils" + "tinyskin/db/ent/user" + "tinyskin/db/ent/userprofile" + "tinyskin/model" + utilsService "tinyskin/service/utils" ) var ( diff --git a/service/yggdrasil/user.go b/service/yggdrasil/user.go index 95a4899..e968625 100644 --- a/service/yggdrasil/user.go +++ b/service/yggdrasil/user.go @@ -15,18 +15,19 @@ import ( "strings" "time" + "tinyskin/db/cache" + "tinyskin/db/ent" + "tinyskin/db/ent/texture" + "tinyskin/db/ent/user" + "tinyskin/db/ent/userprofile" + "tinyskin/db/ent/usertoken" + "tinyskin/model" + "tinyskin/model/yggdrasil" + "tinyskin/utils" + "tinyskin/utils/sign" + "github.com/google/uuid" "github.com/samber/lo" - "github.com/xmdhs/authlib-skin/db/cache" - "github.com/xmdhs/authlib-skin/db/ent" - "github.com/xmdhs/authlib-skin/db/ent/texture" - "github.com/xmdhs/authlib-skin/db/ent/user" - "github.com/xmdhs/authlib-skin/db/ent/userprofile" - "github.com/xmdhs/authlib-skin/db/ent/usertoken" - "github.com/xmdhs/authlib-skin/model" - "github.com/xmdhs/authlib-skin/model/yggdrasil" - "github.com/xmdhs/authlib-skin/utils" - "github.com/xmdhs/authlib-skin/utils/sign" ) var ( diff --git a/service/yggdrasil/yggdrasil.go b/service/yggdrasil/yggdrasil.go index b0ac327..9115f59 100644 --- a/service/yggdrasil/yggdrasil.go +++ b/service/yggdrasil/yggdrasil.go @@ -11,13 +11,14 @@ import ( "sync" "time" + "tinyskin/config" + "tinyskin/db/cache" + "tinyskin/db/ent" + "tinyskin/model" + "tinyskin/model/yggdrasil" + "tinyskin/service/auth" + "github.com/samber/lo" - "github.com/xmdhs/authlib-skin/config" - "github.com/xmdhs/authlib-skin/db/cache" - "github.com/xmdhs/authlib-skin/db/ent" - "github.com/xmdhs/authlib-skin/model" - "github.com/xmdhs/authlib-skin/model/yggdrasil" - "github.com/xmdhs/authlib-skin/service/auth" ) type Yggdrasil struct { diff --git a/test/auth_test.go b/test/auth_test.go index 56811f2..d599c88 100644 --- a/test/auth_test.go +++ b/test/auth_test.go @@ -5,9 +5,10 @@ import ( "net/http" "testing" + "tinyskin/model" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/xmdhs/authlib-skin/model" ) func TestAuthMiddleware(t *testing.T) { diff --git a/test/server_test.go b/test/server_test.go index 4c965e3..06fb8b2 100644 --- a/test/server_test.go +++ b/test/server_test.go @@ -5,10 +5,11 @@ import ( "os" "testing" + "tinyskin/config" + "tinyskin/server" + "github.com/pelletier/go-toml/v2" "github.com/samber/lo" - "github.com/xmdhs/authlib-skin/config" - "github.com/xmdhs/authlib-skin/server" ) func TestMain(m *testing.M) { diff --git a/utils/tx.go b/utils/tx.go index d42edb6..7c60535 100644 --- a/utils/tx.go +++ b/utils/tx.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/xmdhs/authlib-skin/db/ent" + "tinyskin/db/ent" ) func WithTx(ctx context.Context, client *ent.Client, fn func(tx *ent.Tx) error) error {