fix conflict

This commit is contained in:
yoan
2024-10-20 13:26:25 +08:00
59 changed files with 1340 additions and 157 deletions

View File

@@ -8,9 +8,9 @@ import (
"os/exec"
"path/filepath"
"runtime"
)
type LocalAccess struct{}
"github.com/usual2970/certimate/internal/domain"
)
type LocalDeployer struct {
option *DeployerOption
@@ -25,7 +25,7 @@ func NewLocalDeployer(option *DeployerOption) (Deployer, error) {
}
func (d *LocalDeployer) GetID() string {
return fmt.Sprintf("%s-%s", d.option.AceessRecord.GetString("name"), d.option.AceessRecord.Id)
return fmt.Sprintf("%s-%s", d.option.AccessRecord.GetString("name"), d.option.AccessRecord.Id)
}
func (d *LocalDeployer) GetInfo() []string {
@@ -33,7 +33,7 @@ func (d *LocalDeployer) GetInfo() []string {
}
func (d *LocalDeployer) Deploy(ctx context.Context) error {
access := &LocalAccess{}
access := &domain.LocalAccess{}
if err := json.Unmarshal([]byte(d.option.Access), access); err != nil {
return err
}