internal/controller/dci.go

@@ -20,7 +20,7 @@ type DciProvider struct {
 func (d *DciProvider) GetUploadUrl(_ context.Context, req *dci.GetUploadUrlRequest) (res *dci.GetUploadUrlResponse, err error) {
 	res = new(dci.GetUploadUrlResponse)
 	if req.FileName == "" {
-		return res, errCommon.ReturnError(errors.New(msg.ErrFileIsEmpty), msg.ErrFileIsEmpty, "未获取到相关文件 :")
+		return res, errCommon.ReturnError(errors.New(msg.ErrrFileIsEmpty), msg.ErrrFileIsEmpty, "未获取到相关文件 :")
 	}
 
 	res, err = d.file.Upload(req)

internal/logic/dci.go

@@ -31,11 +31,13 @@ type IDci interface {
 type Dci struct {
 }
 
-func createToken(timestamp int64, keyword ...string) (token string, err error) {
+func createToken(appID, appKey, channelId, userID, nonce string, timestamp int64) (token string, err error) {
 	var b bytes.Buffer
-	for i := 0; i < len(keyword); i++ {
+	b.WriteString(appID)
-		b.WriteString(keyword[i])
+	b.WriteString(appKey)
-	}
+	b.WriteString(channelId)
+	b.WriteString(userID)
+	b.WriteString(nonce)
 	b.WriteString(fmt.Sprint(timestamp))
 	h := sha256.New()
 

internal/logic/dci_registration.go

@@ -3,11 +3,8 @@ package logic
 import (
 	"chain-dci/pb/dci"
 	"chain-dci/pkg/app"
-	errCommon "chain-dci/pkg/err"
-	"chain-dci/pkg/msg"
 	bccrClient "github.com/antchain-openapi-sdk-go/bccr/client"
 	"github.com/jinzhu/copier"
-	"time"
 )
 
 type IDciRegistration interface {
@@ -30,12 +27,6 @@ func (r *DciRegistration) CreateDciRegistration(req *dci.CreateDciRegistrationRe
 	createDciRegistrationRequest := new(bccrClient.CreateDciRegistrationRequest)
 	_ = copier.CopyWithOption(&createDciRegistrationRequest, req, copier.Option{DeepCopy: true})
 
-	clientToken, err := createToken(time.Now().UnixMilli(), req.DciContentId, app.ModuleClients.SfNode.Generate().Base64())
-	if err != nil {
-		return nil, errCommon.ReturnError(err, msg.ErrCreateClientToken, "创建clientToken 失败: ")
-	}
-	createDciRegistrationRequest.SetClientToken(clientToken)
-
 	createDciPreregistrationResponse, err := app.ModuleClients.BccrClient.CreateDciRegistration(createDciRegistrationRequest)
 	if err != nil {
 		return nil, err
@@ -70,12 +61,6 @@ func (r *DciRegistration) GetDciPayUrl(req *dci.GetDciPayUrlRequest) (res *dci.G
 	getDciPayUrlRequest := new(bccrClient.GetDciPayurlRequest)
 	_ = copier.CopyWithOption(&getDciPayUrlRequest, req, copier.Option{DeepCopy: true})
 
-	clientToken, err := createToken(time.Now().UnixMilli(), req.DigitalRegisterId, app.ModuleClients.SfNode.Generate().Base64())
-	if err != nil {
-		return nil, errCommon.ReturnError(err, msg.ErrCreateClientToken, "创建clientToken 失败: ")
-	}
-	getDciPayUrlRequest.SetClientToken(clientToken)
-
 	getDciPayUrlResponse, err := app.ModuleClients.BccrClient.GetDciPayurl(getDciPayUrlRequest)
 	if err != nil {
 		return nil, err
@@ -110,12 +95,6 @@ func (r *DciRegistration) GetDciRegistrationcert(req *dci.GetDciRegistrationcert
 	getDciRegistrationcertRequest := new(bccrClient.GetDciRegistrationcertRequest)
 	_ = copier.CopyWithOption(&getDciRegistrationcertRequest, req, copier.Option{DeepCopy: true})
 
-	clientToken, err := createToken(time.Now().UnixMilli(), req.DigitalRegisterId, app.ModuleClients.SfNode.Generate().Base64())
-	if err != nil {
-		return nil, errCommon.ReturnError(err, msg.ErrCreateClientToken, "创建clientToken 失败: ")
-	}
-	getDciRegistrationcertRequest.SetClientToken(clientToken)
-
 	getDciRegistrationcertResponse, err := app.ModuleClients.BccrClient.GetDciRegistrationcert(getDciRegistrationcertRequest)
 	if err != nil {
 		return nil, err
@@ -133,12 +112,6 @@ func (r *DciRegistration) RetryDciRegistration(req *dci.RetryDciRegistrationRequ
 	retryDciRegistrationRequest := new(bccrClient.RetryDciRegistrationRequest)
 	_ = copier.CopyWithOption(&retryDciRegistrationRequest, req, copier.Option{DeepCopy: true})
 
-	clientToken, err := createToken(time.Now().UnixMilli(), req.DigitalRegisterId, req.DciContentId, app.ModuleClients.SfNode.Generate().Base64())
-	if err != nil {
-		return nil, errCommon.ReturnError(err, msg.ErrCreateClientToken, "创建clientToken 失败: ")
-	}
-	retryDciRegistrationRequest.SetClientToken(clientToken)
-
 	retryDciRegistrationResponse, err := app.ModuleClients.BccrClient.RetryDciRegistration(retryDciRegistrationRequest)
 	if err != nil {
 		return nil, err
@@ -156,12 +129,6 @@ func (r *DciRegistration) CloseDciRegistration(req *dci.CloseDciRegistrationRequ
 	closeDciRegistrationRequest := new(bccrClient.CloseDciRegistrationRequest)
 	_ = copier.CopyWithOption(&closeDciRegistrationRequest, req, copier.Option{DeepCopy: true})
 
-	clientToken, err := createToken(time.Now().UnixMilli(), req.DigitalRegisterId, req.Name, req.MobileNo, app.ModuleClients.SfNode.Generate().Base64())
-	if err != nil {
-		return nil, errCommon.ReturnError(err, msg.ErrCreateClientToken, "创建clientToken 失败: ")
-	}
-	closeDciRegistrationRequest.SetClientToken(clientToken)
-
 	closeDciRegistrationResponse, err := app.ModuleClients.BccrClient.CloseDciRegistration(closeDciRegistrationRequest)
 	if err != nil {
 		return nil, err

internal/logic/dci_user.go

@@ -3,11 +3,8 @@ package logic
 import (
 	"chain-dci/pb/dci"
 	"chain-dci/pkg/app"
-	errCommon "chain-dci/pkg/err"
-	"chain-dci/pkg/msg"
 	bccrClient "github.com/antchain-openapi-sdk-go/bccr/client"
 	"github.com/jinzhu/copier"
-	"time"
 )
 
 type IDciUser interface {
@@ -26,12 +23,6 @@ func (u *DciUser) AddDciUser(req *dci.AddDciUserRequest) (res *dci.AddDciUserRes
 	addDciUserRequest := new(bccrClient.AddDciUserRequest)
 	_ = copier.CopyWithOption(&addDciUserRequest, req, copier.Option{DeepCopy: true})
 
-	clientToken, err := createToken(time.Now().UnixMilli(), req.CertName, req.CertificateNumber, req.Phone, app.ModuleClients.SfNode.Generate().Base64())
-	if err != nil {
-		return nil, errCommon.ReturnError(err, msg.ErrCreateClientToken, "创建clientToken 失败: ")
-	}
-	addDciUserRequest.SetClientToken(clientToken)
-
 	addDciUserResponse, err := app.ModuleClients.BccrClient.AddDciUser(addDciUserRequest)
 	if err != nil {
 		return nil, err
@@ -49,12 +40,6 @@ func (u *DciUser) UpdateDciUser(req *dci.UpdateDciUserRequest) (res *dci.UpdateD
 	updateDciUserRequest := new(bccrClient.UpdateDciUserRequest)
 	_ = copier.CopyWithOption(&updateDciUserRequest, req, copier.Option{DeepCopy: true})
 
-	clientToken, err := createToken(time.Now().UnixMilli(), req.DciUserId, req.CertFrontFileId, req.CertBackFileId, req.Phone, app.ModuleClients.SfNode.Generate().Base64())
-	if err != nil {
-		return nil, errCommon.ReturnError(err, msg.ErrCreateClientToken, "创建clientToken 失败: ")
-	}
-	updateDciUserRequest.SetClientToken(clientToken)
-
 	updateDciUserResponse, err := app.ModuleClients.BccrClient.UpdateDciUser(updateDciUserRequest)
 	if err != nil {
 		return nil, err

internal/logic/dci_work.go

@@ -3,11 +3,8 @@ package logic
 import (
 	"chain-dci/pb/dci"
 	"chain-dci/pkg/app"
-	errCommon "chain-dci/pkg/err"
-	"chain-dci/pkg/msg"
 	bccrClient "github.com/antchain-openapi-sdk-go/bccr/client"
 	"github.com/jinzhu/copier"
-	"time"
 )
 
 type IDciWork interface {
@@ -25,12 +22,6 @@ func (w *DciWork) CreateDciPreregistration(req *dci.CreateDciPreregistrationRequ
 	createDciPreregistrationRequest := new(bccrClient.CreateDciPreregistrationRequest)
 	_ = copier.CopyWithOption(&createDciPreregistrationRequest, req, copier.Option{DeepCopy: true})
 
-	clientToken, err := createToken(time.Now().UnixMilli(), req.DciUserId, req.WorkName, req.AuthorName, req.WorkFileId, app.ModuleClients.SfNode.Generate().Base64())
-	if err != nil {
-		return nil, errCommon.ReturnError(err, msg.ErrCreateClientToken, "创建clientToken 失败: ")
-	}
-	createDciPreregistrationRequest.SetClientToken(clientToken)
-
 	createDciPreregistrationResponse, err := app.ModuleClients.BccrClient.CreateDciPreregistration(createDciPreregistrationRequest)
 	if err != nil {
 		return nil, err

internal/logic/file.go

@@ -4,14 +4,12 @@ import (
 	"chain-dci/pb/dci"
 	"chain-dci/pkg/app"
 	errCommon "chain-dci/pkg/err"
-	"chain-dci/pkg/msg"
 	"chain-dci/pkg/utils"
 	"encoding/base64"
 	"github.com/alibabacloud-go/tea/tea"
 	bccrClient "github.com/antchain-openapi-sdk-go/bccr/client"
 	"github.com/jinzhu/copier"
 	"strings"
-	"time"
 	"unicode"
 )
 
@@ -67,12 +65,6 @@ func (f *File) Upload(req *dci.GetUploadUrlRequest) (res *dci.GetUploadUrlRespon
 		getUploadUrlRequest.SetFileName(fileName)
 	}
 
-	clientToken, err := createToken(time.Now().UnixMilli(), fileName, app.ModuleClients.SfNode.Generate().Base64())
-	if err != nil {
-		return nil, errCommon.ReturnError(err, msg.ErrCreateClientToken, "创建clientToken 失败: ")
-	}
-	getUploadUrlRequest.SetClientToken(clientToken)
-
 	getUploadUrlResponse := GetUploadUrl(getUploadUrlRequest)
 	//res = serializer.UploadUrlResponseToRpc(getUploadUrlResponse)
 	res = new(dci.GetUploadUrlResponse)

pkg/cache/redis.go

@@ -1,24 +1,27 @@
 package cache
 
 import (
+	dciConfig "chain-dci/config"
+	"github.com/dubbogo/gost/log/logger"
 	"github.com/go-redis/redis"
 	"github.com/google/wire"
+	"strconv"
 )
 
 var RedisProvider = wire.NewSet(NewRedis)
 
 // TODO 添加连接池
 func NewRedis() *redis.Client {
-	//redisDb, _ := strconv.Atoi(dciConfig.Data.Redis.DB)
+	redisDb, _ := strconv.Atoi(dciConfig.Data.Redis.DB)
-	//RedisClient := redis.NewClient(&redis.Options{
+	RedisClient := redis.NewClient(&redis.Options{
-	//	Addr:     dciConfig.Data.Redis.Addr,
+		Addr:     dciConfig.Data.Redis.Addr,
-	//	Password: dciConfig.Data.Redis.Password,
+		Password: dciConfig.Data.Redis.Password,
-	//	DB:       redisDb,
+		DB:       redisDb,
-	//})
+	})
-	//_, err := RedisClient.Ping().Result()
+	_, err := RedisClient.Ping().Result()
-	//if err != nil {
+	if err != nil {
-	//	logger.Errorf("connRedis err", err)
+		logger.Errorf("connRedis err", err)
-	//	panic(err)
+		panic(err)
-	//}
+	}
-	return nil
+	return RedisClient
 }

pkg/db/chainDci.go

@@ -1,16 +1,18 @@
 package db
 
 import (
+	dciConfig "chain-dci/config"
 	"github.com/google/wire"
 	"gorm.io/gorm"
+	"strings"
 )
 
-var DciProvider = wire.NewSet(NewDci)
+var MeetingProvider = wire.NewSet(NewDci)
 
 func NewDci() *gorm.DB {
-	//connOaMeeting := strings.Join([]string{dciConfig.Data.ChainDci.User, ":", dciConfig.Data.ChainDci.Password,
+	connOaMeeting := strings.Join([]string{dciConfig.Data.ChainDci.User, ":", dciConfig.Data.ChainDci.Password,
-	//	"@tcp(", dciConfig.Data.ChainDci.Host, ":", dciConfig.Data.ChainDci.Port, ")/",
+		"@tcp(", dciConfig.Data.ChainDci.Host, ":", dciConfig.Data.ChainDci.Port, ")/",
-	//	dciConfig.Data.ChainDci.DbName, "?charset=utf8mb4&parseTime=true"}, "")
+		dciConfig.Data.ChainDci.DbName, "?charset=utf8mb4&parseTime=true"}, "")
-	//DbOaMeeting := loadMysqlConn(connOaMeeting)
+	DbOaMeeting := loadMysqlConn(connOaMeeting)
-	return nil
+	return DbOaMeeting
 }

pkg/init/start.go

@@ -1,5 +1,7 @@
 package common
 
+import "chain-dci/pkg/db"
+
 func Init() {
-	//db.DBMigration()
+	db.DBMigration()
 }

pkg/msg/dci_msg.go

@@ -1,6 +1,5 @@
 package msg
 
 const (
-	ErrFileIsEmpty       = "未获取到相关文件"
+	ErrrFileIsEmpty = "未获取到相关文件"
-	ErrCreateClientToken = "创建clientToken失败"
 )

pkg/snowf/snowflake.go

@@ -26,11 +26,6 @@ func NewSf() *snowflake.Node {
 	}
 	return node
 }
-
+func GenID() int64 {
-func GenIDInt64() int64 {
 	return app.ModuleClients.SfNode.Generate().Int64()
 }
-
-func GetIDBase64() string {
-	return app.ModuleClients.SfNode.Generate().Base64()
-}