refactor: ⚡ new project structrue

Aimerny · May 30, 2024 · 1bd9247 · 1bd9247
1 parent 230dbc9
commit 1bd9247
Show file tree

Hide file tree

Showing 33 changed files with 31 additions and 32 deletions.
diff --git a/.github/workflows/go-release.yml b/.github/workflows/go-release.yml
@@ -44,7 +44,6 @@ jobs:
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v4
         with:
-          workdir: src/
           version: latest
           args: release --clean
         env:

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,3 @@
-src/conf.json
-src/session_id
+conf.json
+session_id
 dist/
diff --git a/src/.goreleaser.yml → .goreleaser.yml b/src/.goreleaser.yml → .goreleaser.yml
@@ -7,7 +7,7 @@ release:
   draft: true
   replace_existing_artifacts: true
 builds:
-  - main: example/example.go
+  - main: app/example/example.go
     id: kook-go
     env:
       - CGO_ENABLED=0

diff --git a/.release-please/.release-please-manifest.json b/.release-please/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  "src": "0.2.1"
+  "app": "0.2.1"
 }
diff --git a/.release-please/release-please-config.json b/.release-please/release-please-config.json
@@ -2,7 +2,7 @@
   "pull-request-title-pattern": "chore${scope}: 🔖 release${component} ${version}",
   "separate-pull-requests": true,
   "packages": {
-    "src": {
+    ".": {
       "release-type": "go",
       "include-v-in-tag": true
     }

diff --git a/src/CHANGELOG.md → CHANGELOG.md b/src/CHANGELOG.md → CHANGELOG.md
diff --git a/src/common/config.go → app/common/config.go b/src/common/config.go → app/common/config.go
diff --git a/src/common/logrus.go → app/common/logrus.go b/src/common/logrus.go → app/common/logrus.go
diff --git a/src/common/url_consts.go → app/common/url_consts.go b/src/common/url_consts.go → app/common/url_consts.go
diff --git a/src/core/action/action_test.go → app/core/action/action_test.go b/src/core/action/action_test.go → app/core/action/action_test.go
@@ -1,8 +1,8 @@
 package action
 
 import (
-	"github.com/aimerny/kook-go/common"
-	"github.com/aimerny/kook-go/core/helper"
+	"github.com/aimerny/kook-go/app/common"
+	"github.com/aimerny/kook-go/app/core/helper"
 	log "github.com/sirupsen/logrus"
 	"testing"
 )

diff --git a/src/core/action/base.go → app/core/action/base.go b/src/core/action/base.go → app/core/action/base.go
@@ -1,8 +1,8 @@
 package action
 
 import (
-	"github.com/aimerny/kook-go/common"
-	"github.com/aimerny/kook-go/core/helper"
+	"github.com/aimerny/kook-go/app/common"
+	"github.com/aimerny/kook-go/app/core/helper"
 	log "github.com/sirupsen/logrus"
 	"io"
 )

diff --git a/src/core/action/channel.go → app/core/action/channel.go b/src/core/action/channel.go → app/core/action/channel.go
@@ -2,8 +2,8 @@ package action
 
 import (
 	"fmt"
-	"github.com/aimerny/kook-go/common"
-	"github.com/aimerny/kook-go/core/model"
+	"github.com/aimerny/kook-go/app/common"
+	"github.com/aimerny/kook-go/app/core/model"
 	jsoniter "github.com/json-iterator/go"
 	log "github.com/sirupsen/logrus"
 )

diff --git a/src/core/action/guild.go → app/core/action/guild.go b/src/core/action/guild.go → app/core/action/guild.go
@@ -2,8 +2,8 @@ package action
 
 import (
 	"fmt"
-	"github.com/aimerny/kook-go/common"
-	"github.com/aimerny/kook-go/core/model"
+	"github.com/aimerny/kook-go/app/common"
+	"github.com/aimerny/kook-go/app/core/model"
 	jsoniter "github.com/json-iterator/go"
 	log "github.com/sirupsen/logrus"
 )

diff --git a/src/core/action/message.go → app/core/action/message.go b/src/core/action/message.go → app/core/action/message.go
@@ -1,8 +1,8 @@
 package action
 
 import (
-	"github.com/aimerny/kook-go/common"
-	"github.com/aimerny/kook-go/core/model"
+	"github.com/aimerny/kook-go/app/common"
+	"github.com/aimerny/kook-go/app/core/model"
 )
 
 func MessageList() {

diff --git a/src/core/event/handler.go → app/core/event/handler.go b/src/core/event/handler.go → app/core/event/handler.go
@@ -1,7 +1,7 @@
 package event
 
 import (
-	"github.com/aimerny/kook-go/core/model"
+	"github.com/aimerny/kook-go/app/core/model"
 )
 
 type BaseEventHandler struct{}

diff --git a/src/core/event/manager.go → app/core/event/manager.go b/src/core/event/manager.go → app/core/event/manager.go
@@ -1,7 +1,7 @@
 package event
 
 import (
-	"github.com/aimerny/kook-go/core/model"
+	"github.com/aimerny/kook-go/app/core/model"
 	jsoniter "github.com/json-iterator/go"
 	log "github.com/sirupsen/logrus"
 	"time"

diff --git a/src/core/event/queue.go → app/core/event/queue.go b/src/core/event/queue.go → app/core/event/queue.go
@@ -1,7 +1,7 @@
 package event
 
 import (
-	"github.com/aimerny/kook-go/core/model"
+	"github.com/aimerny/kook-go/app/core/model"
 	"math"
 )
 

diff --git a/src/core/helper/fun_helper.go → app/core/helper/fun_helper.go b/src/core/helper/fun_helper.go → app/core/helper/fun_helper.go
diff --git a/src/core/helper/http_helper.go → app/core/helper/http_helper.go b/src/core/helper/http_helper.go → app/core/helper/http_helper.go
diff --git a/src/core/helper/session_helper.go → app/core/helper/session_helper.go b/src/core/helper/session_helper.go → app/core/helper/session_helper.go
diff --git a/src/core/model/base.go → app/core/model/base.go b/src/core/model/base.go → app/core/model/base.go
diff --git a/src/core/model/dto.go → app/core/model/dto.go b/src/core/model/dto.go → app/core/model/dto.go
diff --git a/src/core/model/event.go → app/core/model/event.go b/src/core/model/event.go → app/core/model/event.go
diff --git a/src/core/model/pack.go → app/core/model/pack.go b/src/core/model/pack.go → app/core/model/pack.go
diff --git a/src/core/model/signal.go → app/core/model/signal.go b/src/core/model/signal.go → app/core/model/signal.go
diff --git a/src/core/model/user.go → app/core/model/user.go b/src/core/model/user.go → app/core/model/user.go
diff --git a/src/core/session/handler.go → app/core/session/handler.go b/src/core/session/handler.go → app/core/session/handler.go
@@ -2,8 +2,8 @@ package session
 
 import (
 	"context"
-	"github.com/aimerny/kook-go/core/helper"
-	"github.com/aimerny/kook-go/core/model"
+	"github.com/aimerny/kook-go/app/core/helper"
+	"github.com/aimerny/kook-go/app/core/model"
 	"github.com/mitchellh/mapstructure"
 	log "github.com/sirupsen/logrus"
 	"time"

diff --git a/src/core/session/session.go → app/core/session/session.go b/src/core/session/session.go → app/core/session/session.go
@@ -5,9 +5,9 @@ import (
 	"compress/zlib"
 	"context"
 	"errors"
-	"github.com/aimerny/kook-go/core/event"
-	"github.com/aimerny/kook-go/core/helper"
-	"github.com/aimerny/kook-go/core/model"
+	"github.com/aimerny/kook-go/app/core/event"
+	"github.com/aimerny/kook-go/app/core/helper"
+	"github.com/aimerny/kook-go/app/core/model"
 	"github.com/avast/retry-go/v4"
 	"github.com/gorilla/websocket"
 	"github.com/jasonlvhit/gocron"

diff --git a/src/core/session/session_handle.go → app/core/session/session_handle.go b/src/core/session/session_handle.go → app/core/session/session_handle.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/aimerny/kook-go/common"
-	"github.com/aimerny/kook-go/core/helper"
-	"github.com/aimerny/kook-go/core/model"
+	"github.com/aimerny/kook-go/app/common"
+	"github.com/aimerny/kook-go/app/core/helper"
+	"github.com/aimerny/kook-go/app/core/model"
 	"github.com/gorilla/websocket"
 	jsoniter "github.com/json-iterator/go"
 	log "github.com/sirupsen/logrus"

diff --git a/src/core/session/state.go → app/core/session/state.go b/src/core/session/state.go → app/core/session/state.go
diff --git a/src/example/example.go → app/example/example.go b/src/example/example.go → app/example/example.go
@@ -1,11 +1,11 @@
 package main
 
 import (
-	"github.com/aimerny/kook-go/common"
-	"github.com/aimerny/kook-go/core/action"
-	"github.com/aimerny/kook-go/core/event"
-	"github.com/aimerny/kook-go/core/model"
-	"github.com/aimerny/kook-go/core/session"
+	"github.com/aimerny/kook-go/app/common"
+	"github.com/aimerny/kook-go/app/core/action"
+	"github.com/aimerny/kook-go/app/core/event"
+	"github.com/aimerny/kook-go/app/core/model"
+	"github.com/aimerny/kook-go/app/core/session"
 	log "github.com/sirupsen/logrus"
 )
 

diff --git a/src/go.mod → go.mod b/src/go.mod → go.mod
diff --git a/src/go.sum → go.sum b/src/go.sum → go.sum