Merge pull request #21 from tianxiaoliang/master

adapt to new latest go chassis
huaweicse · Feb 15, 2019 · 46b97a7 · 46b97a7
2 parents bfbe637 + d41e23e
commit 46b97a7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/adaptor/gochassis/cse.go b/adaptor/gochassis/cse.go
@@ -10,16 +10,16 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/huaweicse/auth"
-
+	"github.com/go-chassis/foundation/httpclient"
+	security2 "github.com/go-chassis/foundation/security"
 	"github.com/go-chassis/go-archaius"
 	"github.com/go-chassis/go-chassis/bootstrap"
 	"github.com/go-chassis/go-chassis/core/common"
 	"github.com/go-chassis/go-chassis/core/config"
 	"github.com/go-chassis/go-chassis/core/config/model"
-	"github.com/go-chassis/go-chassis/pkg/httpclient"
 	"github.com/go-chassis/go-chassis/security"
 	"github.com/go-mesh/openlogging"
+	"github.com/huaweicse/auth"
 	"gopkg.in/yaml.v2"
 )
 
@@ -69,7 +69,7 @@ func loadPaasAuth() error {
 	return nil
 }
 
-func getAkskCustomCipher(name string) (security.Cipher, error) {
+func getAkskCustomCipher(name string) (security2.Cipher, error) {
 	f, err := security.GetCipherNewFunc(name)
 	if err != nil {
 		return nil, err

diff --git a/adaptor/gochassis/cse_test.go b/adaptor/gochassis/cse_test.go
@@ -7,15 +7,14 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/huaweicse/auth"
-
+	"github.com/go-chassis/foundation/httpclient"
 	"github.com/go-chassis/go-chassis/core/common"
 	"github.com/go-chassis/go-chassis/core/config"
 	"github.com/go-chassis/go-chassis/core/config/model"
 	"github.com/go-chassis/go-chassis/core/lager"
-	"github.com/go-chassis/go-chassis/pkg/httpclient"
 	_ "github.com/go-chassis/go-chassis/security/plugins/aes"
 	_ "github.com/go-chassis/go-chassis/security/plugins/plain"
+	"github.com/huaweicse/auth"
 	"github.com/stretchr/testify/assert"
 )