style: Module name

cmd/apimain.go

@@ -2,18 +2,18 @@ package main
 
 import (
 	"github.com/go-redis/redis/v8"
-	"github.com/lejianwen/rustdesk-api/config"
+	"github.com/lejianwen/rustdesk-api/v2/config"
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	"github.com/lejianwen/rustdesk-api/http"
+	"github.com/lejianwen/rustdesk-api/v2/http"
-	"github.com/lejianwen/rustdesk-api/lib/cache"
+	"github.com/lejianwen/rustdesk-api/v2/lib/cache"
-	"github.com/lejianwen/rustdesk-api/lib/jwt"
+	"github.com/lejianwen/rustdesk-api/v2/lib/jwt"
-	"github.com/lejianwen/rustdesk-api/lib/lock"
+	"github.com/lejianwen/rustdesk-api/v2/lib/lock"
-	"github.com/lejianwen/rustdesk-api/lib/logger"
+	"github.com/lejianwen/rustdesk-api/v2/lib/logger"
-	"github.com/lejianwen/rustdesk-api/lib/orm"
+	"github.com/lejianwen/rustdesk-api/v2/lib/orm"
-	"github.com/lejianwen/rustdesk-api/lib/upload"
+	"github.com/lejianwen/rustdesk-api/v2/lib/upload"
-	"github.com/lejianwen/rustdesk-api/model"
+	"github.com/lejianwen/rustdesk-api/v2/model"
-	"github.com/lejianwen/rustdesk-api/service"
+	"github.com/lejianwen/rustdesk-api/v2/service"
-	"github.com/lejianwen/rustdesk-api/utils"
+	"github.com/lejianwen/rustdesk-api/v2/utils"
 	"github.com/nicksnyder/go-i18n/v2/i18n"
 	"github.com/spf13/cobra"
 	"os"
@@ -186,12 +186,12 @@ func DatabaseAutoUpdate() {
 			// 获取底层的 *sql.DB 对象，并确保在程序退出时关闭连接
 			sqlDBWithoutDB, err := dbWithoutDB.DB()
 			if err != nil {
-				global.Logger.Error("获取底层 *sql.DB 对象失败: %v\n", err)
+				global.Logger.Errorf("获取底层 *sql.DB 对象失败: %v", err)
 				return
 			}
 			defer func() {
 				if err := sqlDBWithoutDB.Close(); err != nil {
-					global.Logger.Error("关闭连接失败: %v\n", err)
+					global.Logger.Errorf("关闭连接失败: %v", err)
 				}
 			}()
 

global/global.go

@@ -5,11 +5,11 @@ import (
 	ut "github.com/go-playground/universal-translator"
 	"github.com/go-playground/validator/v10"
 	"github.com/go-redis/redis/v8"
-	"github.com/lejianwen/rustdesk-api/config"
+	"github.com/lejianwen/rustdesk-api/v2/config"
-	"github.com/lejianwen/rustdesk-api/lib/cache"
+	"github.com/lejianwen/rustdesk-api/v2/lib/cache"
-	"github.com/lejianwen/rustdesk-api/lib/jwt"
+	"github.com/lejianwen/rustdesk-api/v2/lib/jwt"
-	"github.com/lejianwen/rustdesk-api/lib/lock"
+	"github.com/lejianwen/rustdesk-api/v2/lib/lock"
-	"github.com/lejianwen/rustdesk-api/lib/upload"
+	"github.com/lejianwen/rustdesk-api/v2/lib/upload"
 	"github.com/nicksnyder/go-i18n/v2/i18n"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/viper"

global/i18n.go

@@ -15,7 +15,6 @@ func InitI18n() {
 	fileInfos, err := os.ReadDir(dir)
 	if err != nil {
 		panic(err)
-		return
 	}
 	for _, fileInfo := range fileInfos {
 		//如果文件名不是.toml结尾

go.mod

@@ -1,4 +1,4 @@
-module github.com/lejianwen/rustdesk-api
+module github.com/lejianwen/rustdesk-api/v2
 
 go 1.22
 

http/controller/admin/addressBook.go

@@ -4,10 +4,10 @@ import (
 	"encoding/json"
 	_ "encoding/json"
 	"github.com/gin-gonic/gin"
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	"github.com/lejianwen/rustdesk-api/http/request/admin"
+	"github.com/lejianwen/rustdesk-api/v2/http/request/admin"
-	"github.com/lejianwen/rustdesk-api/http/response"
+	"github.com/lejianwen/rustdesk-api/v2/http/response"
-	"github.com/lejianwen/rustdesk-api/service"
+	"github.com/lejianwen/rustdesk-api/v2/service"
 	"gorm.io/gorm"
 	"strconv"
 )

http/controller/admin/addressBookCollection.go

@@ -2,11 +2,11 @@ package admin
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	"github.com/lejianwen/rustdesk-api/http/request/admin"
+	"github.com/lejianwen/rustdesk-api/v2/http/request/admin"
-	"github.com/lejianwen/rustdesk-api/http/response"
+	"github.com/lejianwen/rustdesk-api/v2/http/response"
-	"github.com/lejianwen/rustdesk-api/model"
+	"github.com/lejianwen/rustdesk-api/v2/model"
-	"github.com/lejianwen/rustdesk-api/service"
+	"github.com/lejianwen/rustdesk-api/v2/service"
 	"gorm.io/gorm"
 	"strconv"
 )

http/controller/admin/addressBookCollectionRule.go

@@ -2,11 +2,11 @@ package admin
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	"github.com/lejianwen/rustdesk-api/http/request/admin"
+	"github.com/lejianwen/rustdesk-api/v2/http/request/admin"
-	"github.com/lejianwen/rustdesk-api/http/response"
+	"github.com/lejianwen/rustdesk-api/v2/http/response"
-	"github.com/lejianwen/rustdesk-api/model"
+	"github.com/lejianwen/rustdesk-api/v2/model"
-	"github.com/lejianwen/rustdesk-api/service"
+	"github.com/lejianwen/rustdesk-api/v2/service"
 	"gorm.io/gorm"
 	"strconv"
 )

http/controller/admin/audit.go

@@ -2,11 +2,11 @@ package admin
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	"github.com/lejianwen/rustdesk-api/http/request/admin"
+	"github.com/lejianwen/rustdesk-api/v2/http/request/admin"
-	"github.com/lejianwen/rustdesk-api/http/response"
+	"github.com/lejianwen/rustdesk-api/v2/http/response"
-	"github.com/lejianwen/rustdesk-api/model"
+	"github.com/lejianwen/rustdesk-api/v2/model"
-	"github.com/lejianwen/rustdesk-api/service"
+	"github.com/lejianwen/rustdesk-api/v2/service"
 	"gorm.io/gorm"
 )
 

http/controller/admin/config.go

@@ -2,9 +2,9 @@ package admin
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	"github.com/lejianwen/rustdesk-api/http/response"
+	"github.com/lejianwen/rustdesk-api/v2/http/response"
-	"github.com/lejianwen/rustdesk-api/service"
+	"github.com/lejianwen/rustdesk-api/v2/service"
 	"os"
 	"strings"
 )

http/controller/admin/file.go

@@ -3,9 +3,9 @@ package admin
 import (
 	"fmt"
 	"github.com/gin-gonic/gin"
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	"github.com/lejianwen/rustdesk-api/http/response"
+	"github.com/lejianwen/rustdesk-api/v2/http/response"
-	"github.com/lejianwen/rustdesk-api/lib/upload"
+	"github.com/lejianwen/rustdesk-api/v2/lib/upload"
 	"os"
 	"time"
 )

http/controller/admin/group.go

@@ -2,10 +2,10 @@ package admin
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	"github.com/lejianwen/rustdesk-api/http/request/admin"
+	"github.com/lejianwen/rustdesk-api/v2/http/request/admin"
-	"github.com/lejianwen/rustdesk-api/http/response"
+	"github.com/lejianwen/rustdesk-api/v2/http/response"
-	"github.com/lejianwen/rustdesk-api/service"
+	"github.com/lejianwen/rustdesk-api/v2/service"
 	"strconv"
 )
 

http/controller/admin/login.go

@@ -3,14 +3,14 @@ package admin
 import (
 	"fmt"
 	"github.com/gin-gonic/gin"
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	"github.com/lejianwen/rustdesk-api/http/controller/api"
+	"github.com/lejianwen/rustdesk-api/v2/http/controller/api"
-	"github.com/lejianwen/rustdesk-api/http/request/admin"
+	"github.com/lejianwen/rustdesk-api/v2/http/request/admin"
-	apiReq "github.com/lejianwen/rustdesk-api/http/request/api"
+	apiReq "github.com/lejianwen/rustdesk-api/v2/http/request/api"
-	"github.com/lejianwen/rustdesk-api/http/response"
+	"github.com/lejianwen/rustdesk-api/v2/http/response"
-	adResp "github.com/lejianwen/rustdesk-api/http/response/admin"
+	adResp "github.com/lejianwen/rustdesk-api/v2/http/response/admin"
-	"github.com/lejianwen/rustdesk-api/model"
+	"github.com/lejianwen/rustdesk-api/v2/model"
-	"github.com/lejianwen/rustdesk-api/service"
+	"github.com/lejianwen/rustdesk-api/v2/service"
 	"github.com/mojocn/base64Captcha"
 	"sync"
 	"time"

http/controller/admin/loginLog.go

@@ -2,11 +2,11 @@ package admin
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	"github.com/lejianwen/rustdesk-api/http/request/admin"
+	"github.com/lejianwen/rustdesk-api/v2/http/request/admin"
-	"github.com/lejianwen/rustdesk-api/http/response"
+	"github.com/lejianwen/rustdesk-api/v2/http/response"
-	"github.com/lejianwen/rustdesk-api/model"
+	"github.com/lejianwen/rustdesk-api/v2/model"
-	"github.com/lejianwen/rustdesk-api/service"
+	"github.com/lejianwen/rustdesk-api/v2/service"
 	"gorm.io/gorm"
 	"strconv"
 )

http/controller/admin/my/addressBook.go

@@ -3,10 +3,10 @@ package my
 import (
 	"encoding/json"
 	"github.com/gin-gonic/gin"
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	"github.com/lejianwen/rustdesk-api/http/request/admin"
+	"github.com/lejianwen/rustdesk-api/v2/http/request/admin"
-	"github.com/lejianwen/rustdesk-api/http/response"
+	"github.com/lejianwen/rustdesk-api/v2/http/response"
-	"github.com/lejianwen/rustdesk-api/service"
+	"github.com/lejianwen/rustdesk-api/v2/service"
 	"gorm.io/gorm"
 )
 

http/controller/admin/my/addressBookCollection.go

@@ -2,11 +2,11 @@ package my
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	"github.com/lejianwen/rustdesk-api/http/request/admin"
+	"github.com/lejianwen/rustdesk-api/v2/http/request/admin"
-	"github.com/lejianwen/rustdesk-api/http/response"
+	"github.com/lejianwen/rustdesk-api/v2/http/response"
-	"github.com/lejianwen/rustdesk-api/model"
+	"github.com/lejianwen/rustdesk-api/v2/model"
-	"github.com/lejianwen/rustdesk-api/service"
+	"github.com/lejianwen/rustdesk-api/v2/service"
 	"gorm.io/gorm"
 )
 

http/controller/admin/my/addressBookCollectionRule.go

@@ -2,11 +2,11 @@ package my
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	"github.com/lejianwen/rustdesk-api/http/request/admin"
+	"github.com/lejianwen/rustdesk-api/v2/http/request/admin"
-	"github.com/lejianwen/rustdesk-api/http/response"
+	"github.com/lejianwen/rustdesk-api/v2/http/response"
-	"github.com/lejianwen/rustdesk-api/model"
+	"github.com/lejianwen/rustdesk-api/v2/model"
-	"github.com/lejianwen/rustdesk-api/service"
+	"github.com/lejianwen/rustdesk-api/v2/service"
 	"gorm.io/gorm"
 )
 

http/controller/admin/my/loginLog.go

@@ -2,11 +2,11 @@ package my
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	"github.com/lejianwen/rustdesk-api/http/request/admin"
+	"github.com/lejianwen/rustdesk-api/v2/http/request/admin"
-	"github.com/lejianwen/rustdesk-api/http/response"
+	"github.com/lejianwen/rustdesk-api/v2/http/response"
-	"github.com/lejianwen/rustdesk-api/model"
+	"github.com/lejianwen/rustdesk-api/v2/model"
-	"github.com/lejianwen/rustdesk-api/service"
+	"github.com/lejianwen/rustdesk-api/v2/service"
 	"gorm.io/gorm"
 )
 

http/controller/admin/my/peer.go

@@ -2,9 +2,9 @@ package my
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/lejianwen/rustdesk-api/http/request/admin"
+	"github.com/lejianwen/rustdesk-api/v2/http/request/admin"
-	"github.com/lejianwen/rustdesk-api/http/response"
+	"github.com/lejianwen/rustdesk-api/v2/http/response"
-	"github.com/lejianwen/rustdesk-api/service"
+	"github.com/lejianwen/rustdesk-api/v2/service"
 	"gorm.io/gorm"
 	"time"
 )

http/controller/admin/my/shareRecord.go

@@ -2,10 +2,10 @@ package my
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	"github.com/lejianwen/rustdesk-api/http/request/admin"
+	"github.com/lejianwen/rustdesk-api/v2/http/request/admin"
-	"github.com/lejianwen/rustdesk-api/http/response"
+	"github.com/lejianwen/rustdesk-api/v2/http/response"
-	"github.com/lejianwen/rustdesk-api/service"
+	"github.com/lejianwen/rustdesk-api/v2/service"
 	"gorm.io/gorm"
 )
 

http/controller/admin/my/tag.go

@@ -2,10 +2,10 @@ package my
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	"github.com/lejianwen/rustdesk-api/http/request/admin"
+	"github.com/lejianwen/rustdesk-api/v2/http/request/admin"
-	"github.com/lejianwen/rustdesk-api/http/response"
+	"github.com/lejianwen/rustdesk-api/v2/http/response"
-	"github.com/lejianwen/rustdesk-api/service"
+	"github.com/lejianwen/rustdesk-api/v2/service"
 	"gorm.io/gorm"
 )
 

http/controller/admin/oauth.go

@@ -2,11 +2,11 @@ package admin
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	"github.com/lejianwen/rustdesk-api/http/request/admin"
+	"github.com/lejianwen/rustdesk-api/v2/http/request/admin"
-	adminReq "github.com/lejianwen/rustdesk-api/http/request/admin"
+	adminReq "github.com/lejianwen/rustdesk-api/v2/http/request/admin"
-	"github.com/lejianwen/rustdesk-api/http/response"
+	"github.com/lejianwen/rustdesk-api/v2/http/response"
-	"github.com/lejianwen/rustdesk-api/service"
+	"github.com/lejianwen/rustdesk-api/v2/service"
 	"strconv"
 )
 

http/controller/admin/peer.go

@@ -2,10 +2,10 @@ package admin
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	"github.com/lejianwen/rustdesk-api/http/request/admin"
+	"github.com/lejianwen/rustdesk-api/v2/http/request/admin"
-	"github.com/lejianwen/rustdesk-api/http/response"
+	"github.com/lejianwen/rustdesk-api/v2/http/response"
-	"github.com/lejianwen/rustdesk-api/service"
+	"github.com/lejianwen/rustdesk-api/v2/service"
 	"gorm.io/gorm"
 	"strconv"
 	"time"

http/controller/admin/rustdesk.go

@@ -2,11 +2,11 @@ package admin
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	"github.com/lejianwen/rustdesk-api/http/request/admin"
+	"github.com/lejianwen/rustdesk-api/v2/http/request/admin"
-	"github.com/lejianwen/rustdesk-api/http/response"
+	"github.com/lejianwen/rustdesk-api/v2/http/response"
-	"github.com/lejianwen/rustdesk-api/model"
+	"github.com/lejianwen/rustdesk-api/v2/model"
-	"github.com/lejianwen/rustdesk-api/service"
+	"github.com/lejianwen/rustdesk-api/v2/service"
 )
 
 type Rustdesk struct {

http/controller/admin/shareRecord.go

@@ -2,10 +2,10 @@ package admin
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	"github.com/lejianwen/rustdesk-api/http/request/admin"
+	"github.com/lejianwen/rustdesk-api/v2/http/request/admin"
-	"github.com/lejianwen/rustdesk-api/http/response"
+	"github.com/lejianwen/rustdesk-api/v2/http/response"
-	"github.com/lejianwen/rustdesk-api/service"
+	"github.com/lejianwen/rustdesk-api/v2/service"
 	"gorm.io/gorm"
 )
 

http/controller/admin/tag.go

@@ -2,10 +2,10 @@ package admin
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	"github.com/lejianwen/rustdesk-api/http/request/admin"
+	"github.com/lejianwen/rustdesk-api/v2/http/request/admin"
-	"github.com/lejianwen/rustdesk-api/http/response"
+	"github.com/lejianwen/rustdesk-api/v2/http/response"
-	"github.com/lejianwen/rustdesk-api/service"
+	"github.com/lejianwen/rustdesk-api/v2/service"
 	"gorm.io/gorm"
 	"strconv"
 )

http/controller/admin/user.go

@@ -2,12 +2,12 @@ package admin
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	"github.com/lejianwen/rustdesk-api/http/request/admin"
+	"github.com/lejianwen/rustdesk-api/v2/http/request/admin"
-	"github.com/lejianwen/rustdesk-api/http/response"
+	"github.com/lejianwen/rustdesk-api/v2/http/response"
-	adResp "github.com/lejianwen/rustdesk-api/http/response/admin"
+	adResp "github.com/lejianwen/rustdesk-api/v2/http/response/admin"
-	"github.com/lejianwen/rustdesk-api/model"
+	"github.com/lejianwen/rustdesk-api/v2/model"
-	"github.com/lejianwen/rustdesk-api/service"
+	"github.com/lejianwen/rustdesk-api/v2/service"
 	"gorm.io/gorm"
 	"strconv"
 )

http/controller/admin/userToken.go

@@ -2,11 +2,11 @@ package admin
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	"github.com/lejianwen/rustdesk-api/http/request/admin"
+	"github.com/lejianwen/rustdesk-api/v2/http/request/admin"
-	"github.com/lejianwen/rustdesk-api/http/response"
+	"github.com/lejianwen/rustdesk-api/v2/http/response"
-	"github.com/lejianwen/rustdesk-api/model"
+	"github.com/lejianwen/rustdesk-api/v2/model"
-	"github.com/lejianwen/rustdesk-api/service"
+	"github.com/lejianwen/rustdesk-api/v2/service"
 	"gorm.io/gorm"
 )
 

http/controller/api/ab.go

@@ -4,13 +4,13 @@ import (
 	"encoding/json"
 	"errors"
 	"github.com/gin-gonic/gin"
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	requstform "github.com/lejianwen/rustdesk-api/http/request/api"
+	requstform "github.com/lejianwen/rustdesk-api/v2/http/request/api"
-	"github.com/lejianwen/rustdesk-api/http/response"
+	"github.com/lejianwen/rustdesk-api/v2/http/response"
-	"github.com/lejianwen/rustdesk-api/http/response/api"
+	"github.com/lejianwen/rustdesk-api/v2/http/response/api"
-	"github.com/lejianwen/rustdesk-api/model"
+	"github.com/lejianwen/rustdesk-api/v2/model"
-	"github.com/lejianwen/rustdesk-api/service"
+	"github.com/lejianwen/rustdesk-api/v2/service"
-	"github.com/lejianwen/rustdesk-api/utils"
+	"github.com/lejianwen/rustdesk-api/v2/utils"
 	"net/http"
 	"strconv"
 	"strings"

http/controller/api/audit.go

@@ -3,10 +3,10 @@ package api
 import (
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/binding"
-	request "github.com/lejianwen/rustdesk-api/http/request/api"
+	request "github.com/lejianwen/rustdesk-api/v2/http/request/api"
-	"github.com/lejianwen/rustdesk-api/http/response"
+	"github.com/lejianwen/rustdesk-api/v2/http/response"
-	"github.com/lejianwen/rustdesk-api/model"
+	"github.com/lejianwen/rustdesk-api/v2/model"
-	"github.com/lejianwen/rustdesk-api/service"
+	"github.com/lejianwen/rustdesk-api/v2/service"
 	"time"
 )
 

http/controller/api/group.go

@@ -2,11 +2,11 @@ package api
 
 import (
 	"github.com/gin-gonic/gin"
-	apiReq "github.com/lejianwen/rustdesk-api/http/request/api"
+	apiReq "github.com/lejianwen/rustdesk-api/v2/http/request/api"
-	"github.com/lejianwen/rustdesk-api/http/response"
+	"github.com/lejianwen/rustdesk-api/v2/http/response"
-	apiResp "github.com/lejianwen/rustdesk-api/http/response/api"
+	apiResp "github.com/lejianwen/rustdesk-api/v2/http/response/api"
-	"github.com/lejianwen/rustdesk-api/model"
+	"github.com/lejianwen/rustdesk-api/v2/model"
-	"github.com/lejianwen/rustdesk-api/service"
+	"github.com/lejianwen/rustdesk-api/v2/service"
 	"net/http"
 )
 

http/controller/api/index.go

@@ -2,10 +2,10 @@ package api
 
 import (
 	"github.com/gin-gonic/gin"
-	requstform "github.com/lejianwen/rustdesk-api/http/request/api"
+	requstform "github.com/lejianwen/rustdesk-api/v2/http/request/api"
-	"github.com/lejianwen/rustdesk-api/http/response"
+	"github.com/lejianwen/rustdesk-api/v2/http/response"
-	"github.com/lejianwen/rustdesk-api/model"
+	"github.com/lejianwen/rustdesk-api/v2/model"
-	"github.com/lejianwen/rustdesk-api/service"
+	"github.com/lejianwen/rustdesk-api/v2/service"
 	"net/http"
 	"os"
 	"time"

http/controller/api/login.go

@@ -4,12 +4,12 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/gin-gonic/gin"
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	"github.com/lejianwen/rustdesk-api/http/request/api"
+	"github.com/lejianwen/rustdesk-api/v2/http/request/api"
-	"github.com/lejianwen/rustdesk-api/http/response"
+	"github.com/lejianwen/rustdesk-api/v2/http/response"
-	apiResp "github.com/lejianwen/rustdesk-api/http/response/api"
+	apiResp "github.com/lejianwen/rustdesk-api/v2/http/response/api"
-	"github.com/lejianwen/rustdesk-api/model"
+	"github.com/lejianwen/rustdesk-api/v2/model"
-	"github.com/lejianwen/rustdesk-api/service"
+	"github.com/lejianwen/rustdesk-api/v2/service"
 	"net/http"
 )
 

http/controller/api/ouath.go

@@ -2,12 +2,12 @@ package api
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	"github.com/lejianwen/rustdesk-api/http/request/api"
+	"github.com/lejianwen/rustdesk-api/v2/http/request/api"
-	"github.com/lejianwen/rustdesk-api/http/response"
+	"github.com/lejianwen/rustdesk-api/v2/http/response"
-	apiResp "github.com/lejianwen/rustdesk-api/http/response/api"
+	apiResp "github.com/lejianwen/rustdesk-api/v2/http/response/api"
-	"github.com/lejianwen/rustdesk-api/model"
+	"github.com/lejianwen/rustdesk-api/v2/model"
-	"github.com/lejianwen/rustdesk-api/service"
+	"github.com/lejianwen/rustdesk-api/v2/service"
 	"net/http"
 )
 

http/controller/api/peer.go

@@ -3,9 +3,9 @@ package api
 import (
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/binding"
-	requstform "github.com/lejianwen/rustdesk-api/http/request/api"
+	requstform "github.com/lejianwen/rustdesk-api/v2/http/request/api"
-	"github.com/lejianwen/rustdesk-api/http/response"
+	"github.com/lejianwen/rustdesk-api/v2/http/response"
-	"github.com/lejianwen/rustdesk-api/service"
+	"github.com/lejianwen/rustdesk-api/v2/service"
 	"net/http"
 )
 

http/controller/api/user.go

@@ -2,8 +2,8 @@ package api
 
 import (
 	"github.com/gin-gonic/gin"
-	apiResp "github.com/lejianwen/rustdesk-api/http/response/api"
+	apiResp "github.com/lejianwen/rustdesk-api/v2/http/response/api"
-	"github.com/lejianwen/rustdesk-api/service"
+	"github.com/lejianwen/rustdesk-api/v2/service"
 	"net/http"
 )
 

http/controller/api/webClient.go

@@ -2,10 +2,10 @@ package api
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	"github.com/lejianwen/rustdesk-api/http/response"
+	"github.com/lejianwen/rustdesk-api/v2/http/response"
-	"github.com/lejianwen/rustdesk-api/http/response/api"
+	"github.com/lejianwen/rustdesk-api/v2/http/response/api"
-	"github.com/lejianwen/rustdesk-api/service"
+	"github.com/lejianwen/rustdesk-api/v2/service"
 	"time"
 )
 

http/controller/web/index.go

@@ -2,7 +2,7 @@ package web
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
 	"strconv"
 )
 

http/http.go

@@ -2,9 +2,9 @@ package http
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	"github.com/lejianwen/rustdesk-api/http/middleware"
+	"github.com/lejianwen/rustdesk-api/v2/http/middleware"
-	"github.com/lejianwen/rustdesk-api/http/router"
+	"github.com/lejianwen/rustdesk-api/v2/http/router"
 	"github.com/sirupsen/logrus"
 	"net/http"
 	"strings"

http/middleware/admin.go

@@ -2,8 +2,8 @@ package middleware
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/lejianwen/rustdesk-api/http/response"
+	"github.com/lejianwen/rustdesk-api/v2/http/response"
-	"github.com/lejianwen/rustdesk-api/service"
+	"github.com/lejianwen/rustdesk-api/v2/service"
 )
 
 // AdminAuth 后台权限验证中间件

http/middleware/admin_privilege.go

@@ -2,8 +2,8 @@ package middleware
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/lejianwen/rustdesk-api/http/response"
+	"github.com/lejianwen/rustdesk-api/v2/http/response"
-	"github.com/lejianwen/rustdesk-api/service"
+	"github.com/lejianwen/rustdesk-api/v2/service"
 )
 
 // AdminPrivilege ...

http/middleware/jwt.go

@@ -2,9 +2,9 @@ package middleware
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	"github.com/lejianwen/rustdesk-api/http/response"
+	"github.com/lejianwen/rustdesk-api/v2/http/response"
-	"github.com/lejianwen/rustdesk-api/service"
+	"github.com/lejianwen/rustdesk-api/v2/service"
 )
 
 func JwtAuth() gin.HandlerFunc {

http/middleware/logger.go

@@ -2,7 +2,7 @@ package middleware
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
 	"github.com/sirupsen/logrus"
 )
 

http/middleware/rustauth.go

@@ -2,8 +2,8 @@ package middleware
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	"github.com/lejianwen/rustdesk-api/service"
+	"github.com/lejianwen/rustdesk-api/v2/service"
 )
 
 func RustAuth() gin.HandlerFunc {

http/request/admin/addressBook.go

@@ -2,7 +2,7 @@ package admin
 
 import (
 	"encoding/json"
-	"github.com/lejianwen/rustdesk-api/model"
+	"github.com/lejianwen/rustdesk-api/v2/model"
 )
 
 type AddressBookForm struct {

http/request/admin/group.go

@@ -1,6 +1,6 @@
 package admin
 
-import "github.com/lejianwen/rustdesk-api/model"
+import "github.com/lejianwen/rustdesk-api/v2/model"
 
 type GroupForm struct {
 	Id   uint   `json:"id"`

http/request/admin/oauth.go

@@ -1,7 +1,7 @@
 package admin
 
 import (
-	"github.com/lejianwen/rustdesk-api/model"
+	"github.com/lejianwen/rustdesk-api/v2/model"
 )
 
 type BindOauthForm struct {

http/request/admin/peer.go

@@ -1,6 +1,6 @@
 package admin
 
-import "github.com/lejianwen/rustdesk-api/model"
+import "github.com/lejianwen/rustdesk-api/v2/model"
 
 type PeerForm struct {
 	RowId    uint   `json:"row_id" `

http/request/admin/tag.go

@@ -1,6 +1,6 @@
 package admin
 
-import "github.com/lejianwen/rustdesk-api/model"
+import "github.com/lejianwen/rustdesk-api/v2/model"
 
 type TagForm struct {
 	Id           uint   `json:"id"`

http/request/admin/user.go

@@ -1,7 +1,7 @@
 package admin
 
 import (
-	"github.com/lejianwen/rustdesk-api/model"
+	"github.com/lejianwen/rustdesk-api/v2/model"
 )
 
 type UserForm struct {

http/request/api/audit.go

@@ -2,8 +2,8 @@ package api
 
 import (
 	"encoding/json"
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	"github.com/lejianwen/rustdesk-api/model"
+	"github.com/lejianwen/rustdesk-api/v2/model"
 	"strconv"
 )
 

http/request/api/peer.go

@@ -1,6 +1,6 @@
 package api
 
-import "github.com/lejianwen/rustdesk-api/model"
+import "github.com/lejianwen/rustdesk-api/v2/model"
 
 type AddressBookFormData struct {
 	Tags      []string             `json:"tags"`

http/response/admin/user.go

@@ -1,6 +1,6 @@
 package admin
 
-import "github.com/lejianwen/rustdesk-api/model"
+import "github.com/lejianwen/rustdesk-api/v2/model"
 
 type LoginPayload struct {
 	Username   string   `json:"username"`

http/response/api/ab.go

@@ -1,6 +1,6 @@
 package api
 
-import "github.com/lejianwen/rustdesk-api/model"
+import "github.com/lejianwen/rustdesk-api/v2/model"
 
 type AbList struct {
 	Peers     []*model.AddressBook `json:"peers,omitempty"`

http/response/api/peer.go

@@ -1,6 +1,6 @@
 package api
 
-import "github.com/lejianwen/rustdesk-api/model"
+import "github.com/lejianwen/rustdesk-api/v2/model"
 
 /*
 GroupPeerPayload

http/response/api/user.go

@@ -1,6 +1,6 @@
 package api
 
-import "github.com/lejianwen/rustdesk-api/model"
+import "github.com/lejianwen/rustdesk-api/v2/model"
 
 /*
 	pub enum UserStatus {

http/response/api/webClient.go

@@ -1,7 +1,7 @@
 package api
 
 import (
-	"github.com/lejianwen/rustdesk-api/model"
+	"github.com/lejianwen/rustdesk-api/v2/model"
 	"time"
 )
 

http/response/response.go

@@ -3,7 +3,7 @@ package response
 import (
 	"fmt"
 	"github.com/gin-gonic/gin"
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
 	"github.com/nicksnyder/go-i18n/v2/i18n"
 	"net/http"
 )

http/router/admin.go

@@ -2,11 +2,11 @@ package router
 
 import (
 	"github.com/gin-gonic/gin"
-	_ "github.com/lejianwen/rustdesk-api/docs/admin"
+	_ "github.com/lejianwen/rustdesk-api/v2/docs/admin"
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	"github.com/lejianwen/rustdesk-api/http/controller/admin"
+	"github.com/lejianwen/rustdesk-api/v2/http/controller/admin"
-	"github.com/lejianwen/rustdesk-api/http/controller/admin/my"
+	"github.com/lejianwen/rustdesk-api/v2/http/controller/admin/my"
-	"github.com/lejianwen/rustdesk-api/http/middleware"
+	"github.com/lejianwen/rustdesk-api/v2/http/middleware"
 	swaggerFiles "github.com/swaggo/files"
 	ginSwagger "github.com/swaggo/gin-swagger"
 )

http/router/api.go

@@ -2,10 +2,10 @@ package router
 
 import (
 	"github.com/gin-gonic/gin"
-	_ "github.com/lejianwen/rustdesk-api/docs/api"
+	_ "github.com/lejianwen/rustdesk-api/v2/docs/api"
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	"github.com/lejianwen/rustdesk-api/http/controller/api"
+	"github.com/lejianwen/rustdesk-api/v2/http/controller/api"
-	"github.com/lejianwen/rustdesk-api/http/middleware"
+	"github.com/lejianwen/rustdesk-api/v2/http/middleware"
 	swaggerFiles "github.com/swaggo/files"
 	ginSwagger "github.com/swaggo/gin-swagger"
 	"net/http"

http/router/router.go

@@ -2,8 +2,8 @@ package router
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	"github.com/lejianwen/rustdesk-api/http/controller/web"
+	"github.com/lejianwen/rustdesk-api/v2/http/controller/web"
 	"net/http"
 )
 

lib/orm/mysql.go

@@ -2,7 +2,7 @@ package orm
 
 import (
 	"fmt"
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
 	"gorm.io/driver/mysql"
 	"gorm.io/gorm"
 	"gorm.io/gorm/logger"

lib/orm/sqlite.go

@@ -2,7 +2,7 @@ package orm
 
 import (
 	"fmt"
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
 	"gorm.io/driver/sqlite"
 	"gorm.io/gorm"
 	"gorm.io/gorm/logger"

model/addressBook.go

@@ -1,6 +1,6 @@
 package model
 
-import "github.com/lejianwen/rustdesk-api/model/custom_types"
+import "github.com/lejianwen/rustdesk-api/v2/model/custom_types"
 
 // final String id;
 // String hash; // personal ab hash password

model/model.go

@@ -1,7 +1,7 @@
 package model
 
 import (
-	"github.com/lejianwen/rustdesk-api/model/custom_types"
+	"github.com/lejianwen/rustdesk-api/v2/model/custom_types"
 )
 
 type StatusCode int

service/addressBook.go

@@ -3,8 +3,8 @@ package service
 import (
 	"encoding/json"
 	"github.com/google/uuid"
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	"github.com/lejianwen/rustdesk-api/model"
+	"github.com/lejianwen/rustdesk-api/v2/model"
 	"gorm.io/gorm"
 	"strings"
 )

service/audit.go

@@ -1,8 +1,8 @@
 package service
 
 import (
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	"github.com/lejianwen/rustdesk-api/model"
+	"github.com/lejianwen/rustdesk-api/v2/model"
 	"gorm.io/gorm"
 )
 

service/group.go

@@ -1,8 +1,8 @@
 package service
 
 import (
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	"github.com/lejianwen/rustdesk-api/model"
+	"github.com/lejianwen/rustdesk-api/v2/model"
 	"gorm.io/gorm"
 )
 

service/ldap.go

@@ -9,9 +9,9 @@ import (
 
 	"github.com/go-ldap/ldap/v3"
 
-	"github.com/lejianwen/rustdesk-api/config"
+	"github.com/lejianwen/rustdesk-api/v2/config"
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	"github.com/lejianwen/rustdesk-api/model"
+	"github.com/lejianwen/rustdesk-api/v2/model"
 )
 
 var (

service/loginLog.go

@@ -1,8 +1,8 @@
 package service
 
 import (
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	"github.com/lejianwen/rustdesk-api/model"
+	"github.com/lejianwen/rustdesk-api/v2/model"
 	"gorm.io/gorm"
 )
 

service/oauth.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	"github.com/lejianwen/rustdesk-api/model"
+	"github.com/lejianwen/rustdesk-api/v2/model"
-	"github.com/lejianwen/rustdesk-api/utils"
+	"github.com/lejianwen/rustdesk-api/v2/utils"
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/github"
 	// "golang.org/x/oauth2/google"

service/peer.go

@@ -1,8 +1,8 @@
 package service
 
 import (
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	"github.com/lejianwen/rustdesk-api/model"
+	"github.com/lejianwen/rustdesk-api/v2/model"
 	"gorm.io/gorm"
 )
 

service/serverCmd.go

@@ -2,8 +2,8 @@ package service
 
 import (
 	"fmt"
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	"github.com/lejianwen/rustdesk-api/model"
+	"github.com/lejianwen/rustdesk-api/v2/model"
 	"net"
 	"time"
 )

service/service.go

@@ -1,7 +1,7 @@
 package service
 
 import (
-	"github.com/lejianwen/rustdesk-api/model"
+	"github.com/lejianwen/rustdesk-api/v2/model"
 	"gorm.io/gorm"
 )
 

service/shareRecord.go

@@ -1,8 +1,8 @@
 package service
 
 import (
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	"github.com/lejianwen/rustdesk-api/model"
+	"github.com/lejianwen/rustdesk-api/v2/model"
 	"gorm.io/gorm"
 )
 

service/tag.go

@@ -1,8 +1,8 @@
 package service
 
 import (
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	"github.com/lejianwen/rustdesk-api/model"
+	"github.com/lejianwen/rustdesk-api/v2/model"
 	"gorm.io/gorm"
 )
 

service/user.go

@@ -2,9 +2,9 @@ package service
 
 import (
 	"errors"
-	"github.com/lejianwen/rustdesk-api/global"
+	"github.com/lejianwen/rustdesk-api/v2/global"
-	"github.com/lejianwen/rustdesk-api/model"
+	"github.com/lejianwen/rustdesk-api/v2/model"
-	"github.com/lejianwen/rustdesk-api/utils"
+	"github.com/lejianwen/rustdesk-api/v2/utils"
 	"math/rand"
 	"strconv"
 	"strings"
@@ -52,7 +52,7 @@ func (us *UserService) InfoByUsernamePassword(username, password string) *model.
 		if err == nil {
 			return u
 		}
-		global.Logger.Error("LDAP authentication failed, %v", err)
+		global.Logger.Errorf("LDAP authentication failed, %v", err)
 		global.Logger.Warn("Fallback to local database")
 	}
 	u := &model.User{}