From 19ddb9ad97dc5e7ad86412fe91a72e6713c7cebf Mon Sep 17 00:00:00 2001 From: dushixiang Date: Fri, 19 Mar 2021 20:53:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=8C=85=E9=A1=BA?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/api/ticker.go | 6 ++++-- server/repository/access_security.go | 3 ++- server/repository/asset.go | 8 +++++--- server/repository/command.go | 3 ++- server/repository/credential.go | 3 ++- server/repository/job.go | 3 ++- server/repository/job_log.go | 3 ++- server/repository/login_log.go | 3 ++- server/repository/num.go | 3 ++- server/repository/property.go | 3 ++- server/repository/resource_sharer.go | 5 +++-- server/repository/session.go | 8 +++++--- server/repository/user.go | 3 ++- server/repository/user_group.go | 3 ++- server/service/job.go | 10 ++++++---- server/service/mail.go | 6 ++++-- server/service/property.go | 3 ++- server/service/user.go | 3 ++- 18 files changed, 51 insertions(+), 28 deletions(-) diff --git a/server/api/ticker.go b/server/api/ticker.go index fa9d2f8..dc5b84b 100644 --- a/server/api/ticker.go +++ b/server/api/ticker.go @@ -1,10 +1,12 @@ package api import ( - "github.com/sirupsen/logrus" - "next-terminal/server/constant" "strconv" "time" + + "next-terminal/server/constant" + + "github.com/sirupsen/logrus" ) func SetupTicker() { diff --git a/server/repository/access_security.go b/server/repository/access_security.go index 84e8a86..c5cb92e 100644 --- a/server/repository/access_security.go +++ b/server/repository/access_security.go @@ -1,8 +1,9 @@ package repository import ( - "gorm.io/gorm" "next-terminal/server/model" + + "gorm.io/gorm" ) type AccessSecurityRepository struct { diff --git a/server/repository/asset.go b/server/repository/asset.go index 845b3eb..8ae00d8 100644 --- a/server/repository/asset.go +++ b/server/repository/asset.go @@ -2,13 +2,15 @@ package repository import ( "fmt" - "github.com/labstack/echo/v4" - "gorm.io/gorm" + "strings" + "next-terminal/server/constant" "next-terminal/server/global" "next-terminal/server/model" "next-terminal/server/utils" - "strings" + + "github.com/labstack/echo/v4" + "gorm.io/gorm" ) type AssetRepository struct { diff --git a/server/repository/command.go b/server/repository/command.go index 2dd8b22..eb34a42 100644 --- a/server/repository/command.go +++ b/server/repository/command.go @@ -1,9 +1,10 @@ package repository import ( - "gorm.io/gorm" "next-terminal/server/constant" "next-terminal/server/model" + + "gorm.io/gorm" ) type CommandRepository struct { diff --git a/server/repository/credential.go b/server/repository/credential.go index a5526db..9975465 100644 --- a/server/repository/credential.go +++ b/server/repository/credential.go @@ -1,9 +1,10 @@ package repository import ( - "gorm.io/gorm" "next-terminal/server/constant" "next-terminal/server/model" + + "gorm.io/gorm" ) type CredentialRepository struct { diff --git a/server/repository/job.go b/server/repository/job.go index 518b3e5..fcfc8f5 100644 --- a/server/repository/job.go +++ b/server/repository/job.go @@ -1,9 +1,10 @@ package repository import ( - "gorm.io/gorm" "next-terminal/server/model" "next-terminal/server/utils" + + "gorm.io/gorm" ) type JobRepository struct { diff --git a/server/repository/job_log.go b/server/repository/job_log.go index 10ca91d..17a0dcd 100644 --- a/server/repository/job_log.go +++ b/server/repository/job_log.go @@ -1,8 +1,9 @@ package repository import ( - "gorm.io/gorm" "next-terminal/server/model" + + "gorm.io/gorm" ) type JobLogRepository struct { diff --git a/server/repository/login_log.go b/server/repository/login_log.go index ebae58c..c212f6d 100644 --- a/server/repository/login_log.go +++ b/server/repository/login_log.go @@ -1,8 +1,9 @@ package repository import ( - "gorm.io/gorm" "next-terminal/server/model" + + "gorm.io/gorm" ) type LoginLogRepository struct { diff --git a/server/repository/num.go b/server/repository/num.go index 9792b89..1fcd174 100644 --- a/server/repository/num.go +++ b/server/repository/num.go @@ -1,8 +1,9 @@ package repository import ( - "gorm.io/gorm" "next-terminal/server/model" + + "gorm.io/gorm" ) type NumRepository struct { diff --git a/server/repository/property.go b/server/repository/property.go index e77382e..de537ba 100644 --- a/server/repository/property.go +++ b/server/repository/property.go @@ -1,9 +1,10 @@ package repository import ( - "gorm.io/gorm" "next-terminal/server/guacd" "next-terminal/server/model" + + "gorm.io/gorm" ) type PropertyRepository struct { diff --git a/server/repository/resource_sharer.go b/server/repository/resource_sharer.go index ee3e56c..98ad31e 100644 --- a/server/repository/resource_sharer.go +++ b/server/repository/resource_sharer.go @@ -1,11 +1,12 @@ package repository import ( + "next-terminal/server/model" + "next-terminal/server/utils" + "github.com/labstack/echo/v4" "github.com/pkg/errors" "gorm.io/gorm" - "next-terminal/server/model" - "next-terminal/server/utils" ) type ResourceSharerRepository struct { diff --git a/server/repository/session.go b/server/repository/session.go index fc3e8cf..b9b4dce 100644 --- a/server/repository/session.go +++ b/server/repository/session.go @@ -1,12 +1,14 @@ package repository import ( - "gorm.io/gorm" - "next-terminal/server/constant" - "next-terminal/server/model" "os" "path" "time" + + "next-terminal/server/constant" + "next-terminal/server/model" + + "gorm.io/gorm" ) type SessionRepository struct { diff --git a/server/repository/user.go b/server/repository/user.go index 7391644..02d021e 100644 --- a/server/repository/user.go +++ b/server/repository/user.go @@ -1,8 +1,9 @@ package repository import ( - "gorm.io/gorm" "next-terminal/server/model" + + "gorm.io/gorm" ) type UserRepository struct { diff --git a/server/repository/user_group.go b/server/repository/user_group.go index fc6afe3..c276a36 100644 --- a/server/repository/user_group.go +++ b/server/repository/user_group.go @@ -1,9 +1,10 @@ package repository import ( - "gorm.io/gorm" "next-terminal/server/model" "next-terminal/server/utils" + + "gorm.io/gorm" ) type UserGroupRepository struct { diff --git a/server/service/job.go b/server/service/job.go index 02827d6..03a5c4b 100644 --- a/server/service/job.go +++ b/server/service/job.go @@ -4,16 +4,18 @@ import ( "encoding/json" "errors" "fmt" - "github.com/robfig/cron/v3" - "github.com/sirupsen/logrus" + "strings" + "time" + "next-terminal/server/constant" "next-terminal/server/global" "next-terminal/server/model" "next-terminal/server/repository" "next-terminal/server/term" "next-terminal/server/utils" - "strings" - "time" + + "github.com/robfig/cron/v3" + "github.com/sirupsen/logrus" ) type JobService struct { diff --git a/server/service/mail.go b/server/service/mail.go index b0fc156..9f5ab4e 100644 --- a/server/service/mail.go +++ b/server/service/mail.go @@ -1,11 +1,13 @@ package service import ( - "github.com/jordan-wright/email" - "github.com/sirupsen/logrus" "net/smtp" + "next-terminal/server/constant" "next-terminal/server/repository" + + "github.com/jordan-wright/email" + "github.com/sirupsen/logrus" ) type MailService struct { diff --git a/server/service/property.go b/server/service/property.go index 62f5119..bb3eab4 100644 --- a/server/service/property.go +++ b/server/service/property.go @@ -1,11 +1,12 @@ package service import ( + "os" + "next-terminal/server/guacd" "next-terminal/server/model" "next-terminal/server/repository" "next-terminal/server/utils" - "os" ) type PropertyService struct { diff --git a/server/service/user.go b/server/service/user.go index 43b03d9..adbe55c 100644 --- a/server/service/user.go +++ b/server/service/user.go @@ -1,11 +1,12 @@ package service import ( - "github.com/sirupsen/logrus" "next-terminal/server/constant" "next-terminal/server/model" "next-terminal/server/repository" "next-terminal/server/utils" + + "github.com/sirupsen/logrus" ) type UserService struct {