From 0eda77775fcfe1bc3048f192fd7b2c75bb1b9c74 Mon Sep 17 00:00:00 2001
From: Michael Li <alimy@gility.net>
Date: Sat, 12 Nov 2022 23:07:11 +0800
Subject: [PATCH] mv app's logic to service

---
 internal/app/app.go              | 29 -----------------------------
 internal/service/service.go      | 24 ++++++++++++++++++++++++
 internal/{app => service}/web.go |  2 +-
 3 files changed, 25 insertions(+), 30 deletions(-)
 delete mode 100644 internal/app/app.go
 rename internal/{app => service}/web.go (98%)

diff --git a/internal/app/app.go b/internal/app/app.go
deleted file mode 100644
index d35fb235..00000000
--- a/internal/app/app.go
+++ /dev/null
@@ -1,29 +0,0 @@
-package app
-
-import (
-	"net/http"
-
-	"github.com/rocboss/paopao-ce/internal/conf"
-	"github.com/rocboss/paopao-ce/internal/servants"
-)
-
-type Service interface {
-	Start()
-	Stop()
-	Info() string
-}
-
-func NewWebService() Service {
-	e := newWebEngine()
-	servants.RegisterWebServants(e)
-
-	return &webService{
-		server: &http.Server{
-			Addr:           conf.ServerSetting.HttpIp + ":" + conf.ServerSetting.HttpPort,
-			Handler:        e,
-			ReadTimeout:    conf.ServerSetting.ReadTimeout,
-			WriteTimeout:   conf.ServerSetting.WriteTimeout,
-			MaxHeaderBytes: 1 << 20,
-		},
-	}
-}
diff --git a/internal/service/service.go b/internal/service/service.go
index d7afba23..b35bc541 100644
--- a/internal/service/service.go
+++ b/internal/service/service.go
@@ -1,10 +1,13 @@
 package service
 
 import (
+	"net/http"
+
 	"github.com/rocboss/paopao-ce/internal/conf"
 	"github.com/rocboss/paopao-ce/internal/core"
 	"github.com/rocboss/paopao-ce/internal/dao"
 	"github.com/rocboss/paopao-ce/internal/model"
+	"github.com/rocboss/paopao-ce/internal/servants"
 	"github.com/sirupsen/logrus"
 )
 
@@ -15,6 +18,27 @@ var (
 	DisablePhoneVerify bool
 )
 
+type Service interface {
+	Start()
+	Stop()
+	Info() string
+}
+
+func NewWebService() Service {
+	e := newWebEngine()
+	servants.RegisterWebServants(e)
+
+	return &webService{
+		server: &http.Server{
+			Addr:           conf.ServerSetting.HttpIp + ":" + conf.ServerSetting.HttpPort,
+			Handler:        e,
+			ReadTimeout:    conf.ServerSetting.ReadTimeout,
+			WriteTimeout:   conf.ServerSetting.WriteTimeout,
+			MaxHeaderBytes: 1 << 20,
+		},
+	}
+}
+
 func Initialize() {
 	ds = dao.DataService()
 	ts = dao.TweetSearchService()
diff --git a/internal/app/web.go b/internal/service/web.go
similarity index 98%
rename from internal/app/web.go
rename to internal/service/web.go
index 79d0f5a7..458d8fa4 100644
--- a/internal/app/web.go
+++ b/internal/service/web.go
@@ -1,4 +1,4 @@
-package app
+package service
 
 import (
 	"context"