升级依赖库 (#232)

* 优化图标和LOGO

* 修改登录页面动画的速度为3

* 增加对websocket的异常处理

* 修复了用户组和用户名唯一判断错误的问题

* 提示版本号

* 修复readme错别字

* 修复单词拼写错误的问题

* 修复代码格式

* 修改Windows资产属性名称

* Docker 打包流程增加 upx 压缩

* 升级依赖文件,修改sqlite驱动为 github.com/glebarez/sqlite

* 修复第一次查询「授权令牌」的错误

* 移除无关代码

* 修改docker打包脚本

* 增加打包脚本

* 增加微信群
This commit is contained in:
dushixiang
2022-03-08 22:32:55 +08:00
committed by GitHub
parent aa3a6af4ea
commit cf6b7fec12
11 changed files with 594 additions and 82 deletions

View File

@ -2,6 +2,7 @@ package api
import (
"context"
"errors"
"path"
"strconv"
@ -16,6 +17,7 @@ import (
"next-terminal/server/utils"
"github.com/labstack/echo/v4"
"gorm.io/gorm"
)
type AccountApi struct{}
@ -345,7 +347,11 @@ func (api AccountApi) AccessTokenGetEndpoint(c echo.Context) error {
account, _ := GetCurrentAccount(c)
accessToken, err := repository.AccessTokenRepository.FindByUserId(context.TODO(), account.ID)
if err != nil {
return err
if errors.Is(gorm.ErrRecordNotFound, err) {
accessToken = model.AccessToken{}
} else {
return err
}
}
return Success(c, accessToken)
}

View File

@ -122,27 +122,6 @@ func Auth(next echo.HandlerFunc) echo.HandlerFunc {
} else {
cache.TokenManager.Set(token, authorization, cache.NotRememberExpiration)
}
} else if strings.EqualFold(constant.ShareSession, authorization.Type) {
id := c.Param("id")
uri = strings.Split(uri, "?")[0]
allowUrls := []string{
"/share-sessions/" + id,
"/sessions",
"/sessions/" + id + "/tunnel",
"/sessions/" + id + "/connect",
"/sessions/" + id + "/resize",
"/sessions/" + id + "/stats",
"/sessions/" + id + "/ls",
"/sessions/" + id + "/download",
"/sessions/" + id + "/upload",
"/sessions/" + id + "/edit",
"/sessions/" + id + "/mkdir",
"/sessions/" + id + "/rm",
"/sessions/" + id + "/rename",
}
if !utils.Contains(allowUrls, uri) {
return api.Fail(c, 401, "您的登录信息已失效,请重新登录后再试。")
}
}
return next(c)

View File

@ -72,9 +72,8 @@ const (
SocksProxyUsername = "socks-proxy-username"
SocksProxyPassword = "socks-proxy-password"
LoginToken = "login-token"
AccessToken = "access-token"
ShareSession = "share-session"
LoginToken = "login-token"
AccessToken = "access-token"
Anonymous = "anonymous"
)

2
server/env/db.go vendored
View File

@ -6,8 +6,8 @@ import (
"next-terminal/server/config"
"next-terminal/server/model"
"github.com/glebarez/sqlite"
"gorm.io/driver/mysql"
"gorm.io/driver/sqlite"
"gorm.io/gorm"
"gorm.io/gorm/logger"
)