auto ci

plugin/dapp/cert/authority/tools/cryptogen/cryptogen.go

@@ -6,11 +6,12 @@ package main
 
 import (
 	"fmt"
-	log "github.com/33cn/chain33/common/log/log15"
-	"gopkg.in/yaml.v2"
 	"os"
 	"path/filepath"
 
+	log "github.com/33cn/chain33/common/log/log15"
+	"gopkg.in/yaml.v2"
+
 	"github.com/33cn/chain33/types"
 	_ "github.com/33cn/plugin/plugin/crypto/init"
 	"github.com/33cn/plugin/plugin/dapp/cert/authority/tools/cryptogen/generator"
@@ -30,8 +31,8 @@ var (
 		Short: "chain33 crypto tool for generating key and certificate",
 		Run:   generate,
 	}
-	cfg *generator.GenConfig
-    logger = log.New("module", "main")
+	cfg    *generator.GenConfig
+	logger = log.New("module", "main")
 )
 
 func initCfg(path string) (*generator.GenConfig, error) {

plugin/dapp/cert/authority/tools/cryptogen/factory/csp/fileks.go

@@ -123,7 +123,7 @@ func (ks *fileBasedKeyStore) StoreKey(k Key) (err error) {
 func (ks *fileBasedKeyStore) storePrivateKeyByte(alias string, privateKey interface{}) error {
 	rawKey, err := utils.PrivateKeyToByte(privateKey)
 	if err != nil {
-		logger.Error("Failed converting private key to PEM","name", alias, "error", err)
+		logger.Error("Failed converting private key to PEM", "name", alias, "error", err)
 		return err
 	}
 

plugin/dapp/cert/authority/tools/cryptogen/factory/utils/keys.go

@@ -12,6 +12,7 @@ import (
 	"encoding/asn1"
 	"encoding/pem"
 	"fmt"
+
 	pkecdsa "github.com/33cn/plugin/plugin/crypto/ecdsa"
 	pkesm2 "github.com/33cn/plugin/plugin/crypto/sm2"
 	"github.com/33cn/plugin/plugin/dapp/evm/executor/vm/common"

plugin/dapp/cert/authority/tools/cryptogen/generator/config.go

 package generator
 
 type UserConfig struct {
-	Name      string    `yaml:"Name"`
+	Name string `yaml:"Name"`
 }
 
 type CAConfig struct {
-	CommonName    string    `yaml:"CommonName"`
-	Country       string    `yaml:"Country"`
-	Province      string    `yaml:"Province"`
-	Locality      string    `yaml:"Locality"`
-	Expire        int       `yaml:"Expire"`
+	CommonName string `yaml:"CommonName"`
+	Country    string `yaml:"Country"`
+	Province   string `yaml:"Province"`
+	Locality   string `yaml:"Locality"`
+	Expire     int    `yaml:"Expire"`
 }
 
 type CertConfig struct {
-	Name      string    `yaml:"Name"`
-	CA        CAConfig   `yaml:"CA"`
-	User      []UserConfig  `yaml:"User"`
+	Name string       `yaml:"Name"`
+	CA   CAConfig     `yaml:"CA"`
+	User []UserConfig `yaml:"User"`
 }
 
 type GenConfig struct {
-	SignType    string     `yaml:"SignType"`
-	Root      CertConfig   `yaml:"Root"`
-	Organizations  []CertConfig  `yaml:"Organizations"`
+	SignType      string       `yaml:"SignType"`
+	Root          CertConfig   `yaml:"Root"`
+	Organizations []CertConfig `yaml:"Organizations"`
 }
 
 func (cfg *GenConfig) GetOrgCertConfig(orgName string) *CertConfig {

plugin/dapp/cert/authority/tools/cryptogen/generator/generatorimpl.go

@@ -28,19 +28,19 @@ import (
 
 // EcdsaCA ecdsa CA结构
 type EcdsaCA struct {
-	Name        string
-	Signer      crypto.Signer
-	SignCert    *x509.Certificate
-	CertConfig  *CertConfig
+	Name       string
+	Signer     crypto.Signer
+	SignCert   *x509.Certificate
+	CertConfig *CertConfig
 }
 
 // SM2CA SM2 CA结构
 type SM2CA struct {
-	Name         string
-	Signer       crypto.Signer
-	SignCert     *sm2.Certificate
-	Sm2Key       csp.Key
-	CertConfig   *CertConfig
+	Name       string
+	Signer     crypto.Signer
+	SignCert   *sm2.Certificate
+	Sm2Key     csp.Key
+	CertConfig *CertConfig
 }
 
 // NewCA 根据类型生成CA生成器
@@ -79,7 +79,7 @@ func newEcdsaCA(baseDir string, certConfig *CertConfig) (*EcdsaCA, error) {
 	template.ExtKeyUsage = []x509.ExtKeyUsage{x509.ExtKeyUsageAny}
 
 	subject := pkix.Name{
-		Country: []string{certConfig.CA.Country},
+		Country:  []string{certConfig.CA.Country},
 		Locality: []string{certConfig.CA.Locality},
 		Province: []string{certConfig.CA.Province},
 	}
@@ -94,10 +94,10 @@ func newEcdsaCA(baseDir string, certConfig *CertConfig) (*EcdsaCA, error) {
 		return nil, err
 	}
 	ca = &EcdsaCA{
-		Name:         certConfig.Name,
-		Signer:       signer,
-		SignCert:     x509Cert,
-		CertConfig:   certConfig,
+		Name:       certConfig.Name,
+		Signer:     signer,
+		SignCert:   x509Cert,
+		CertConfig: certConfig,
 	}
 
 	return ca, nil
@@ -119,7 +119,7 @@ func (ca *EcdsaCA) SignCertificate(baseDir, fileName string, sans []string, pub
 	}
 
 	subject := pkix.Name{
-		Country: []string{ca.CertConfig.CA.Country},
+		Country:  []string{ca.CertConfig.CA.Country},
 		Locality: []string{ca.CertConfig.CA.Locality},
 		Province: []string{ca.CertConfig.CA.Province},
 	}
@@ -171,10 +171,10 @@ func (ca *EcdsaCA) GenerateLocalOrg(baseDir, fileName string, orgCfg *CertConfig
 	}
 
 	orgCA := &EcdsaCA{
-		Name:          ca.Name,
-		Signer:        signer,
-		SignCert:      cert,
-		CertConfig:    orgCfg,
+		Name:       ca.Name,
+		Signer:     signer,
+		SignCert:   cert,
+		CertConfig: orgCfg,
 	}
 	return orgCA, nil
 }
@@ -267,7 +267,7 @@ func newSM2CA(baseDir string, certConfig *CertConfig) (*SM2CA, error) {
 	template.ExtKeyUsage = []x509.ExtKeyUsage{x509.ExtKeyUsageAny}
 
 	subject := pkix.Name{
-		Country: []string{certConfig.CA.Country},
+		Country:  []string{certConfig.CA.Country},
 		Locality: []string{certConfig.CA.Locality},
 		Province: []string{certConfig.CA.Province},
 	}
@@ -309,7 +309,7 @@ func (ca *SM2CA) SignCertificate(baseDir, fileName string, sans []string, pub in
 	}
 
 	subject := pkix.Name{
-		Country: []string{ca.CertConfig.CA.Country},
+		Country:  []string{ca.CertConfig.CA.Country},
 		Locality: []string{ca.CertConfig.CA.Locality},
 		Province: []string{ca.CertConfig.CA.Province},
 	}
@@ -362,10 +362,10 @@ func (ca *SM2CA) GenerateLocalOrg(baseDir, fileName string, orgCfg *CertConfig)
 	}
 
 	orgCA := &SM2CA{
-		Name:          orgCfg.Name,
-		Signer:        signer,
-		SignCert:      utils.ParseX509CertificateToSm2(cert),
-		CertConfig:    orgCfg,
+		Name:       orgCfg.Name,
+		Signer:     signer,
+		SignCert:   utils.ParseX509CertificateToSm2(cert),
+		CertConfig: orgCfg,
 	}
 	return orgCA, nil
 }
@@ -424,7 +424,7 @@ func createFolderStructure(rootDir string, isOrg bool) error {
 		filepath.Join(rootDir, "signcerts"),
 	}
 	if isOrg {
-		folders = append(folders, filepath.Join(rootDir, "intermediatecerts"),)
+		folders = append(folders, filepath.Join(rootDir, "intermediatecerts"))
 	}
 
 	for _, folder := range folders {