项目结构大调整

app/proxy.go

@@ -1,42 +1,42 @@
-package app
-
-import (
-	"errors"
-	"github.com/gin-gonic/gin"
-	"github.com/zgwit/iot-master/v4/lib"
-	"github.com/zgwit/iot-master/v4/types"
-	"github.com/zgwit/iot-master/v4/web"
-	"net/http/httputil"
-)
-
-var proxies lib.Map[httputil.ReverseProxy]
-
-func ProxyApp(ctx *gin.Context) {
-	p := proxies.Load(ctx.Param("app"))
-
-	if p == nil {
-		app := Applications.Load(ctx.Param("app"))
-		if app == nil {
-			_ = ctx.Error(errors.New("应用未注册"))
-			return
-		}
-
-		rp, err := web.CreateReverseProxy(app.Type, app.Address)
-		if err != nil {
-			_ = ctx.Error(err)
-			return
-		}
-		p = rp
-		proxies.Store(app.Id, rp)
-	}
-
-	p.ServeHTTP(ctx.Writer, ctx.Request)
-
-	ctx.Abort()
-}
-
-var Applications lib.Map[types.App]
-
-func Register(app *types.App) {
-	Applications.Store(app.Id, app)
-}
+package app
+
+import (
+	"errors"
+	"github.com/gin-gonic/gin"
+	"github.com/zgwit/iot-master/v4/lib"
+	"github.com/zgwit/iot-master/v4/pkg/web"
+	"github.com/zgwit/iot-master/v4/types"
+	"net/http/httputil"
+)
+
+var proxies lib.Map[httputil.ReverseProxy]
+
+func ProxyApp(ctx *gin.Context) {
+	p := proxies.Load(ctx.Param("app"))
+
+	if p == nil {
+		app := Applications.Load(ctx.Param("app"))
+		if app == nil {
+			_ = ctx.Error(errors.New("应用未注册"))
+			return
+		}
+
+		rp, err := web.CreateReverseProxy(app.Type, app.Address)
+		if err != nil {
+			_ = ctx.Error(err)
+			return
+		}
+		p = rp
+		proxies.Store(app.Id, rp)
+	}
+
+	p.ServeHTTP(ctx.Writer, ctx.Request)
+
+	ctx.Abort()
+}
+
+var Applications lib.Map[types.App]
+
+func Register(app *types.App) {
+	Applications.Store(app.Id, app)
+}

app/runner.go

@@ -1,40 +1,40 @@
-package app
-
-import (
-	"github.com/zgwit/iot-master/v4/log"
-	"os/exec"
-	"time"
-)
-
-type Runner struct {
-	path string
-	cmd  *exec.Cmd
-}
-
-func (r *Runner) wait() {
-	err := r.cmd.Wait()
-	if err != nil {
-		log.Error(err)
-	}
-
-	//重启 TODO 间隔可配置
-	time.AfterFunc(time.Minute, func() {
-		err := r.Start()
-		if err != nil {
-			log.Error(err)
-		}
-	})
-}
-
-func (r *Runner) Start() error {
-	r.cmd = exec.Command(r.path)
-	err := r.cmd.Start()
-	if err != nil {
-		return err
-	}
-
-	//协程里等待结果
-	go r.wait()
-
-	return nil
-}
+package app
+
+import (
+	"github.com/zgwit/iot-master/v4/pkg/log"
+	"os/exec"
+	"time"
+)
+
+type Runner struct {
+	path string
+	cmd  *exec.Cmd
+}
+
+func (r *Runner) wait() {
+	err := r.cmd.Wait()
+	if err != nil {
+		log.Error(err)
+	}
+
+	//重启 TODO 间隔可配置
+	time.AfterFunc(time.Minute, func() {
+		err := r.Start()
+		if err != nil {
+			log.Error(err)
+		}
+	})
+}
+
+func (r *Runner) Start() error {
+	r.cmd = exec.Command(r.path)
+	err := r.cmd.Start()
+	if err != nil {
+		return err
+	}
+
+	//协程里等待结果
+	go r.wait()
+
+	return nil
+}

internal/broker/broker.go → broker/broker.go

@@ -5,8 +5,8 @@ import (
 	mochi "github.com/mochi-mqtt/server/v2"
 	"github.com/mochi-mqtt/server/v2/hooks/auth"
 	"github.com/mochi-mqtt/server/v2/listeners"
-	"github.com/zgwit/iot-master/v4/db"
-	"github.com/zgwit/iot-master/v4/log"
+	"github.com/zgwit/iot-master/v4/pkg/db"
+	"github.com/zgwit/iot-master/v4/pkg/log"
 	"github.com/zgwit/iot-master/v4/types"
 	"xorm.io/xorm"
 )

internal/broker/gin_bridge.go → broker/gin_bridge.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"github.com/gin-gonic/gin"
 	"github.com/gorilla/websocket"
-	"github.com/zgwit/iot-master/v4/log"
+	"github.com/zgwit/iot-master/v4/pkg/log"
 	"io"
 	"net"
 	"net/http"

internal/broker/options.go → broker/options.go

@@ -2,7 +2,7 @@ package broker
 
 import (
 	"github.com/zgwit/iot-master/v4/config"
-	"github.com/zgwit/iot-master/v4/env"
+	"github.com/zgwit/iot-master/v4/pkg/env"
 )
 
 type Options struct {

internal/api/alarm.go

@@ -2,8 +2,8 @@ package api
 
 import (
 	"github.com/gin-gonic/gin"
-	curd "github.com/zgwit/iot-master/v4/curd"
-	"github.com/zgwit/iot-master/v4/db"
+	curd "github.com/zgwit/iot-master/v4/pkg/curd"
+	"github.com/zgwit/iot-master/v4/pkg/db"
 	"github.com/zgwit/iot-master/v4/types"
 )
 

internal/api/api.go

@@ -4,9 +4,9 @@ import (
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"
 	"github.com/zgwit/iot-master/v4/app"
-	"github.com/zgwit/iot-master/v4/curd"
+	"github.com/zgwit/iot-master/v4/pkg/curd"
+	"github.com/zgwit/iot-master/v4/pkg/web"
 	"github.com/zgwit/iot-master/v4/types"
-	"github.com/zgwit/iot-master/v4/web"
 	"net/http"
 )
 
@@ -103,12 +103,9 @@ func RegisterRoutes(router *gin.RouterGroup) {
 
 	deviceRouter(router.Group("/device"))
 	alarmRouter(router.Group("/alarm"))
-	validatorRouter(router.Group("/validator"))
 	subscriptionRouter(router.Group("/subscription"))
 	notificationRouter(router.Group("/notification"))
 
-	aggregatorRouter(router.Group("/aggregator"))
-
 	historyRouter(router.Group("/history"))
 	groupRouter(router.Group("/history/group"))
 

internal/api/app.go

@@ -2,7 +2,7 @@ package api
 
 import (
 	"github.com/gin-gonic/gin"
-	curd "github.com/zgwit/iot-master/v4/curd"
+	curd "github.com/zgwit/iot-master/v4/pkg/curd"
 	"github.com/zgwit/iot-master/v4/types"
 )
 

internal/api/attach.go

@@ -2,7 +2,7 @@ package api
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/zgwit/iot-master/v4/curd"
+	"github.com/zgwit/iot-master/v4/pkg/curd"
 	"io/ioutil"
 	"mime"
 	"os"