evan/next-terminal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

完成重构数据库操作代码

Browse Source
This commit is contained in:
dushixiang
2021-03-19 20:22:04 +08:00
parent 25b8381a4f
commit 2eb4dc3969
37 changed files with 294 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/api/tunnel.go
View File

@ -42,12 +42,12 @@ func TunEndpoint(c echo.Context) error {
configuration := guacd.NewConfiguration()
propertyMap := model.FindAllPropertiesMap()
propertyMap := propertyRepository.FindAllMap()
var session model.Session
if len(connectionId) > 0 {
session, err = model.FindSessionByConnectionId(connectionId)
session, err = sessionRepository.FindByConnectionId(connectionId)
if err != nil {
logrus.Warnf("会话不存在")
return err
@ -65,7 +65,7 @@ func TunEndpoint(c echo.Context) error {
configuration.SetParameter("width", width)
configuration.SetParameter("height", height)
configuration.SetParameter("dpi", dpi)
session, err = model.FindSessionById(sessionId)
session, err = sessionRepository.FindById(sessionId)
if err != nil {
CloseSessionById(sessionId, NotFoundSession, "会话不存在")
return err
@ -143,7 +143,7 @@ func TunEndpoint(c echo.Context) error {
configuration.SetParameter("port", strconv.Itoa(session.Port))
// 加载资产配置的属性，优先级比全局配置的高，因此最后加载，覆盖掉全局配置
attributes, _ := model.FindAssetAttributeByAssetId(session.AssetId)
attributes, _ := assetRepository.FindAttrById(session.AssetId)
if len(attributes) > 0 {
for i := range attributes {
attribute := attributes[i]
@ -195,7 +195,7 @@ func TunEndpoint(c echo.Context) error {
}
// 创建新会话
logrus.Debugf("创建新会话 %v", sess.ConnectionId)
if err := model.UpdateSessionById(&sess, sessionId); err != nil {
if err := sessionRepository.UpdateById(&sess, sessionId); err != nil {
return err
}
} else {