Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix package compile errors #30

Merged
merged 2 commits into from
Jul 22, 2021
Merged

Fix package compile errors #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d838db6
Fix module names
yixinglu Jul 22, 2021
ae6c6df
Fix package
yixinglu Jul 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 utils/common.go → common/common.go
View file
Open in desktop
File renamed without changes.
0 utils/runtime.go → common/runtime.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions controllers/db.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ package controllers

import (
"encoding/json"
dao "nebula-http-gateway/service/dao"
common "nebula-http-gateway/utils"

"github.com/astaxie/beego"
"github.com/vesoft-inc/nebula-http-gateway/common"
"github.com/vesoft-inc/nebula-http-gateway/service/dao"
)

type DatabaseController struct {
Expand Down
5 changes: 3 additions & 2 deletions controllers/db_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
package tests
package controllers

import (
"bytes"
"encoding/json"
"io/ioutil"
"log"
common "nebula-http-gateway/utils"
"net/http"
"testing"

"github.com/vesoft-inc/nebula-http-gateway/common"
)

type Response struct {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module nebula-http-gateway
module github.com/vesoft-inc/nebula-http-gateway

go 1.13

Expand Down
2 changes: 0 additions & 2 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package main

import (
_ "nebula-http-gateway/routers"

"github.com/astaxie/beego"
)

Expand Down
3 changes: 1 addition & 2 deletions routers/router.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package routers

import (
"nebula-http-gateway/controllers"

"github.com/astaxie/beego"
"github.com/vesoft-inc/nebula-http-gateway/controllers"
)

func init() {
Expand Down
4 changes: 2 additions & 2 deletions service/dao/dao.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"errors"
"log"

"nebula-http-gateway/service/pool"
common "nebula-http-gateway/utils"
"github.com/vesoft-inc/nebula-http-gateway/common"
"github.com/vesoft-inc/nebula-http-gateway/service/pool"

nebula "github.com/vesoft-inc/nebula-go/v2"
nebulaType "github.com/vesoft-inc/nebula-go/v2/nebula"
Expand Down
4 changes: 2 additions & 2 deletions service/pool/pool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"sync"
"time"

common "nebula-http-gateway/utils"

"github.com/facebook/fbthrift/thrift/lib/go/thrift"
"github.com/vesoft-inc/nebula-http-gateway/common"

uuid "github.com/satori/go.uuid"
nebula "github.com/vesoft-inc/nebula-go/v2"
)
Expand Down